diff --git a/assets/Game/prefabs/History/history_detail.prefab b/assets/Game/prefabs/History/history_detail.prefab index 357a682..e5de675 100644 --- a/assets/Game/prefabs/History/history_detail.prefab +++ b/assets/Game/prefabs/History/history_detail.prefab @@ -5160,7 +5160,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 16260 + "height": 1626 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -14125,7 +14125,7 @@ { "__type__": "cc.Node", "_name": "list_round_winning", - "_objFlags": 0, + "_objFlags": 512, "__editorExtras__": {}, "_parent": { "__id__": 1 @@ -14188,7 +14188,7 @@ { "__type__": "cc.Node", "_name": "scrollBar", - "_objFlags": 0, + "_objFlags": 512, "__editorExtras__": {}, "_parent": { "__id__": 589 @@ -14248,7 +14248,7 @@ { "__type__": "cc.Node", "_name": "bar", - "_objFlags": 0, + "_objFlags": 512, "__editorExtras__": {}, "_parent": { "__id__": 590 @@ -14553,7 +14553,7 @@ { "__type__": "cc.Node", "_name": "content", - "_objFlags": 0, + "_objFlags": 512, "__editorExtras__": {}, "_parent": { "__id__": 608 @@ -14603,7 +14603,7 @@ { "__type__": "cc.Node", "_name": "view", - "_objFlags": 0, + "_objFlags": 512, "__editorExtras__": {}, "_parent": { "__id__": 589 @@ -14861,7 +14861,7 @@ { "__type__": "cc.Node", "_name": "btn_close", - "_objFlags": 0, + "_objFlags": 512, "__editorExtras__": {}, "_parent": { "__id__": 589 diff --git a/assets/Game/prefabs/Paytable/paytable.prefab b/assets/Game/prefabs/Paytable/paytable.prefab index 780800d..ec2229f 100644 --- a/assets/Game/prefabs/Paytable/paytable.prefab +++ b/assets/Game/prefabs/Paytable/paytable.prefab @@ -885,7 +885,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 18120 + "height": 1812 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index ef93f3d..b010f7e 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -2329,7 +2329,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "00qIkRQGNCJ68s5fdNVZEQ", + "fileId": "f7H/Z2BFBGn7ydfmD8FdMf", "prefabRootNode": { "__id__": 1 }, @@ -2355,7 +2355,7 @@ "__id__": 91 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2366,7 +2366,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "feVdF+A8VLyK3IqVj01QSw", + "fileId": "74AGmri9JMLp16UiCAGwPe", "prefabRootNode": { "__id__": 1 }, @@ -2392,7 +2392,7 @@ "__id__": 94 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2403,7 +2403,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "85p9ue4ChAYqbsP694rHB/", + "fileId": "82oDLUGRxCboXwcj8zKV+y", "prefabRootNode": { "__id__": 1 }, @@ -2429,7 +2429,7 @@ "__id__": 97 }, "asset": { - "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2440,7 +2440,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "f0PcIKf7xDmoGCaQukLTQP", + "fileId": "a5ufs6IWlLFYZBZLpJbFwA", "prefabRootNode": { "__id__": 1 }, @@ -2466,7 +2466,7 @@ "__id__": 100 }, "asset": { - "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", + "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2477,7 +2477,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "dcLP1RS6FEUIBadDzzK4jO", + "fileId": "dcR5vNCtxMhpjf7/NeyEoM", "prefabRootNode": { "__id__": 1 }, @@ -2512,7 +2512,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3620LJJ35N2YweZbJNi93s" + "fileId": "55NdeR6ARJxJbYwhlfBYwE" }, { "__type__": "cc.PrefabInfo", @@ -2522,7 +2522,7 @@ "asset": { "__id__": 0 }, - "fileId": "b7GFykIIJAialAUq0Ga5Kc", + "fileId": "d9Z9y6ChFK+q5kyTXVZ4S7", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2553,7 +2553,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bcF3gW/2BPBpopmJeT0zUb" + "fileId": "1dokuqQgBO/JojKxakzy/q" }, { "__type__": "cc.PrefabInfo", @@ -2563,7 +2563,7 @@ "asset": { "__id__": 0 }, - "fileId": "8fpKxt3MNOxKaeWIYlDIkl", + "fileId": "e0ZdSwlOZKvbVxt/13QtxW", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2594,7 +2594,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f9BYi3ZodAxIrCajyr5JLL" + "fileId": "cbCk1tacBGXqJn/Ckm0hxg" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -2619,7 +2619,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e8mCY8wclLQr14jCkmCpbJ" + "fileId": "a6b2CSwUJBnoq7FmQmAL38" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2792,7 +2792,7 @@ "asset": { "__id__": 0 }, - "fileId": "7fEeE0/2tPEJ7qxBMOFhzZ", + "fileId": "7bIwKQBX5FdZNIViFGC84K", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2982,7 +2982,7 @@ "__id__": 123 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2993,7 +2993,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "08D8I0hCdCIItt0LXGLAHf", + "fileId": "1bXyYHdthH6avbDUD76eGw", "prefabRootNode": { "__id__": 1 }, @@ -3019,7 +3019,7 @@ "__id__": 126 }, "asset": { - "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3030,7 +3030,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "f2naspXXlN5aAZVvHeWjPB", + "fileId": "83fS7VFB1NQ4gWXMQ68DZl", "prefabRootNode": { "__id__": 1 }, @@ -3056,7 +3056,7 @@ "__id__": 129 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3067,7 +3067,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "0fIuDe5wNBr5+HUrvFL0uh", + "fileId": "86Gn9E35xIQI0aPhWFwwLY", "prefabRootNode": { "__id__": 1 }, @@ -3093,7 +3093,7 @@ "__id__": 132 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3104,7 +3104,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "feKZeenmVMl7q/SEUWmJ38", + "fileId": "a3IkIJz/hErrUhMD1nWzdi", "prefabRootNode": { "__id__": 1 }, @@ -3141,7 +3141,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "55ImNFnehMzI4bNdxAD7Dy", + "fileId": "6eu8NU+NxHmqov7UKMxOF1", "prefabRootNode": { "__id__": 1 }, @@ -3176,7 +3176,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "64m0BwV0FLA4gzEn+LGVmI" + "fileId": "deZ8RnMs5BZqa12+5TUvR0" }, { "__type__": "cc.PrefabInfo", @@ -3186,7 +3186,7 @@ "asset": { "__id__": 0 }, - "fileId": "61dUaFkZ1AgL9y11MnG7tR", + "fileId": "d6SRnO/yBL+6upeO9tPBu9", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3217,7 +3217,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "863eBPTY5DZIlpXzFoWqDH" + "fileId": "e7StK/KFdDO5YmsCVlOS/M" }, { "__type__": "cc.PrefabInfo", @@ -3227,7 +3227,7 @@ "asset": { "__id__": 0 }, - "fileId": "50qFznU45PI43JeI+pKDSO", + "fileId": "86IRsL7RBGLY19EpLk7zin", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3258,7 +3258,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ddyrTsLSpJILKeQVb6SRvy" + "fileId": "069iVrJy1EG7aWvFJiIKHc" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3283,7 +3283,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c54Kob21FB3JgwW1+l571Y" + "fileId": "55m4JtfORAW6PbF8yQpPk2" }, { "__type__": "cc.PrefabInfo", @@ -3293,7 +3293,7 @@ "asset": { "__id__": 0 }, - "fileId": "1dImfpCedMi4Ohgq44+tJk", + "fileId": "fdc9ubv0NHIZQKT3G7j/3+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3483,7 +3483,7 @@ "__id__": 152 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3494,7 +3494,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "4dGaRvz/tGMLrA5T7JqpD3", + "fileId": "afuNj27kJJGKqCMm5529io", "prefabRootNode": { "__id__": 1 }, @@ -3520,7 +3520,7 @@ "__id__": 155 }, "asset": { - "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3531,7 +3531,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "ba2rJqQ8hOwpakcyCMec6e", + "fileId": "8bpw1PdgxHQ7cXUAf78GIW", "prefabRootNode": { "__id__": 1 }, @@ -3557,7 +3557,7 @@ "__id__": 158 }, "asset": { - "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", + "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3568,7 +3568,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "11IibQb1FIkbruO3jFm/fS", + "fileId": "dadgL51sJEAa/8k9rNgEp0", "prefabRootNode": { "__id__": 1 }, @@ -3594,7 +3594,7 @@ "__id__": 161 }, "asset": { - "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", + "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3605,7 +3605,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "92h19HZN1AoJPMdqnF9Qik", + "fileId": "37hgue1fhDqasMv4hX//lA", "prefabRootNode": { "__id__": 1 }, @@ -3631,7 +3631,7 @@ "__id__": 164 }, "asset": { - "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3642,7 +3642,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "8bal1udF1CJ7tGDQdp9snN", + "fileId": "fbUUHPTP9G7IuQ/bF7eH3P", "prefabRootNode": { "__id__": 1 }, @@ -3677,7 +3677,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fajdTt2rRJtportY+lLG+4" + "fileId": "1dwB3ZTNlLoqvLdF38k6dc" }, { "__type__": "cc.PrefabInfo", @@ -3687,7 +3687,7 @@ "asset": { "__id__": 0 }, - "fileId": "08IsHuLFpEnJF4yQttBNgN", + "fileId": "55dESnSzVLOogkZp7hgdLA", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3718,7 +3718,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "17neju09hNfpdJqAJJ0pzA" + "fileId": "68Ljx4zRNMqLZNqVvVLwNM" }, { "__type__": "cc.PrefabInfo", @@ -3728,7 +3728,7 @@ "asset": { "__id__": 0 }, - "fileId": "d8BST3SD9B2aiVmONdntO0", + "fileId": "23MC4NBaVMM6PjlE2xoiUQ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3759,7 +3759,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3brJQKXZRNs5Q8GSdU4pq5" + "fileId": "dfGtJSwApHW4sRGjHn+pEy" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3784,7 +3784,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bb1bT4U71C6qQXXVnn32Jl" + "fileId": "9eEOqJpm1DQYGDOpJpzrGK" }, { "__type__": "cc.PrefabInfo", @@ -3794,7 +3794,7 @@ "asset": { "__id__": 0 }, - "fileId": "23Za7pYERLcLZ5/24/hAX8", + "fileId": "21UiBY7AxAsanI7oORfr6l", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3984,7 +3984,7 @@ "__id__": 181 }, "asset": { - "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", + "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3995,7 +3995,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "23lqMBYO9F/JnFinZ8RMKm", + "fileId": "8baV/qpZBHUol+YFOJtIQH", "prefabRootNode": { "__id__": 1 }, @@ -4021,7 +4021,7 @@ "__id__": 184 }, "asset": { - "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4032,7 +4032,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "98EQFKTyFDhpMHmLfX4wCW", + "fileId": "c0upJOcxVH8673pMcrbBfW", "prefabRootNode": { "__id__": 1 }, @@ -4058,7 +4058,7 @@ "__id__": 187 }, "asset": { - "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4069,7 +4069,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "a47k3RoMVGzqqE7z8RyvGp", + "fileId": "26qQK5mThFqYluA1FCVTAc", "prefabRootNode": { "__id__": 1 }, @@ -4095,7 +4095,7 @@ "__id__": 190 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4106,7 +4106,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "42nDmuvrVKrLodg8K/TC5k", + "fileId": "56i9eLf0xEHIJUZMvICPpW", "prefabRootNode": { "__id__": 1 }, @@ -4132,7 +4132,7 @@ "__id__": 193 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4143,7 +4143,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "8furd9N31ImavbLsLcbvTj", + "fileId": "94arTDu0BGcKFYhADOi/Y4", "prefabRootNode": { "__id__": 1 }, @@ -4178,7 +4178,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ecCYFuOztOJ6Wk4WUuMWKF" + "fileId": "bd5hHuG09BvJlYBszuyksb" }, { "__type__": "cc.PrefabInfo", @@ -4188,7 +4188,7 @@ "asset": { "__id__": 0 }, - "fileId": "4eTq5YEjBDy6db9A5lfC33", + "fileId": "ffPrVEQztA76H3Bq8GiZVK", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4219,7 +4219,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a3OOFFGPhCuqbixVZl3HFZ" + "fileId": "10gRVXKjNHsofnbWiS6Pg3" }, { "__type__": "cc.PrefabInfo", @@ -4229,7 +4229,7 @@ "asset": { "__id__": 0 }, - "fileId": "92uNVpOyxGyJNYekLEpw8D", + "fileId": "1bGgHez6tNXqeiQT2mebaw", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4260,7 +4260,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e7buSKLvlOU6jjMMCTBxQh" + "fileId": "073KAaNWRAsp+9i6WLoJqS" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4285,7 +4285,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "39k+z1lOtLHKqFl/BY1xAa" + "fileId": "ffXKIa4gNOgqd+uPLIZD1p" }, { "__type__": "cc.PrefabInfo", @@ -4295,7 +4295,7 @@ "asset": { "__id__": 0 }, - "fileId": "fb4+B6W/dBYbVFTOCdCLfx", + "fileId": "61MWewlQlC/rzf4OhGBNlB", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4485,7 +4485,7 @@ "__id__": 210 }, "asset": { - "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4496,7 +4496,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "cc52W6dalEXbRKvLMEu9dt", + "fileId": "dcDZU5h9JFx6x4Zj1q7WVc", "prefabRootNode": { "__id__": 1 }, @@ -4522,7 +4522,7 @@ "__id__": 213 }, "asset": { - "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", + "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4533,7 +4533,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "a473OM4oRBW67O67AbakPD", + "fileId": "84vHgLhBdDGIy9cybuurGS", "prefabRootNode": { "__id__": 1 }, @@ -4559,7 +4559,7 @@ "__id__": 216 }, "asset": { - "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4570,7 +4570,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "2cJlVbcr1FhanAjxIF0wS4", + "fileId": "c7bdRas9ZCaojVJFOJLvQq", "prefabRootNode": { "__id__": 1 }, @@ -4596,7 +4596,7 @@ "__id__": 219 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4607,7 +4607,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "24C/SOSbxAyrhhRebXBjYY", + "fileId": "43rDJh2IBMGazxe02cupAj", "prefabRootNode": { "__id__": 1 }, @@ -4633,7 +4633,7 @@ "__id__": 222 }, "asset": { - "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", + "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4644,7 +4644,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "b9QB37k+FAh4l8csPYXGwv", + "fileId": "d1oJ1gGzlMo65HzjUn28G4", "prefabRootNode": { "__id__": 1 }, @@ -4679,7 +4679,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1czMvYhARK8rvfEJVLca/d" + "fileId": "251nVJeaZJgKKS25k1oqd6" }, { "__type__": "cc.PrefabInfo", @@ -4689,7 +4689,7 @@ "asset": { "__id__": 0 }, - "fileId": "3c8x4QaRFCGLqGGBuOB+wP", + "fileId": "dbkHAjz2JB96RTe3kebgzd", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4720,7 +4720,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6eruuKSh5OlYnhlnSE/ocg" + "fileId": "2aWsidEglCh5BKBymuE4jb" }, { "__type__": "cc.PrefabInfo", @@ -4730,7 +4730,7 @@ "asset": { "__id__": 0 }, - "fileId": "9dv0LBhjZFEICboB06rH7R", + "fileId": "163kEpZRVON7Qj6uvtRK63", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4761,7 +4761,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "eajtZo09JATr268u0m9L4A" + "fileId": "20a2dh0yZMSoQ8TcHgzJEw" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4786,7 +4786,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "69tKHxBrJLj7Qjq7i+s9oz" + "fileId": "c7eSI0kMFH7qhZq+ZHIxY+" }, { "__type__": "cc.PrefabInfo", @@ -4796,7 +4796,7 @@ "asset": { "__id__": 0 }, - "fileId": "0bLw52vMdGR6jgs9lxt0+/", + "fileId": "ecguFXByNFCKxjD/9FlLP+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4997,7 +4997,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3bHVP8RDFFU7p0YPRDR/Zm", + "fileId": "28O28rc+FJ2KeRUxVd2LMn", "prefabRootNode": { "__id__": 1 }, @@ -5034,7 +5034,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "d8MVEZlepPCqD5dW7rRnVO", + "fileId": "f3l1ZcIUVM76HBhiEqITDF", "prefabRootNode": { "__id__": 1 }, @@ -5060,7 +5060,7 @@ "__id__": 245 }, "asset": { - "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5071,7 +5071,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "a9vLlr0YpBmrKRo5F+QVNV", + "fileId": "72/Ga/BOpOc7KM1ZKtvQjF", "prefabRootNode": { "__id__": 1 }, @@ -5108,7 +5108,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "84rG0diQxBK4ErVFOqHt2J", + "fileId": "ceGDqL6ohLb6Qk8c4krj1I", "prefabRootNode": { "__id__": 1 }, @@ -5134,7 +5134,7 @@ "__id__": 251 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5145,7 +5145,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "0dJzFpMVhFMKv/h7aQyJir", + "fileId": "3ccVs9DoFElKVswYbo5yNT", "prefabRootNode": { "__id__": 1 }, @@ -5180,7 +5180,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "eb9mR/8E5EuLDJ1FW/h6qz" + "fileId": "99GnMzDXlC/pXcTZQiTNmh" }, { "__type__": "cc.PrefabInfo", @@ -5190,7 +5190,7 @@ "asset": { "__id__": 0 }, - "fileId": "cb4wb73WRIk78f0DFghwEh", + "fileId": "6eAsmc//RAsZgIxS7UGfPR", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5221,7 +5221,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "aaAIqcdhhEdZt5B9WCY3uq" + "fileId": "0dWl+0iI5LuKsRpWUSsTe2" }, { "__type__": "cc.PrefabInfo", @@ -5231,7 +5231,7 @@ "asset": { "__id__": 0 }, - "fileId": "6cP0yDi/1GmporhSmKXkL+", + "fileId": "2c/GkejQNKKLweA9Gfv1iq", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5262,7 +5262,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "65ybg55cZK0rGnodbAVRUu" + "fileId": "786MkJY9lEnambXHuC4vzR" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -5287,7 +5287,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3caSmEDdRPTrAVtXZ3ufSS" + "fileId": "32NxLVCbdLc73pWCvdyJ3U" }, { "__type__": "cc.PrefabInfo", @@ -5297,7 +5297,7 @@ "asset": { "__id__": 0 }, - "fileId": "83jrdKQvlJdIFGK7za9xWm", + "fileId": "77mF7e4wFACKVkfocxS9gw", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5322,7 +5322,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5cKwdz88lPfr8a/UC7fNER" + "fileId": "47vOew1PxOKYRrnwmE1U1J" }, { "__type__": "cc.UITransform", @@ -5350,7 +5350,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6bdTKOcnhANb0Ssddoxsa+" + "fileId": "behFyiS61E84j3TohIjbCe" }, { "__type__": "cc.Graphics", @@ -5396,7 +5396,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3dqgvMxBJEDIStatdYNgH1" + "fileId": "acsqIm5exA3ZSAFRB6iC1X" }, { "__type__": "cc.PrefabInfo", @@ -5406,7 +5406,7 @@ "asset": { "__id__": 0 }, - "fileId": "f2tA5kMcpBdIPxi0KG46kb", + "fileId": "5cvstf3+VKIrw6SkfODQ7G", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/Game/prefabs/multi/totalMultiSpin.anim b/assets/Game/prefabs/multi/totalMultiSpin.anim index 31f2a5c..91b2c99 100644 --- a/assets/Game/prefabs/multi/totalMultiSpin.anim +++ b/assets/Game/prefabs/multi/totalMultiSpin.anim @@ -11,7 +11,7 @@ "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.6166666666666667, + "_duration": 0.9833333333333333, "_hash": 500763545, "_tracks": [ { @@ -70,8 +70,9 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3, - 0.6166666666666667 + 0.38333333333333336, + 0.6666666666666666, + 0.9833333333333333 ], "_values": [ { @@ -88,6 +89,20 @@ "broken": null } }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, @@ -126,8 +141,9 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3, - 0.6166666666666667 + 0.38333333333333336, + 0.6666666666666666, + 0.9833333333333333 ], "_values": [ { @@ -144,6 +160,20 @@ "broken": null } }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, @@ -182,8 +212,9 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3, - 0.6166666666666667 + 0.38333333333333336, + 0.6666666666666666, + 0.9833333333333333 ], "_values": [ { @@ -200,6 +231,20 @@ "broken": null } }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, @@ -277,8 +322,9 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3, - 0.6166666666666667 + 0.38333333333333336, + 0.6666666666666666, + 0.9833333333333333 ], "_values": [ { @@ -309,6 +355,20 @@ "tangentMode": 0 } }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 255, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, diff --git a/assets/Game/scripts/SlotGame.ts b/assets/Game/scripts/SlotGame.ts index d1fd54e..ddbfcbb 100644 --- a/assets/Game/scripts/SlotGame.ts +++ b/assets/Game/scripts/SlotGame.ts @@ -322,6 +322,7 @@ export class SlotGame extends Component { totalMulti.setPosition(new Vec3((labelNode.children[posArr[0]].getPosition().x + labelNode.children[posArr[posArr.length - 1]].getPosition().x) / 2 + 115, -65, 0)) totalMulti.getComponent(Label).string = "x" + winMulti.toString() tween(totalMulti) + .delay(0.4) .to(0.4, { position: new Vec3(0, isfree ? -395 : -500, 0) }) .call(() => { totalMulti.active = false @@ -582,7 +583,7 @@ export class SlotGame extends Component { this.scheduleOnce(() => { this.setWaysCount(this.spinData.Symbol.WaysNum); this.rollerManager.iconFallDown(this.spinData, false); - }, 0.5) + }, (this.spinData.WinInfo && this.spinData.WinInfo.MultPos) ? 0.5 : 0) } } diff --git a/assets/Game/scripts/SlotScene.ts b/assets/Game/scripts/SlotScene.ts index 6d3de1f..258b4a8 100644 --- a/assets/Game/scripts/SlotScene.ts +++ b/assets/Game/scripts/SlotScene.ts @@ -870,7 +870,7 @@ export class SlotScene extends Component { } // 3,4,5 - let delay = 0.5 + let delay = 0.1 // if (this.spinData.Symbol.WinMulti != 0) { // delay = 1.2 // }