From 864120c6a477c3e8833e23fc60f7b55da0f8964a Mon Sep 17 00:00:00 2001 From: TJH Date: Fri, 10 Oct 2025 11:13:55 +0800 Subject: [PATCH] =?UTF-8?q?4=E5=8F=B7=E9=97=AE=E9=A2=98=E5=8F=8A=E9=9F=B3?= =?UTF-8?q?=E6=95=88=E7=9A=84=E6=80=BB=E4=BD=93=E6=92=AD=E6=94=BE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/Game/prefabs/SlotScene.prefab | 114 +++++++++--------- assets/Game/scripts/game/FreeSpinEnter.ts | 1 + assets/Game/scripts/game/TotalWin.ts | 1 + .../Loading/scripts/manager/AudioManager.ts | 18 +-- 4 files changed, 65 insertions(+), 69 deletions(-) diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index cc8b08e..a5eaec5 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -2294,7 +2294,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "38yA+vQiFBxJdu8+hfyxhg" + "fileId": "f2f96AnsZHyZdAzGTvYTea" }, { "__type__": "cc.PrefabInfo", @@ -2304,7 +2304,7 @@ "asset": { "__id__": 0 }, - "fileId": "35fMC+MUdIJac+EBbdYHqa", + "fileId": "857315yUNA05K33EYJMkAy", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2335,7 +2335,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3dBOwHrYpMZZiMBV3XdjCn" + "fileId": "3eMs2+5pdJu6PsV5OJuqrE" }, { "__type__": "cc.PrefabInfo", @@ -2345,7 +2345,7 @@ "asset": { "__id__": 0 }, - "fileId": "15kTeQyfpDlKQqWD9PPSGK", + "fileId": "95irYW1+1Jz7a4zib3dehg", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2376,7 +2376,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "eeB9F22GtNBpdrlnPynwrP" + "fileId": "06IOhpPtBF0YVIbbLnNbuS" }, { "__type__": "5fc10Zl7lVO97/rr2J1uxWH", @@ -2400,7 +2400,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "56wylOY9NDo62JnOC0L2Hz" + "fileId": "792/7SC/5Ezrjor3nhJCts" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2573,7 +2573,7 @@ "asset": { "__id__": 0 }, - "fileId": "0eR9ceg9VFALhw6wzpwhAf", + "fileId": "cdOAXlwVFOsJCTaGIkMNcb", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2598,7 +2598,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e1sLEEf2NCSbF90rSXjYdl" + "fileId": "063u6oxgpJcZW/nOMnQQ6i" }, { "__type__": "cc.UITransform", @@ -2626,7 +2626,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "58jFexZLBA9Z+kiiizLrrg" + "fileId": "ef6RwZzExG/InQR9vil9f0" }, { "__type__": "cc.Sprite", @@ -2671,7 +2671,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "97HzHIL3lMXqPnzWNVNYhV" + "fileId": "f2q3FbsilDVpV5goCkSpCR" }, { "__type__": "cc.PrefabInfo", @@ -2681,7 +2681,7 @@ "asset": { "__id__": 0 }, - "fileId": "32Y9yEpwhL4qzYZ8pDG1jn", + "fileId": "a2gwIeDp5Nu71I0uMjfOwm", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2936,7 +2936,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "92GvcDZjpIi7SH+jTDHFvH" + "fileId": "03QWsR5f5D4Zs+C+8WW0Wv" }, { "__type__": "cc.PrefabInfo", @@ -2946,7 +2946,7 @@ "asset": { "__id__": 0 }, - "fileId": "bfEcSS+YBGeJsHj04CXENc", + "fileId": "53ncsZIgdNzqhu5YCL0voJ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2977,7 +2977,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "edWgOKA/9E5Y378PTXTfpC" + "fileId": "ec6tyDRy1KgKAlNx049QPE" }, { "__type__": "cc.PrefabInfo", @@ -2987,7 +2987,7 @@ "asset": { "__id__": 0 }, - "fileId": "4fQUCzOzBBMLOsKA7AWr4w", + "fileId": "efxzbZWmtPBqnY6GC4QZHc", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3018,7 +3018,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "80OEIVQ8lMEZbroRgjmSJr" + "fileId": "86KO52gjBEY793kynF/oSq" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3042,7 +3042,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "14EIrMvg9II7ciYrsDRxpO" + "fileId": "78SulM4mZKY5wZHiJMLuXE" }, { "__type__": "cc.PrefabInfo", @@ -3052,7 +3052,7 @@ "asset": { "__id__": 0 }, - "fileId": "dahWE8GYRKb5gzkGf8Yc5f", + "fileId": "38z+mnMrtBOo2Q6YK2S8cB", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3235,7 +3235,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a0uVbv3TVAD77w/Pdsv+xx" + "fileId": "3e/vgRrUZIgY5k+C321ZmN" }, { "__type__": "cc.PrefabInfo", @@ -3245,7 +3245,7 @@ "asset": { "__id__": 0 }, - "fileId": "deJ4sO6KlLPpW1DVXFZDR0", + "fileId": "294FGTIL9EuIgwSosZ7nCs", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3276,7 +3276,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "02LLGgR4NKbLXkermI/0/V" + "fileId": "devPhn+RlL4KW4Whq9N9Kp" }, { "__type__": "cc.PrefabInfo", @@ -3286,7 +3286,7 @@ "asset": { "__id__": 0 }, - "fileId": "61CZ3mJNdKvaKVfDkEDtej", + "fileId": "30deIMweRHU4Ql4+beP6wc", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3317,7 +3317,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "dcHQVJq2FFoIbpRi6s6XzK" + "fileId": "a8oIz2KeNHqbIQhyr9RCzU" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3341,7 +3341,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "54PAIeEP5NJaJF3d/LWD3R" + "fileId": "3buIii1IVNyI+wpuJsZKk9" }, { "__type__": "cc.PrefabInfo", @@ -3351,7 +3351,7 @@ "asset": { "__id__": 0 }, - "fileId": "92OjafLB5KVZOZ4bSaS4Jh", + "fileId": "99GBiF/YFIIq5iz2Gq6LTb", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3534,7 +3534,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8a6e6I/rdNHYDv4OnW3N22" + "fileId": "8bHhXSenZLjpfSfkZchK18" }, { "__type__": "cc.PrefabInfo", @@ -3544,7 +3544,7 @@ "asset": { "__id__": 0 }, - "fileId": "81qNSa5GVCx7yr0Mjfs8Vh", + "fileId": "86+1hPRVBHh4PvxzwynCtu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3575,7 +3575,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1drkF3t3dK6rVk3NkckPqx" + "fileId": "06zbwNw0tAY7QJrsTLXVim" }, { "__type__": "cc.PrefabInfo", @@ -3585,7 +3585,7 @@ "asset": { "__id__": 0 }, - "fileId": "f3xZSD7w5D04DCatmVrJr/", + "fileId": "fcNoCY3FVDB6nqPMWYJF9Y", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3616,7 +3616,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a6vDOBp05K0KQx87yqm+oX" + "fileId": "95ZUyBkzxKEqiYmt5WNXFP" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3640,7 +3640,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a3bEpenqpOb7KQh65Y7+fD" + "fileId": "6cJvHb7HROuJAa5dJxY5Ic" }, { "__type__": "cc.PrefabInfo", @@ -3650,7 +3650,7 @@ "asset": { "__id__": 0 }, - "fileId": "b28PIPuGVK9pu8eWxnVGVm", + "fileId": "123eHBOKFJFqcOByZHBmNV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3833,7 +3833,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "44GbsOFEhIErvGEY7+9rla" + "fileId": "8dtQ2TIFhP5b5FwIwAW98s" }, { "__type__": "cc.PrefabInfo", @@ -3843,7 +3843,7 @@ "asset": { "__id__": 0 }, - "fileId": "09dzM9/fNDg4CnqOxVxfDb", + "fileId": "93lZC8A/pFHL26KJJj0dY9", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3874,7 +3874,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f9Zo3AJzhJCq5sAkzvgCtJ" + "fileId": "03oz8ikEhNoL9aFQtVukm3" }, { "__type__": "cc.PrefabInfo", @@ -3884,7 +3884,7 @@ "asset": { "__id__": 0 }, - "fileId": "2dwSswWLJGmpHbqA6VFO4n", + "fileId": "e5aRbuncFJwozFlaL7CIJ8", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3915,7 +3915,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5bIVp7b+FBkb6bbreiGX70" + "fileId": "bdfEJZBXJJA5akrENRKI4K" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3939,7 +3939,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "25c+ALJKBLXpVSrMvX3x97" + "fileId": "0ap/22jx9FvrWuOiQWIEUU" }, { "__type__": "cc.PrefabInfo", @@ -3949,7 +3949,7 @@ "asset": { "__id__": 0 }, - "fileId": "7e4PakL/tAN54XC0GGMftt", + "fileId": "ca7iWfaLlKzZfzW8cVyYbS", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4132,7 +4132,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "43LeQQ2spMGYjnH2NU90Yu" + "fileId": "29jcz7ylBGYbKCVeMAzJUZ" }, { "__type__": "cc.PrefabInfo", @@ -4142,7 +4142,7 @@ "asset": { "__id__": 0 }, - "fileId": "a7BkPrTp5D76X1SleWsHqu", + "fileId": "d0h3YAiSlMWIBnqhtFaLm6", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4173,7 +4173,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f39O1gwrFGupm369+NTp43" + "fileId": "78abt8/n5K7Y3JP7rnadhU" }, { "__type__": "cc.PrefabInfo", @@ -4183,7 +4183,7 @@ "asset": { "__id__": 0 }, - "fileId": "fcbar8tEpGco0DiCSJWXzp", + "fileId": "d7IcL7VqJHwYoi3v77fCn1", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4214,7 +4214,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4az9eG/4ZLra/sHDNXU2ZF" + "fileId": "87dNaLFfJHfby5Q8LScrdS" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4238,7 +4238,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6es2XwOvhEUIx8Ihbh/eQ0" + "fileId": "7dYB2UxEVJv6sF5bE9g5y7" }, { "__type__": "cc.PrefabInfo", @@ -4248,7 +4248,7 @@ "asset": { "__id__": 0 }, - "fileId": "d4aFxuBwxDZYmzjBJYCMdj", + "fileId": "c4c5m9SA9Nlp0tLGL5+BCW", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4431,7 +4431,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "02JzRMiZRLKaOArvh2m5/1" + "fileId": "ab1jcRPIBOT6c8/ryWUPsr" }, { "__type__": "cc.PrefabInfo", @@ -4441,7 +4441,7 @@ "asset": { "__id__": 0 }, - "fileId": "07lmZR/69IL4uEGBf9aYnN", + "fileId": "2cP52Lt9FCd78I8qwLciSp", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4472,7 +4472,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e9ZjCebNlGcaYCo6jBOQoZ" + "fileId": "92/ZqplhVFYb7C9ZkRMMaS" }, { "__type__": "cc.PrefabInfo", @@ -4482,7 +4482,7 @@ "asset": { "__id__": 0 }, - "fileId": "65qAJn61VAL5my247++eS3", + "fileId": "686wrFGuhJLIzPWDZApwCO", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4513,7 +4513,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ed21X4SPxIXL42tU+0JxYH" + "fileId": "6edCitillEe654rdPIrDLK" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4537,7 +4537,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "54QRSamC5AwKSUNxCiO23w" + "fileId": "e4CLfOP0dLZ50oXFyN7cYG" }, { "__type__": "cc.PrefabInfo", @@ -4547,7 +4547,7 @@ "asset": { "__id__": 0 }, - "fileId": "70CsTKY4hLpJDLq+33l/s8", + "fileId": "8fLuSNZb5LhLz5oeKdSlDw", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4572,7 +4572,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b1fZvSbb9N/YVmdb4a1qqs" + "fileId": "84XX62UPtCW7EEo0BaErRR" }, { "__type__": "cc.UITransform", @@ -4600,7 +4600,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "75jNr/A7xA4o6QKos6X6AB" + "fileId": "b7BVEltd5BcJaCHgcH97HM" }, { "__type__": "cc.Sprite", @@ -4645,7 +4645,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "542VzNcYRGLbEAjoo2uV4H" + "fileId": "edUyzAWB5MbpqWcAAP7QLq" }, { "__type__": "cc.PrefabInfo", @@ -4655,7 +4655,7 @@ "asset": { "__id__": 0 }, - "fileId": "bemPnYhSFMlKwcLnirFdHd", + "fileId": "d6cvDF1hlP/4J5tZupTqQl", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/Game/scripts/game/FreeSpinEnter.ts b/assets/Game/scripts/game/FreeSpinEnter.ts index 54a043f..39ae37e 100644 --- a/assets/Game/scripts/game/FreeSpinEnter.ts +++ b/assets/Game/scripts/game/FreeSpinEnter.ts @@ -28,6 +28,7 @@ export class FreeSpinEnter extends Component { show(freeCount: number, closeCallBack: (() => void) | null = null) { AudioManager.instance.playSFX('Free_Load_Sound'); + AudioManager.instance.stopBGM() this.freeSpinEnterUI = NodePoolManager.instance.getNodeFromPoolStatic('freeSpinEnter', this.freeSpinEnterPre); this.freeSpinEnterSpine = this.freeSpinEnterUI.getChildByName('spine').getComponent(sp.Skeleton); this.Node_1 = this.freeSpinEnterSpine.node.getChildByName('Node'); diff --git a/assets/Game/scripts/game/TotalWin.ts b/assets/Game/scripts/game/TotalWin.ts index b136f3d..ddfaa29 100644 --- a/assets/Game/scripts/game/TotalWin.ts +++ b/assets/Game/scripts/game/TotalWin.ts @@ -72,6 +72,7 @@ export class TotalWin extends Component { this.currentWinScore = this.winScore; // 确保最终数值精确 this.updateScoreLabel(); this.btnNode.active = true; + this.isScrolling = false; this.unschedule(updateScore); } }.bind(this); diff --git a/assets/Loading/scripts/manager/AudioManager.ts b/assets/Loading/scripts/manager/AudioManager.ts index e942e16..58397ba 100644 --- a/assets/Loading/scripts/manager/AudioManager.ts +++ b/assets/Loading/scripts/manager/AudioManager.ts @@ -86,12 +86,9 @@ export class AudioManager { availableSource.clip = clip; // 播放新音效 - if (loop) { - availableSource.loop = loop; - availableSource.play() - } else { - availableSource.playOneShot(clip, volume) - } + availableSource.loop = loop; + availableSource.play() + } else { // 如果没有空闲的AudioSource，创建一个新的 @@ -102,12 +99,9 @@ export class AudioManager { newSource.volume = volume; newSource.clip = clip; this._sfxAudioSources.push(newSource); - if (loop) { - newSource.loop = loop; - newSource.play() - } else { - newSource.playOneShot(clip, volume) - } + newSource.loop = loop; + newSource.play() + } }