diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index 9491cfa..53f8c15 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -629,7 +629,7 @@ "__expectedType__": "sp.SkeletonData" }, "defaultSkin": "default", - "defaultAnimation": "", + "defaultAnimation": "animation", "_premultipliedAlpha": false, "_timeScale": 1, "_preCacheMode": 0, @@ -2294,7 +2294,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "058Un1yypGYaG7v9Xw1Sm/" + "fileId": "72ushYN3xKg5m7fo94o6BO" }, { "__type__": "cc.PrefabInfo", @@ -2304,7 +2304,7 @@ "asset": { "__id__": 0 }, - "fileId": "f99qt0nu1A9Ichh5JA+12u", + "fileId": "47c3cBk6hK+r1OvPBCq8PW", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2335,7 +2335,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2aajaHOUxJlbiGDZsnk5ux" + "fileId": "e8/nkCNTRMm40ur8FY0/xe" }, { "__type__": "cc.PrefabInfo", @@ -2345,7 +2345,7 @@ "asset": { "__id__": 0 }, - "fileId": "2eT+7oGsdDF5wadFkiuZlL", + "fileId": "66MlCJ015LTZbGd4PD8VBV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2376,7 +2376,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f0Z1z8ZAJIC42i8C3MrLhu" + "fileId": "8cUZzB2RBD64owKwp0CuoR" }, { "__type__": "5fc10Zl7lVO97/rr2J1uxWH", @@ -2400,7 +2400,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "736AUdng5EU67KzDNGB07D" + "fileId": "e9VCIsVptH/a4hqUyQsg2P" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2573,7 +2573,7 @@ "asset": { "__id__": 0 }, - "fileId": "39WVUcPitFaJALaW/iMfYm", + "fileId": "d3VBi2mttGrpgMPoodAvfK", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2598,7 +2598,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bbYGYtLRhNp5zlp3OvVkIH" + "fileId": "b2Bf4gdutOvoM6jO1pu7Lz" }, { "__type__": "cc.UITransform", @@ -2626,7 +2626,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4dkKFkf4BD9aX1/DnszzVK" + "fileId": "46wj4Sr51PFLuGzbYVZbUT" }, { "__type__": "cc.Sprite", @@ -2671,7 +2671,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b6uHRgmotB95IgpKQ4+Biy" + "fileId": "6c3Wqt9whBhYFdzKWVZ5aD" }, { "__type__": "cc.PrefabInfo", @@ -2681,7 +2681,7 @@ "asset": { "__id__": 0 }, - "fileId": "aaOIfi/LhMk6Of7Q1RZYOv", + "fileId": "4f6HxitzdKSJ+B9hVUKanQ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2936,7 +2936,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fap0tyAgdNKrjBqUj8sNf2" + "fileId": "73SkqDw8lOyJX6z+83OwN0" }, { "__type__": "cc.PrefabInfo", @@ -2946,7 +2946,7 @@ "asset": { "__id__": 0 }, - "fileId": "d3AIn9TtRE95DZwG14A35e", + "fileId": "25FuUBa+VCRq+yBqNLBZhZ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2977,7 +2977,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4als1DG3dEXYXOh+aHKUWS" + "fileId": "e8vqsvsA1MbbFIYrIGR38J" }, { "__type__": "cc.PrefabInfo", @@ -2987,7 +2987,7 @@ "asset": { "__id__": 0 }, - "fileId": "226G9dKWREfJ4iPm3V3eJz", + "fileId": "68daSIEkFOkKKGx8NhbHsx", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3018,7 +3018,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c5QR8eX5dCQaIfNFTziUYg" + "fileId": "51M3h/Ix9OdrHNhL6/yzNq" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3042,7 +3042,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "42vPsJcpFPkYAc1Z7PEf07" + "fileId": "94HVGALFhEWrBqrEkbxCPQ" }, { "__type__": "cc.PrefabInfo", @@ -3052,7 +3052,7 @@ "asset": { "__id__": 0 }, - "fileId": "6bx4DnysdGHqlE5w+3pk0G", + "fileId": "bdeOQyVIxK16sbLx8jY7zH", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3235,7 +3235,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bf1AhMnoJAeqppI8Bop6AE" + "fileId": "19CwxEmsVNlIVKkb68jCOo" }, { "__type__": "cc.PrefabInfo", @@ -3245,7 +3245,7 @@ "asset": { "__id__": 0 }, - "fileId": "81wb5j+5RAspK0FEoWCqjF", + "fileId": "047NbH6lVFw6vo9/q3LV1f", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3276,7 +3276,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bfb2IMjvdNI45njINYu3+t" + "fileId": "862BbYSp1OipFqWxmRspE/" }, { "__type__": "cc.PrefabInfo", @@ -3286,7 +3286,7 @@ "asset": { "__id__": 0 }, - "fileId": "50q5yk8flJaqMwhOdzziRc", + "fileId": "3aP9I3zQpJJaGK9PAATTYB", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3317,7 +3317,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ccUr10uztPFIrtjfql+pVx" + "fileId": "25OQLbc55M9Kgvac4P98WF" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3341,7 +3341,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6crb/eH/5AJL1L65854Cu+" + "fileId": "6d6jj/VutFIY6d1yT1RFBB" }, { "__type__": "cc.PrefabInfo", @@ -3351,7 +3351,7 @@ "asset": { "__id__": 0 }, - "fileId": "6dbV9f2OhEp5zEMdCJGiIZ", + "fileId": "25N4TJeW9NO4wf8nEIVHSr", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3534,7 +3534,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a8gDy8x/xGIYSlB4sfep7H" + "fileId": "87Pb5Vx0ZEJa41ZmYZP5o7" }, { "__type__": "cc.PrefabInfo", @@ -3544,7 +3544,7 @@ "asset": { "__id__": 0 }, - "fileId": "59YvNbI0VBs4+DfdBFi+l1", + "fileId": "10qSUN8ctJHqWGmCBemnKn", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3575,7 +3575,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "basXKws1FLIb3uOBIhxUzf" + "fileId": "1aByQjlVJKsbR6eHRGY3Hg" }, { "__type__": "cc.PrefabInfo", @@ -3585,7 +3585,7 @@ "asset": { "__id__": 0 }, - "fileId": "4dsN++GNNDPIEdG5EaMnuI", + "fileId": "9d00hIbTtPF4ASi0/WjBrv", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3616,7 +3616,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2aM6VRx5tGaotiTtQi3PtT" + "fileId": "ebm2jc60JAWYLdELGo8hKV" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3640,7 +3640,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ccWPSXBYhEaplfF4UxMrkB" + "fileId": "967McGVshLup+ul5BKxMJg" }, { "__type__": "cc.PrefabInfo", @@ -3650,7 +3650,7 @@ "asset": { "__id__": 0 }, - "fileId": "88X6jPF+dM7a9p9LcBmhrG", + "fileId": "dcj9tqDNNDbaGKkb4ImBhF", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3833,7 +3833,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a9hQI4JUdPV4C5MoPUUEqF" + "fileId": "9aa5DsEqhBdpxd0IFfs4Me" }, { "__type__": "cc.PrefabInfo", @@ -3843,7 +3843,7 @@ "asset": { "__id__": 0 }, - "fileId": "65waFVqsZPjoDX7WiMihzL", + "fileId": "f3ROAlGMpGJIpLwf5D2Eg5", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3874,7 +3874,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6aFsM7zthJzqBsUqhvGkte" + "fileId": "55u7qdRpVA7o6AzMTuq0oa" }, { "__type__": "cc.PrefabInfo", @@ -3884,7 +3884,7 @@ "asset": { "__id__": 0 }, - "fileId": "8dVgVkRB5AkbXgx4deoj03", + "fileId": "86V/MF2ZZNKb0YztZdwk59", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3915,7 +3915,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e0L3+bZ6FNPra6xdDmke9z" + "fileId": "b1IyB0ltpGOJQ6SJl76fCq" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3939,7 +3939,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b9p6Yrbm1ERoGwJzYOxpnK" + "fileId": "b0jUF84GJJwa30SyTMAnEg" }, { "__type__": "cc.PrefabInfo", @@ -3949,7 +3949,7 @@ "asset": { "__id__": 0 }, - "fileId": "67vjoL+fRFgpvM7jtCfJKR", + "fileId": "87BM4jHX1JMZMLt60wIzPV", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4132,7 +4132,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0hEnzUwNCF4FN2z9tEyIY" + "fileId": "e7YdKcthRG0IJOhqYmjk4y" }, { "__type__": "cc.PrefabInfo", @@ -4142,7 +4142,7 @@ "asset": { "__id__": 0 }, - "fileId": "f6TnHTnG5K8oSmfv5GX70K", + "fileId": "9fWZowzS1CmrfhJJdwa/aK", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4173,7 +4173,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "39aLVM3IxNhryRoHVSR7KK" + "fileId": "ealG5NsmVJz4Z+irr3l188" }, { "__type__": "cc.PrefabInfo", @@ -4183,7 +4183,7 @@ "asset": { "__id__": 0 }, - "fileId": "44pahaMGdIToUYNbmtvJ1G", + "fileId": "e1u4/XLgtBOqEJBcD0Xrl5", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4214,7 +4214,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "29IooiAvJHj7PYvsIhuAyM" + "fileId": "fc+d3c5GBFkYN6xqy0OZrf" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4238,7 +4238,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a8uSUjnU5BKIQKf3VfkIdV" + "fileId": "00Pr7EpW5FK4bPXoUuut+W" }, { "__type__": "cc.PrefabInfo", @@ -4248,7 +4248,7 @@ "asset": { "__id__": 0 }, - "fileId": "29RIzB/SNK14pw2mUIqnP9", + "fileId": "35jlc8qTJBRoFz6yewXjNP", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4431,7 +4431,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e5O5Ovo0tHSr/EmAo5tW5/" + "fileId": "f8dgQQgAZLoYuhYI4uuSIo" }, { "__type__": "cc.PrefabInfo", @@ -4441,7 +4441,7 @@ "asset": { "__id__": 0 }, - "fileId": "89Ymrd1PNF+KqCrtOqQqtt", + "fileId": "e8FH7j8ApN76NEWCljcV4q", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4472,7 +4472,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1dT94qiiNEE6a+48QAotj4" + "fileId": "31vrDONqBD3Zm9+nXOiJd8" }, { "__type__": "cc.PrefabInfo", @@ -4482,7 +4482,7 @@ "asset": { "__id__": 0 }, - "fileId": "a5Hu0jkYJLKZbjLKgDQ0Jm", + "fileId": "ec/7SSBQBCyJxTqdX6vxaL", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4513,7 +4513,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9eV3B+G1JGgYshyHPHJLHt" + "fileId": "ab4WBHWZdIQrZw+xJeAZV2" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4537,7 +4537,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "97Mva3AvJIaYduE1U9r1nv" + "fileId": "a589XnKxlFLav6xDDbj/IJ" }, { "__type__": "cc.PrefabInfo", @@ -4547,7 +4547,7 @@ "asset": { "__id__": 0 }, - "fileId": "58saad66NKKLc7ONrCqyyT", + "fileId": "ee5eWRejZPH56tY/Pgr7yU", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4572,7 +4572,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d8tLOz5pxPHbpI8raYrCPM" + "fileId": "c3QZ2idzVNArYapdjZKc0G" }, { "__type__": "cc.UITransform", @@ -4600,7 +4600,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4bwoz98o5IJq7hsXYxtgFx" + "fileId": "70U3G1ArxO6Yiz1ZhwqoRT" }, { "__type__": "cc.Sprite", @@ -4645,7 +4645,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "34PkDT8VZH561PwEk5ehzy" + "fileId": "fa83ezSRNAm7XUvWm0ky3w" }, { "__type__": "cc.PrefabInfo", @@ -4655,7 +4655,7 @@ "asset": { "__id__": 0 }, - "fileId": "9dkkEpuM5GnZCk9cRSUqwH", + "fileId": "eaTz0P6bBL8pK5qzaxHhQD", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -7927,7 +7927,7 @@ } ], "_interactable": true, - "_transition": 1, + "_transition": 3, "_normalColor": { "__type__": "cc.Color", "r": 255, @@ -7961,7 +7961,7 @@ "_pressedSprite": null, "_disabledSprite": null, "_duration": 0.1, - "_zoomScale": 1.2, + "_zoomScale": 0.9, "_target": null, "_id": "" }, diff --git a/assets/Game/scripts/SlotGame.ts b/assets/Game/scripts/SlotGame.ts index 04d5af1..df5109e 100644 --- a/assets/Game/scripts/SlotGame.ts +++ b/assets/Game/scripts/SlotGame.ts @@ -788,7 +788,6 @@ export class SlotGame extends Component { } playScatterAni(callback: Function) { - AudioManager.instance.playSFX('Appear_Scatter_Win_Sound'); let scatterPos = this.rollerManager.getScatterPos(); let iconNodes = []; scatterPos.forEach(pos => { diff --git a/assets/Game/scripts/SlotScene.ts b/assets/Game/scripts/SlotScene.ts index c621183..7876527 100644 --- a/assets/Game/scripts/SlotScene.ts +++ b/assets/Game/scripts/SlotScene.ts @@ -783,7 +783,7 @@ export class SlotScene extends Component { }); this.BigWinUI.show(score, winType, this.slotBar.getBet()); } else { - this.slotGame.showWinScore(true, false, false, false, true, false, score); + this.slotGame.showWinScore(true, false, true, false, true, false, score); this.slotBar.setWin(this.spinData.AllScore); callback?.(); } diff --git a/assets/resources/audio/Appear_Scatter_Sound.mp3 b/assets/resources/audio/Appear_Scatter_Sound.mp3 index 7d6aaab..f593fe2 100644 Binary files a/assets/resources/audio/Appear_Scatter_Sound.mp3 and b/assets/resources/audio/Appear_Scatter_Sound.mp3 differ diff --git a/assets/resources/audio/Appear_Scatter_Sound.mp3.meta b/assets/resources/audio/Appear_Scatter_Sound.mp3.meta index 69b441a..7b2e541 100644 --- a/assets/resources/audio/Appear_Scatter_Sound.mp3.meta +++ b/assets/resources/audio/Appear_Scatter_Sound.mp3.meta @@ -2,7 +2,7 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "1b3d8b58-b2b9-4970-b362-b06d45916dfa", + "uuid": "24e19fdc-2d92-4b70-981b-9d5d6b99b2c8", "files": [ ".json", ".mp3" diff --git a/assets/resources/audio/Appear_Scatter_Win_Sound.mp3 b/assets/resources/audio/Appear_Scatter_Win_Sound.mp3 deleted file mode 100644 index 27d8db4..0000000 Binary files a/assets/resources/audio/Appear_Scatter_Win_Sound.mp3 and /dev/null differ diff --git a/assets/resources/audio/Appear_Scatter_Win_Sound.mp3.meta b/assets/resources/audio/Appear_Scatter_Win_Sound.mp3.meta deleted file mode 100644 index cbee422..0000000 --- a/assets/resources/audio/Appear_Scatter_Win_Sound.mp3.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "5132e951-5114-445c-a93d-43688126c719", - "files": [ - ".json", - ".mp3" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -}