From fa4c6036b7da7eb1daa4de3bd9a059c041cfa63a Mon Sep 17 00:00:00 2001 From: TJH Date: Mon, 29 Dec 2025 16:28:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E5=A5=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/Game/prefabs/SlotScene.prefab | 206 +++++++++++----------- assets/Game/scripts/game/BaseRoller.ts | 18 +- assets/Game/scripts/game/Roller.ts | 42 +++-- assets/Game/scripts/game/RollerManager.ts | 15 +- 4 files changed, 144 insertions(+), 137 deletions(-) diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index 1c7c5f3..0020558 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -2321,7 +2321,7 @@ "__id__": 88 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2332,7 +2332,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "e0Wk07xsBMEI1lFE0KGD4r", + "fileId": "9aCiOGT5tLAKOpEdYvZMTE", "prefabRootNode": { "__id__": 1 }, @@ -2358,7 +2358,7 @@ "__id__": 91 }, "asset": { - "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2369,7 +2369,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "08clJOYHxFD7TzPTZh7tCb", + "fileId": "08AwGaCkhFQaWdZzFDZ9Tr", "prefabRootNode": { "__id__": 1 }, @@ -2395,7 +2395,7 @@ "__id__": 94 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2406,7 +2406,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "beiClGE4VMTZ94feymegy9", + "fileId": "ae/CpOwAdESqo7v2tTG2Ql", "prefabRootNode": { "__id__": 1 }, @@ -2432,7 +2432,7 @@ "__id__": 97 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2443,7 +2443,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "f7IFMZ8VhIRrTxWd98HdJS", + "fileId": "87e27P2WhNN5o2fB9qfFIN", "prefabRootNode": { "__id__": 1 }, @@ -2469,7 +2469,7 @@ "__id__": 100 }, "asset": { - "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", + "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2480,7 +2480,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "66/A8Wi9ZAxKFcKbJST5xE", + "fileId": "1aPFfrirBESqru31suXpoK", "prefabRootNode": { "__id__": 1 }, @@ -2515,7 +2515,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a7FwEHwH5KNoR5bmL7nCsS" + "fileId": "39qhA/ORZDs4MGvXOVc6VR" }, { "__type__": "cc.PrefabInfo", @@ -2525,7 +2525,7 @@ "asset": { "__id__": 0 }, - "fileId": "21yJaJEYpNRqoWjTQn5X5g", + "fileId": "f5WEnhRX1HpLt+SWMRSOcf", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2556,7 +2556,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f2NsiHLrJC9KpowzDxDxGJ" + "fileId": "82nxr3mW9GdI1UYdtoZeWS" }, { "__type__": "cc.PrefabInfo", @@ -2566,7 +2566,7 @@ "asset": { "__id__": 0 }, - "fileId": "dck2BewtRGL6M5whGv8ihx", + "fileId": "30SdPi2jJIR4hQzhoHVcnc", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2597,7 +2597,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bc7E0yBLtBNIyzTy/4Z94Z" + "fileId": "58VD2mph9Ne7+01xrRKzzQ" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -2622,7 +2622,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1aaPXP7opDwpMZ83JhvgEQ" + "fileId": "fbIu866ONFppBBmoD4gegl" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2795,7 +2795,7 @@ "asset": { "__id__": 0 }, - "fileId": "b66HHPg0lIFJEoYNRt9T3Z", + "fileId": "e4QTwibfJMc4ryRwWjyGIM", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2985,7 +2985,7 @@ "__id__": 123 }, "asset": { - "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2996,7 +2996,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "28/9+697BLVIikN31rjyff", + "fileId": "f3s5ubcwhD3ZpT3AFRAmMp", "prefabRootNode": { "__id__": 1 }, @@ -3022,7 +3022,7 @@ "__id__": 126 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3033,7 +3033,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "141bIbUFRF7rwghs2UMc7S", + "fileId": "76iP+XfhxDyZfpayG1c94o", "prefabRootNode": { "__id__": 1 }, @@ -3059,7 +3059,7 @@ "__id__": 129 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3070,7 +3070,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "a57A1C62dFa5fUW4FkM0dt", + "fileId": "e7HmQherFCSq50z/8JGL01", "prefabRootNode": { "__id__": 1 }, @@ -3096,7 +3096,7 @@ "__id__": 132 }, "asset": { - "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", + "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3107,7 +3107,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "6ffTUvpAtGkJJxm5rNu3B+", + "fileId": "05y4Bb2MVHaoIPWf+STR6b", "prefabRootNode": { "__id__": 1 }, @@ -3133,7 +3133,7 @@ "__id__": 135 }, "asset": { - "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", + "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3144,7 +3144,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "d0XzPm1wFGhopvsAoHU1sr", + "fileId": "95G+SD90NDk612nlDsvETt", "prefabRootNode": { "__id__": 1 }, @@ -3179,7 +3179,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "39ACo5rphAyJajOW6KaI9a" + "fileId": "acM0UN4odOqKGoRvIgV6O0" }, { "__type__": "cc.PrefabInfo", @@ -3189,7 +3189,7 @@ "asset": { "__id__": 0 }, - "fileId": "a9e72QcM5P2aMkvZCM/rsI", + "fileId": "70aB/YpcdOpI/RP9sr1Ue/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3220,7 +3220,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2cLSrEqiRLI7gW4kwMNYN8" + "fileId": "51/4bGmBtDzIG3jTLVjCqO" }, { "__type__": "cc.PrefabInfo", @@ -3230,7 +3230,7 @@ "asset": { "__id__": 0 }, - "fileId": "007KxkXtNLEYX6YdOHELma", + "fileId": "8bK4tQHp5KqqSXmitQi8Om", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3261,7 +3261,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d74y8C2thIGIZ7ukUYKaAH" + "fileId": "aajk3a+EdPEoVOZYg1FAu7" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3286,7 +3286,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "92VE+qBupCrrWO66Zr4v3F" + "fileId": "6cyRzJLghB1r27da66GMIe" }, { "__type__": "cc.PrefabInfo", @@ -3296,7 +3296,7 @@ "asset": { "__id__": 0 }, - "fileId": "be2Zz6t7lO8ZpsuwgJKDZ5", + "fileId": "39QAWX5QBF0YuyKppEUA+q", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3486,7 +3486,7 @@ "__id__": 152 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3497,7 +3497,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "4cnas5wJVHuJr2dmgoI1bo", + "fileId": "79Jv/RuFpGmJohg7ZZlVy3", "prefabRootNode": { "__id__": 1 }, @@ -3534,7 +3534,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "34H14dwH5MTZcLObuW9bLG", + "fileId": "20IimRvEhMhrpU5JkW5nbZ", "prefabRootNode": { "__id__": 1 }, @@ -3571,7 +3571,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "1661oalcdJJI6YQcSVEaA8", + "fileId": "fb8xXX/fFC+YLVAt3exrXB", "prefabRootNode": { "__id__": 1 }, @@ -3597,7 +3597,7 @@ "__id__": 161 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3608,7 +3608,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "feVt3CmnxL0avqUk58BMqO", + "fileId": "b5NsorKnRP5bYGuBEmAvdk", "prefabRootNode": { "__id__": 1 }, @@ -3634,7 +3634,7 @@ "__id__": 164 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3645,7 +3645,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "ecincF53xN9L6UQm7RYW0r", + "fileId": "7ceTsLWnpNNL2p3k5ddsL+", "prefabRootNode": { "__id__": 1 }, @@ -3680,7 +3680,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "301taXpedC1KqTKfJNL6HS" + "fileId": "9dJeNUxFNB3bmKwWvahgfI" }, { "__type__": "cc.PrefabInfo", @@ -3690,7 +3690,7 @@ "asset": { "__id__": 0 }, - "fileId": "fccmAhmelBOolGj8X2kLxb", + "fileId": "ceE3COlNdH7YmZfQlfNZ0f", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3721,7 +3721,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "834e16vbtP8ZDp/d6jQPxg" + "fileId": "28Kg7GF0REz57C8+DcFiI1" }, { "__type__": "cc.PrefabInfo", @@ -3731,7 +3731,7 @@ "asset": { "__id__": 0 }, - "fileId": "e9Wudnro9IkoF8dP6Q7NNl", + "fileId": "151clyQrFN746rmzm2SCmm", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3762,7 +3762,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "11aQhE1XFIboeuj0EDl2ll" + "fileId": "997siEErtAxrmjOgm6EDgF" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3787,7 +3787,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "77h3mQ4Z5O0au3gpUGPuU1" + "fileId": "a6WmkwQU1P45fYK7Gr4wtP" }, { "__type__": "cc.PrefabInfo", @@ -3797,7 +3797,7 @@ "asset": { "__id__": 0 }, - "fileId": "23iztLOP9ExafYC9HYHww4", + "fileId": "30SF6m+LRDIJxAodPdDkY/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3987,7 +3987,7 @@ "__id__": 181 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3998,7 +3998,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "9dNyWSq8RL7Z3j1faZ/9Yf", + "fileId": "e0R02s+z9K3bHSOojOFeay", "prefabRootNode": { "__id__": 1 }, @@ -4024,7 +4024,7 @@ "__id__": 184 }, "asset": { - "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", + "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4035,7 +4035,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3dNr8LQAtIkot+dYVNHvuH", + "fileId": "faB3QrH9xIjJmaIe1liUe5", "prefabRootNode": { "__id__": 1 }, @@ -4061,7 +4061,7 @@ "__id__": 187 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4072,7 +4072,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "f2SmMx5c9LcJHzQcj2ahpI", + "fileId": "dcDaZbHSBA+L/ZuXAXqWIR", "prefabRootNode": { "__id__": 1 }, @@ -4098,7 +4098,7 @@ "__id__": 190 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4109,7 +4109,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "5eqJcwrzJJ4Y8V0j2SquXM", + "fileId": "5eSmoVWnVM7ZIgGNOcEnma", "prefabRootNode": { "__id__": 1 }, @@ -4135,7 +4135,7 @@ "__id__": 193 }, "asset": { - "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4146,7 +4146,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "1axPwou5tJ15X2g9bdsR2p", + "fileId": "3bLvpMds5PJIAjlDVS6P29", "prefabRootNode": { "__id__": 1 }, @@ -4181,7 +4181,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3eN+bYHA5NfYRpeUQDceXf" + "fileId": "b84Isbva1FUaxEvzIyN/9U" }, { "__type__": "cc.PrefabInfo", @@ -4191,7 +4191,7 @@ "asset": { "__id__": 0 }, - "fileId": "1ceM+1zaZAgYPt27ngFCdW", + "fileId": "455oG9uapE5oG04cdgAteb", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4222,7 +4222,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "22nBVMXShDW6wZN/1Fdcs3" + "fileId": "102S40IZ9NU7PT3p6FBp0H" }, { "__type__": "cc.PrefabInfo", @@ -4232,7 +4232,7 @@ "asset": { "__id__": 0 }, - "fileId": "e6IMJzn0lNqYtER8hyv8yT", + "fileId": "49FzWJDq1NyIotkz3L/FDE", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4263,7 +4263,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "aat/ywABBHloVna0JabH8U" + "fileId": "4e+pPDZYJIzr1Fguob8Ehk" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4288,7 +4288,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d28GBslDBDZJDcKskfZoLG" + "fileId": "87i79FPk9Ia4+NNKNZal1S" }, { "__type__": "cc.PrefabInfo", @@ -4298,7 +4298,7 @@ "asset": { "__id__": 0 }, - "fileId": "81+uyA7lZKbZ546S2tiSwG", + "fileId": "ddsAZCX1lGN7AqanElX2Ea", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4488,7 +4488,7 @@ "__id__": 210 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4499,7 +4499,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "a9kxq61yBEZ5p79bAqN4iC", + "fileId": "bciPsvuQRG5IB44rYJq/re", "prefabRootNode": { "__id__": 1 }, @@ -4525,7 +4525,7 @@ "__id__": 213 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4536,7 +4536,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "24DyBTNqpJ7rz/GkwrC93y", + "fileId": "6aR4mps+ZK/oyQHNvEi07n", "prefabRootNode": { "__id__": 1 }, @@ -4562,7 +4562,7 @@ "__id__": 216 }, "asset": { - "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4573,7 +4573,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "37AwpcOyJMFrU8T4C3oqWR", + "fileId": "80Kt7VnR9G550SKCTQ8Zt2", "prefabRootNode": { "__id__": 1 }, @@ -4599,7 +4599,7 @@ "__id__": 219 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4610,7 +4610,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "e3RYysAwNNDap9bvs9EQtD", + "fileId": "dc3doRRuJH6oE02fPasSJ1", "prefabRootNode": { "__id__": 1 }, @@ -4636,7 +4636,7 @@ "__id__": 222 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4647,7 +4647,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "143inRGpdNqJ71wtMsr8nL", + "fileId": "389oqlAaZAi5AlTlMAgYES", "prefabRootNode": { "__id__": 1 }, @@ -4682,7 +4682,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ab7epOwxFJlZ0EmB+Jrd/R" + "fileId": "2fAIaSbntEUZdtq/0Tk9JC" }, { "__type__": "cc.PrefabInfo", @@ -4692,7 +4692,7 @@ "asset": { "__id__": 0 }, - "fileId": "f0wCqEaSRHhZtYnY0p0PWQ", + "fileId": "a2gLvyF65NuJBe8c343l2B", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4723,7 +4723,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d6F6O8WS9LGJhZPNfiAtWN" + "fileId": "81YP/cEodI0KNedIY7uRZW" }, { "__type__": "cc.PrefabInfo", @@ -4733,7 +4733,7 @@ "asset": { "__id__": 0 }, - "fileId": "15Sit9dV5FrYeeVsIDu/HZ", + "fileId": "9fE46VjiRH+ZUymYl2xVfO", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4764,7 +4764,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "420UxG+65P4pbjt/16/uUI" + "fileId": "acYoTYXMpEI6Lqakt9GjeR" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4789,7 +4789,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9a5cNN4RhFs6DvPdS3BMyq" + "fileId": "73yOk/yzRImpPBGbsHKRb/" }, { "__type__": "cc.PrefabInfo", @@ -4799,7 +4799,7 @@ "asset": { "__id__": 0 }, - "fileId": "96s/KAZRlB56zWsAyiqMee", + "fileId": "b4FSZ9sP1HdokzvFUo+AFp", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4989,7 +4989,7 @@ "__id__": 239 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5000,7 +5000,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "2f6T5rFLtHS4Jly3V5SRO3", + "fileId": "feU/khK8NKgIJVShLo+39M", "prefabRootNode": { "__id__": 1 }, @@ -5037,7 +5037,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "4bQ64/KoRIuYXyu8c4n44p", + "fileId": "f9DHSYspNNubGwGb2uGFPP", "prefabRootNode": { "__id__": 1 }, @@ -5063,7 +5063,7 @@ "__id__": 245 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5074,7 +5074,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "84gFzdTFhHh5didzCYG4wo", + "fileId": "81wbattExKtI3xru89EO6u", "prefabRootNode": { "__id__": 1 }, @@ -5111,7 +5111,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "ebCrTpjnpDSY7L7EW3T8L/", + "fileId": "2a0UGDXM9PyLdH0FJqtV80", "prefabRootNode": { "__id__": 1 }, @@ -5137,7 +5137,7 @@ "__id__": 251 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5148,7 +5148,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "a2dSsXLstMLb3aylbLpKXy", + "fileId": "e0X/7qo7JNsLx8Y4tewSUl", "prefabRootNode": { "__id__": 1 }, @@ -5183,7 +5183,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "681y0hnTlKS5EG5uqEdZ/q" + "fileId": "3898edKiRFS7VKSDfQcCE0" }, { "__type__": "cc.PrefabInfo", @@ -5193,7 +5193,7 @@ "asset": { "__id__": 0 }, - "fileId": "adhrZpjmBOsqcpvos4CK/O", + "fileId": "0a5WLoxgtBXoDXf7mNoRa+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5224,7 +5224,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0a9HCFARZFVIBx1hR3hXTc" + "fileId": "cdQ8GBlZlNwKH/8hc/knai" }, { "__type__": "cc.PrefabInfo", @@ -5234,7 +5234,7 @@ "asset": { "__id__": 0 }, - "fileId": "b9wb27gH1G6ZM4u72hpJb1", + "fileId": "e1pLlFDelOLJoewBkVFexb", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5265,7 +5265,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3eh57Q8blM7Lhd9+qKoRSG" + "fileId": "cde32t0RVEnqInpS2fGPV9" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -5290,7 +5290,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a5p9o8N+FEJLRTvz0DZ2Ge" + "fileId": "10fIkHn71O1bwK0txK05+q" }, { "__type__": "cc.PrefabInfo", @@ -5300,7 +5300,7 @@ "asset": { "__id__": 0 }, - "fileId": "10ALYWDLVLSIg13fd2q6fu", + "fileId": "98Eac38I5Op61f2lpjzZKQ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5325,7 +5325,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "385cD63+9L5ZQiRi2MLPj3" + "fileId": "86ylgvhVdFQ5pzwZcDmK7g" }, { "__type__": "cc.UITransform", @@ -5342,7 +5342,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1040, - "height": 840 + "height": 830 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5353,7 +5353,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6dHD9N9uZNUIA0ReryBStQ" + "fileId": "9040Ec1Z5GaL7wIhPynQEf" }, { "__type__": "cc.Graphics", @@ -5399,7 +5399,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "27epwcwqpGeq4M5/Z5CJmi" + "fileId": "fb1pJSy6FCK4KqrKz/QydN" }, { "__type__": "cc.PrefabInfo", @@ -5409,7 +5409,7 @@ "asset": { "__id__": 0 }, - "fileId": "1fYhYgNL9ELpIy7xUq2lD2", + "fileId": "c2p1iQcAJBrJbtvxECGvUZ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/Game/scripts/game/BaseRoller.ts b/assets/Game/scripts/game/BaseRoller.ts index 71516ef..a3cdf40 100644 --- a/assets/Game/scripts/game/BaseRoller.ts +++ b/assets/Game/scripts/game/BaseRoller.ts @@ -30,6 +30,7 @@ export class Info { receiveStopData: boolean = false;// 是否收到停止数据 speedDataComplete: boolean = false;// 速度数据是否完成 stopSpeedData: number[][] = null;// 停止时的速度数据 + hasStopScrollWork: boolean = false; state: ROLLER_STATE = ROLLER_STATE.STOP; // 当前状态 isFastSpin: boolean = false; // 是否快速旋转 isManualStop: boolean = false; // 是否手动停止 @@ -47,6 +48,7 @@ export class Info { this.speed = 0; this.stopSpeedData = null; this.isManualStop = false; + this.hasStopScrollWork = false; this.speedDataComplete = false; } } @@ -389,15 +391,15 @@ export abstract class BaseRoller extends Component { * 停止滚动 * @param data 停止时的图标数据 */ - stopScroll(data: number[], stopSpeedData: number[][]) { - this._stopData = data; - this._info.receiveStopData = true; + // stopScroll(data: number[], stopSpeedData: number[][]) { + // this._stopData = data; + // this._info.receiveStopData = true; - // 如果速度数据已完成，执行停止逻辑 - if (this._info.speedDataComplete) { - this.stopScrollWork(stopSpeedData); - } - } + // // 如果速度数据已完成，执行停止逻辑 + // if (this._info.speedDataComplete) { + // this.stopScrollWork(stopSpeedData); + // } + // } /** diff --git a/assets/Game/scripts/game/Roller.ts b/assets/Game/scripts/game/Roller.ts index 526c3ee..9a3bb82 100644 --- a/assets/Game/scripts/game/Roller.ts +++ b/assets/Game/scripts/game/Roller.ts @@ -226,23 +226,43 @@ export class Roller extends BaseRoller { }); } + stopScroll(panData: number[], stopSpeedDataExpect?: number[][]) { + this._stopData = panData; + + let stopSpeedData = []; + if (stopSpeedDataExpect) { + stopSpeedData = stopSpeedDataExpect; + } else { + let rollerSpeed = this.row * this.iconHeight / 0.1 * 175; + stopSpeedData = this._info.isFastSpin ? [[0, rollerSpeed]] : [[0.4, 5500]]; + } + + this._info.receiveStopData = true; + if (this._info.speedDataComplete) { + this.stopScrollWork(stopSpeedData); + } + } + + stopScrollWork(stopSpeedData: number[][]) { + this._info.hasStopScrollWork = true; + this.changeState(ROLLER_STATE.DECELERATE); + this._info.stopSpeedData = stopSpeedData; + this.tweenSpeed(this._info.stopSpeedData, () => { + this.changeState(ROLLER_STATE.LAST_PAGE_CREATE); + }); + } + /** * 手动停止滚动 * @param data 停止时的图标数据 */ async manualStopScroll(data: number[]) { - if (this._info.isManualStop || - this._info.state === ROLLER_STATE.STOP) { - return; - } - - - this._info.resetLxInfo(); + this.resetInfo(); this._stopData = data; this._info.isManualStop = true; Tween.stopAllByTarget(this._info.speedNode); - // 直接回收所有动态图标 + // 回收所有动态图标 while (this._info.icons.length > 0) { let icon = this._info.icons.pop(); this.iconFactory.recycleIcon(icon); @@ -257,14 +277,8 @@ export class Roller extends BaseRoller { this.iconFactory.recycleIcon(icon); } } - this._allIcons.clear(); - this._posToIconKey.clear(); this.createInitIcons(data); - // 为所有创建的图标播放动画 - for (let icon of this._allIcons.values()) { - icon.getComponent(Icon).playSpawnAni(); - } this.changeState(ROLLER_STATE.STOP); } diff --git a/assets/Game/scripts/game/RollerManager.ts b/assets/Game/scripts/game/RollerManager.ts index bcec037..0cf6647 100644 --- a/assets/Game/scripts/game/RollerManager.ts +++ b/assets/Game/scripts/game/RollerManager.ts @@ -510,18 +510,9 @@ export class RollerManager extends Component { } } } else { - frameOrder.forEach(({ frame, ids }) => { - let delay = Math.max(0, (frame - 1) / fps); - ids.forEach(id => { - let roller = this.allRollers[id]; - if (roller) { - this.scheduleOnce(() => { - if (this._isManualStop) return; - roller.startScroll(); - }, delay); - } - }); - }); + this.allRollers.forEach(roller => { + roller.startScroll(); + }) } }