diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index a5eaec5..b7a6204 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -2294,7 +2294,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f2f96AnsZHyZdAzGTvYTea" + "fileId": "bb86h9T2FGW5BKmAkaJ5l1" }, { "__type__": "cc.PrefabInfo", @@ -2304,7 +2304,7 @@ "asset": { "__id__": 0 }, - "fileId": "857315yUNA05K33EYJMkAy", + "fileId": "9drYUNqzJIhqJVmfpri3MN", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2335,7 +2335,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3eMs2+5pdJu6PsV5OJuqrE" + "fileId": "bcJVdIsAhML4NvQB5/S7Nk" }, { "__type__": "cc.PrefabInfo", @@ -2345,7 +2345,7 @@ "asset": { "__id__": 0 }, - "fileId": "95irYW1+1Jz7a4zib3dehg", + "fileId": "77k3K7zUpFwIvQDBT7E0M1", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2376,7 +2376,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "06IOhpPtBF0YVIbbLnNbuS" + "fileId": "a4IKvr9HBPUaatr9r+cH5i" }, { "__type__": "5fc10Zl7lVO97/rr2J1uxWH", @@ -2400,7 +2400,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "792/7SC/5Ezrjor3nhJCts" + "fileId": "c16t/csjFOmrQW5ncXg7CP" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2573,7 +2573,7 @@ "asset": { "__id__": 0 }, - "fileId": "cdOAXlwVFOsJCTaGIkMNcb", + "fileId": "edmSrJwEJErZUqOcdBS4x0", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2598,7 +2598,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "063u6oxgpJcZW/nOMnQQ6i" + "fileId": "2aV6cLVjFN6rmJ9HElUDNv" }, { "__type__": "cc.UITransform", @@ -2626,7 +2626,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ef6RwZzExG/InQR9vil9f0" + "fileId": "d8FhDfe5NOGoGYKU4c9/vF" }, { "__type__": "cc.Sprite", @@ -2671,7 +2671,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f2q3FbsilDVpV5goCkSpCR" + "fileId": "621Xbct21G1byyNA5APzJK" }, { "__type__": "cc.PrefabInfo", @@ -2681,7 +2681,7 @@ "asset": { "__id__": 0 }, - "fileId": "a2gwIeDp5Nu71I0uMjfOwm", + "fileId": "4ejr9zyR1DhoQFXBObg9UP", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2936,7 +2936,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03QWsR5f5D4Zs+C+8WW0Wv" + "fileId": "19Vz0lnxNKbZcvEolCvrJq" }, { "__type__": "cc.PrefabInfo", @@ -2946,7 +2946,7 @@ "asset": { "__id__": 0 }, - "fileId": "53ncsZIgdNzqhu5YCL0voJ", + "fileId": "60DNrinDhJT4Lmrg4f9A6L", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2977,7 +2977,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ec6tyDRy1KgKAlNx049QPE" + "fileId": "35nON1vwNOU4Md6Xx5Wz4R" }, { "__type__": "cc.PrefabInfo", @@ -2987,7 +2987,7 @@ "asset": { "__id__": 0 }, - "fileId": "efxzbZWmtPBqnY6GC4QZHc", + "fileId": "9baArHcvdHq7zVIkDXv8pO", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3018,7 +3018,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "86KO52gjBEY793kynF/oSq" + "fileId": "30qax1ZptAL5UyjHkqUSW2" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3042,7 +3042,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "78SulM4mZKY5wZHiJMLuXE" + "fileId": "61/c0apnhKiq7jUTKj9Lqh" }, { "__type__": "cc.PrefabInfo", @@ -3052,7 +3052,7 @@ "asset": { "__id__": 0 }, - "fileId": "38z+mnMrtBOo2Q6YK2S8cB", + "fileId": "79r5aDO7tNEoB/8WcVWktt", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3235,7 +3235,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3e/vgRrUZIgY5k+C321ZmN" + "fileId": "c32qQyr5BGMbCgcxsdgtjT" }, { "__type__": "cc.PrefabInfo", @@ -3245,7 +3245,7 @@ "asset": { "__id__": 0 }, - "fileId": "294FGTIL9EuIgwSosZ7nCs", + "fileId": "3eJ3+97lJIw6/nz4kuU3xl", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3276,7 +3276,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "devPhn+RlL4KW4Whq9N9Kp" + "fileId": "24iWYnp+ZOU4ElEcEeQxHO" }, { "__type__": "cc.PrefabInfo", @@ -3286,7 +3286,7 @@ "asset": { "__id__": 0 }, - "fileId": "30deIMweRHU4Ql4+beP6wc", + "fileId": "23TfKbN2tBAqaTmlRBVxtP", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3317,7 +3317,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a8oIz2KeNHqbIQhyr9RCzU" + "fileId": "ccO3sw10FIaYC8QTpINRYl" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3341,7 +3341,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3buIii1IVNyI+wpuJsZKk9" + "fileId": "64l4fi/WdI+7QS7iaRKmhh" }, { "__type__": "cc.PrefabInfo", @@ -3351,7 +3351,7 @@ "asset": { "__id__": 0 }, - "fileId": "99GBiF/YFIIq5iz2Gq6LTb", + "fileId": "a9X/a6p2RM0oYRJlE0v9Ra", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3534,7 +3534,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8bHhXSenZLjpfSfkZchK18" + "fileId": "e6t56iyZVHWIH6qqZmaHs4" }, { "__type__": "cc.PrefabInfo", @@ -3544,7 +3544,7 @@ "asset": { "__id__": 0 }, - "fileId": "86+1hPRVBHh4PvxzwynCtu", + "fileId": "d2Jcrzep1CJYjA4Mb7gbr+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3575,7 +3575,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "06zbwNw0tAY7QJrsTLXVim" + "fileId": "f3Ly8v2LZFGZ8bQjKUXVBm" }, { "__type__": "cc.PrefabInfo", @@ -3585,7 +3585,7 @@ "asset": { "__id__": 0 }, - "fileId": "fcNoCY3FVDB6nqPMWYJF9Y", + "fileId": "d606w/vLhLxb/3sQ0nPGrj", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3616,7 +3616,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "95ZUyBkzxKEqiYmt5WNXFP" + "fileId": "95FBTH0INGRq7K40AiPmun" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3640,7 +3640,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6cJvHb7HROuJAa5dJxY5Ic" + "fileId": "64MBa8EYNMFqR1waM03kC8" }, { "__type__": "cc.PrefabInfo", @@ -3650,7 +3650,7 @@ "asset": { "__id__": 0 }, - "fileId": "123eHBOKFJFqcOByZHBmNV", + "fileId": "59+yx6S35MvL/VQ/z5dFe0", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3833,7 +3833,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8dtQ2TIFhP5b5FwIwAW98s" + "fileId": "19wdeSls5HfJG9vbhh/kLa" }, { "__type__": "cc.PrefabInfo", @@ -3843,7 +3843,7 @@ "asset": { "__id__": 0 }, - "fileId": "93lZC8A/pFHL26KJJj0dY9", + "fileId": "b4swhCpKBDpZ2SbwnAURTz", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3874,7 +3874,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03oz8ikEhNoL9aFQtVukm3" + "fileId": "76OET1KKhIiaYOjxYjYb91" }, { "__type__": "cc.PrefabInfo", @@ -3884,7 +3884,7 @@ "asset": { "__id__": 0 }, - "fileId": "e5aRbuncFJwozFlaL7CIJ8", + "fileId": "e8bOqSY/1BPpYTX7VBnpkX", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3915,7 +3915,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bdfEJZBXJJA5akrENRKI4K" + "fileId": "9bdRKhCwZKi4rp4MBudaQp" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3939,7 +3939,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0ap/22jx9FvrWuOiQWIEUU" + "fileId": "7ccflZv5hGi5krdQq0aTSy" }, { "__type__": "cc.PrefabInfo", @@ -3949,7 +3949,7 @@ "asset": { "__id__": 0 }, - "fileId": "ca7iWfaLlKzZfzW8cVyYbS", + "fileId": "f6w8RlWeFEToEtNKBBMi+D", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4132,7 +4132,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "29jcz7ylBGYbKCVeMAzJUZ" + "fileId": "8ebcR/+Y5LToemFUczC9P5" }, { "__type__": "cc.PrefabInfo", @@ -4142,7 +4142,7 @@ "asset": { "__id__": 0 }, - "fileId": "d0h3YAiSlMWIBnqhtFaLm6", + "fileId": "eb5jCeNqlFGbP624CLSUX4", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4173,7 +4173,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "78abt8/n5K7Y3JP7rnadhU" + "fileId": "5aYzVwxLlHI6xWbxrzMzg9" }, { "__type__": "cc.PrefabInfo", @@ -4183,7 +4183,7 @@ "asset": { "__id__": 0 }, - "fileId": "d7IcL7VqJHwYoi3v77fCn1", + "fileId": "d4Mf9NMktDCZBlwuaSRYwh", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4214,7 +4214,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "87dNaLFfJHfby5Q8LScrdS" + "fileId": "722U7S5cFBfpdyM2qclsNK" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4238,7 +4238,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7dYB2UxEVJv6sF5bE9g5y7" + "fileId": "89OmHDswdGb6gxW6dHQXcj" }, { "__type__": "cc.PrefabInfo", @@ -4248,7 +4248,7 @@ "asset": { "__id__": 0 }, - "fileId": "c4c5m9SA9Nlp0tLGL5+BCW", + "fileId": "26AB2ifltFZ4krHCzUA4Td", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4431,7 +4431,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ab1jcRPIBOT6c8/ryWUPsr" + "fileId": "78XZjPLL9KyZYc1GgScI1D" }, { "__type__": "cc.PrefabInfo", @@ -4441,7 +4441,7 @@ "asset": { "__id__": 0 }, - "fileId": "2cP52Lt9FCd78I8qwLciSp", + "fileId": "996EVyQWFC0ZKAFtS1GmR7", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4472,7 +4472,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "92/ZqplhVFYb7C9ZkRMMaS" + "fileId": "bbD98EYdNG35endLUmxdl1" }, { "__type__": "cc.PrefabInfo", @@ -4482,7 +4482,7 @@ "asset": { "__id__": 0 }, - "fileId": "686wrFGuhJLIzPWDZApwCO", + "fileId": "52QfoL885AGoJmHI2VeYXc", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4513,7 +4513,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6edCitillEe654rdPIrDLK" + "fileId": "63eJfwA6RGyIxdtAZPJslS" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4537,7 +4537,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e4CLfOP0dLZ50oXFyN7cYG" + "fileId": "cbaiFg32xBe4rD2y8vJR95" }, { "__type__": "cc.PrefabInfo", @@ -4547,7 +4547,7 @@ "asset": { "__id__": 0 }, - "fileId": "8fLuSNZb5LhLz5oeKdSlDw", + "fileId": "37rM5m1sRG16ckC0C2Z9VK", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4572,7 +4572,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "84XX62UPtCW7EEo0BaErRR" + "fileId": "3avWXNrLlOGYDAU2hm1myP" }, { "__type__": "cc.UITransform", @@ -4600,7 +4600,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b7BVEltd5BcJaCHgcH97HM" + "fileId": "feGE5L3ipPs5jRUHKKYp1I" }, { "__type__": "cc.Sprite", @@ -4645,7 +4645,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "edUyzAWB5MbpqWcAAP7QLq" + "fileId": "3eFVx/1oBOGKZtfvfcjJKr" }, { "__type__": "cc.PrefabInfo", @@ -4655,7 +4655,7 @@ "asset": { "__id__": 0 }, - "fileId": "d6cvDF1hlP/4J5tZupTqQl", + "fileId": "cc0e1CxH1KOaELabTG0y//", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -10775,7 +10775,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -300, + "y": -275, "z": 0 }, "_lrot": { @@ -10854,8 +10854,8 @@ "_string": "", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 3, - "_fontSize": 3, + "_actualFontSize": 5, + "_fontSize": 5, "_fontFamily": "Arial", "_lineHeight": 3, "_overflow": 0, diff --git a/assets/Game/prefabs/TotalWin/TotalWinAni.prefab b/assets/Game/prefabs/TotalWin/TotalWinAni.prefab index cc1f917..2cdf9a4 100644 --- a/assets/Game/prefabs/TotalWin/TotalWinAni.prefab +++ b/assets/Game/prefabs/TotalWin/TotalWinAni.prefab @@ -741,7 +741,7 @@ }, "clickEvents": [], "_interactable": true, - "_transition": 0, + "_transition": 3, "_normalColor": { "__type__": "cc.Color", "r": 255, @@ -775,7 +775,7 @@ "_pressedSprite": null, "_disabledSprite": null, "_duration": 0.1, - "_zoomScale": 1.2, + "_zoomScale": 0.9, "_target": { "__id__": 24 }, diff --git a/assets/Game/scripts/SlotGame.ts b/assets/Game/scripts/SlotGame.ts index 198eaad..04d5af1 100644 --- a/assets/Game/scripts/SlotGame.ts +++ b/assets/Game/scripts/SlotGame.ts @@ -369,6 +369,9 @@ export class SlotGame extends Component { // icon掉落的逻辑 iconFallDown() { + if (this.rollerManager.checkNextRollerExpect(6, 3)) { + + } this.setWaysCount(this.spinData.WaysNum); this.rollerManager.iconFallDown(this.spinData); } @@ -732,7 +735,7 @@ export class SlotGame extends Component { if (rollerId == 0 || rollerId) { if (rollerId != -1) { await AudioManager.instance.stopAllSFX() - AudioManager.instance.playSFX('Appear_Scatter_Sound_Final', 1, true); + AudioManager.instance.playSFX('Appear_Scatter_Sound_Final', 1, false); } else { AudioManager.instance.stopAllSFX() } diff --git a/assets/Game/scripts/SlotScene.ts b/assets/Game/scripts/SlotScene.ts index c621183..8c11dc9 100644 --- a/assets/Game/scripts/SlotScene.ts +++ b/assets/Game/scripts/SlotScene.ts @@ -102,7 +102,7 @@ export class SlotScene extends Component { async start() { await this.init(); - // this.TotalWin.show(505000) + this.TotalWin.show(505000) // this.BigWinUI.show(200000, WIN_TYPE.BIG_WIN, 10000) } diff --git a/assets/Game/scripts/game/TotalWin.ts b/assets/Game/scripts/game/TotalWin.ts index ddfaa29..e3da423 100644 --- a/assets/Game/scripts/game/TotalWin.ts +++ b/assets/Game/scripts/game/TotalWin.ts @@ -70,9 +70,7 @@ export class TotalWin extends Component { if (progress >= 1) { this.currentWinScore = this.winScore; // 确保最终数值精确 - this.updateScoreLabel(); - this.btnNode.active = true; - this.isScrolling = false; + this.end() this.unschedule(updateScore); } }.bind(this); @@ -95,14 +93,12 @@ export class TotalWin extends Component { this.isSkipByTouch = true; // 立即完成当前动画 - this.isScrolling = false; this.unscheduleAllCallbacks(); // 直接设置为最终分数 this.currentWinScore = this.winScore; - this.updateScoreLabel(); - this.btnNode.active = true; + this.end() AudioManager.instance.stopAllSFX() AudioManager.instance.playSFX('Total_Settle_End_Sound'); } @@ -116,6 +112,13 @@ export class TotalWin extends Component { }) } + end() { + this.btnNode.active = true; + this.isScrolling = false; + this.updateScoreLabel(); + this.schedule(this.onClose, 5) + } + // 加入回调 onClose() { this.btn.node.off(Button.EventType.CLICK, this.onClose, this); diff --git a/assets/resources/audio/Appear_Scatter_Sound_Final.mp3 b/assets/resources/audio/Appear_Scatter_Sound_Final.mp3 index f2d134b..27d8db4 100644 Binary files a/assets/resources/audio/Appear_Scatter_Sound_Final.mp3 and b/assets/resources/audio/Appear_Scatter_Sound_Final.mp3 differ diff --git a/assets/resources/audio/Appear_Scatter_Sound_Final.mp3.meta b/assets/resources/audio/Appear_Scatter_Sound_Final.mp3.meta index 0da72fa..a4ea59c 100644 --- a/assets/resources/audio/Appear_Scatter_Sound_Final.mp3.meta +++ b/assets/resources/audio/Appear_Scatter_Sound_Final.mp3.meta @@ -2,7 +2,7 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "3aef0674-54b8-4650-913a-c863f751d668", + "uuid": "65b95788-2b5d-4527-a3d5-06ecbc7c8e98", "files": [ ".json", ".mp3" diff --git a/assets/resources/audio/Appear_Scatter_Sound_elimin.mp3 b/assets/resources/audio/Appear_Scatter_Sound_elimin.mp3 new file mode 100644 index 0000000..f2d134b Binary files /dev/null and b/assets/resources/audio/Appear_Scatter_Sound_elimin.mp3 differ diff --git a/assets/resources/audio/Appear_Scatter_Sound_elimin.mp3.meta b/assets/resources/audio/Appear_Scatter_Sound_elimin.mp3.meta new file mode 100644 index 0000000..0da72fa --- /dev/null +++ b/assets/resources/audio/Appear_Scatter_Sound_elimin.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "3aef0674-54b8-4650-913a-c863f751d668", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +}