From d9d6a9bbe4f7c1e9732c3aaf2698c6464995bcd1 Mon Sep 17 00:00:00 2001 From: TJH Date: Wed, 25 Feb 2026 15:48:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=81=9C=E6=AD=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/Game/SlotScene.prefab | 212 +++++++++++----------- assets/Game/scripts/SlotBar.ts | 19 +- assets/Game/scripts/SlotScene.ts | 26 +-- assets/Game/scripts/game/BaseRoller.ts | 2 +- assets/Game/scripts/game/Roller.ts | 69 ++++--- assets/Game/scripts/game/RollerManager.ts | 4 +- 6 files changed, 161 insertions(+), 171 deletions(-) diff --git a/assets/Game/SlotScene.prefab b/assets/Game/SlotScene.prefab index 733ba03..704a2dd 100644 --- a/assets/Game/SlotScene.prefab +++ b/assets/Game/SlotScene.prefab @@ -2327,7 +2327,7 @@ "__id__": 88 }, "asset": { - "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", + "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2338,7 +2338,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "b2gk1wSqdKB7NRiii1T4Ig", + "fileId": "236gZQoZpLUot+ZOt6xoEJ", "prefabRootNode": { "__id__": 1 }, @@ -2364,7 +2364,7 @@ "__id__": 91 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2375,7 +2375,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "15CCKzl0VLyLzQ1D6+/FVV", + "fileId": "13Owlsg+9C+4MGkAImYZ0d", "prefabRootNode": { "__id__": 1 }, @@ -2401,7 +2401,7 @@ "__id__": 94 }, "asset": { - "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2412,7 +2412,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "0aNB0CstlGI73YvL8RJLcZ", + "fileId": "70ZMLJQNVFPJSo+ZLgUILO", "prefabRootNode": { "__id__": 1 }, @@ -2438,7 +2438,7 @@ "__id__": 97 }, "asset": { - "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2449,7 +2449,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "c2aIUU88xE+5kfYJ96KYJg", + "fileId": "97ubHEk9xJBq60DHgrpGm1", "prefabRootNode": { "__id__": 1 }, @@ -2475,7 +2475,7 @@ "__id__": 100 }, "asset": { - "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2486,7 +2486,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "b79fmcYgdAvYHmGmqo783Y", + "fileId": "d7zsqY+LlFFYovJ+EL1Bce", "prefabRootNode": { "__id__": 1 }, @@ -2521,7 +2521,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e04exNjW1K94U1vFjdYhnb" + "fileId": "3f1L62GOFGcpMSLEgFxw5Y" }, { "__type__": "cc.PrefabInfo", @@ -2531,7 +2531,7 @@ "asset": { "__id__": 0 }, - "fileId": "f46jfmDslIDYfMj6sYpm7J", + "fileId": "7dfheaOqhB/LSJ6trmflqc", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2562,7 +2562,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "27dQcL2H5DkqY6fCc0oBMd" + "fileId": "e96AsctINBPIbQZYV3GVOA" }, { "__type__": "cc.PrefabInfo", @@ -2572,7 +2572,7 @@ "asset": { "__id__": 0 }, - "fileId": "79GNYZyL5D4620VNrPnW9U", + "fileId": "69GiwbyFVDpqGd+29Nbrxg", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2603,7 +2603,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f3nGCKVLhGfqDSqz7Su4YV" + "fileId": "dcPDkUHWVAhZ1KoGnmXgtf" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -2628,7 +2628,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "082Jx2rilG4aK2gS90h+b7" + "fileId": "3bNjRMocxDxIcQNUCXasqw" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2801,7 +2801,7 @@ "asset": { "__id__": 0 }, - "fileId": "69y7gYlglBar3jbMzaUokr", + "fileId": "3faKtHaKxKYYMSQprP10rL", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2991,7 +2991,7 @@ "__id__": 123 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3002,7 +3002,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "34BOuJ3YhA7rCRDcH4gMqq", + "fileId": "e6HNoU/8FP2onytwBaDZrw", "prefabRootNode": { "__id__": 1 }, @@ -3028,7 +3028,7 @@ "__id__": 126 }, "asset": { - "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", + "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3039,7 +3039,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "8cFkdl/mVHvYI1U32if7DB", + "fileId": "64NQHiZ3tHA6ZVDBPV/Zap", "prefabRootNode": { "__id__": 1 }, @@ -3065,7 +3065,7 @@ "__id__": 129 }, "asset": { - "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", + "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3076,7 +3076,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "9cRMA9vglOQ4VvAVS7s2Ka", + "fileId": "3e0tjoR8xNp7Cq14QxfUo+", "prefabRootNode": { "__id__": 1 }, @@ -3102,7 +3102,7 @@ "__id__": 132 }, "asset": { - "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3113,7 +3113,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "1fCsiaCzxAjKbJMHWyb1VY", + "fileId": "ffBc48wfFGBJiwNKBJo4RE", "prefabRootNode": { "__id__": 1 }, @@ -3139,7 +3139,7 @@ "__id__": 135 }, "asset": { - "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3150,7 +3150,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "c2OVDq+w9AEpyVl9SHyUS9", + "fileId": "28gqQOTKxJ7o2HUwfbO5zD", "prefabRootNode": { "__id__": 1 }, @@ -3185,7 +3185,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ba8Oz9vw5FZ5ZkrkVp2Osh" + "fileId": "28mgzDII9HnLZlFrkY+D7A" }, { "__type__": "cc.PrefabInfo", @@ -3195,7 +3195,7 @@ "asset": { "__id__": 0 }, - "fileId": "9dWbRxD9BHW5AEAe4QWMHN", + "fileId": "e72JOpcrlE/qOzBn5XPQdu", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3226,7 +3226,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bfMrN7ZthAlaosQ+e4fehY" + "fileId": "79eXE8vBlNdatuJywEY231" }, { "__type__": "cc.PrefabInfo", @@ -3236,7 +3236,7 @@ "asset": { "__id__": 0 }, - "fileId": "9bOgOqflJPBK+0OkPbaKV0", + "fileId": "b650oZPcRNFqC8OBCe6MWG", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3267,7 +3267,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7bJQ+FMQZHM5hW3+HyL6kq" + "fileId": "5bg/skncNK4I1q3LmsmoEk" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3292,7 +3292,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "884Hh1M3pN4pwnzKpoJoLa" + "fileId": "19juE+XhNKp6djJEuKkkkI" }, { "__type__": "cc.PrefabInfo", @@ -3302,7 +3302,7 @@ "asset": { "__id__": 0 }, - "fileId": "3bcWeEhYdBHadJ1PA2twt/", + "fileId": "17EKrAa6tEVY33E1nUrXV7", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3492,7 +3492,7 @@ "__id__": 152 }, "asset": { - "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", + "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3503,7 +3503,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "f8SjINLZFNqZJNLRkriBIs", + "fileId": "a1Gu7xmQ9LYYCr0sVR2afO", "prefabRootNode": { "__id__": 1 }, @@ -3529,7 +3529,7 @@ "__id__": 155 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3540,7 +3540,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "94TL7Si4hBYIATM6dr/x7b", + "fileId": "efzMsGPhlDIYi94s9pT0RQ", "prefabRootNode": { "__id__": 1 }, @@ -3566,7 +3566,7 @@ "__id__": 158 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3577,7 +3577,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "40VlNfprRCjab+iDKTKGan", + "fileId": "4aFbVqZBlIbIBVbFPttFk5", "prefabRootNode": { "__id__": 1 }, @@ -3603,7 +3603,7 @@ "__id__": 161 }, "asset": { - "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3614,7 +3614,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "7ccN6GcjdJKZPVQwoh/RR3", + "fileId": "07PNaEl3JFOJit6A0/iHoo", "prefabRootNode": { "__id__": 1 }, @@ -3640,7 +3640,7 @@ "__id__": 164 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3651,7 +3651,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "2aejUPTYhHELrA7gZ1ON74", + "fileId": "27iOVLl4pIgKJ8IO+IGSKR", "prefabRootNode": { "__id__": 1 }, @@ -3686,7 +3686,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fb36k349ZIAoNLKjnZENE3" + "fileId": "97M079GKBJ5qLjBHsfnrfr" }, { "__type__": "cc.PrefabInfo", @@ -3696,7 +3696,7 @@ "asset": { "__id__": 0 }, - "fileId": "1aP2zaoa5BQ5J+2G542cdM", + "fileId": "11L2GQo+xDUq7A0aqZZWV/", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3727,7 +3727,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3eUbX8MEhF4Zhu8VHt4RGm" + "fileId": "6euaXohStCDarSGHinKLQE" }, { "__type__": "cc.PrefabInfo", @@ -3737,7 +3737,7 @@ "asset": { "__id__": 0 }, - "fileId": "0aYp+6fclBkb+ZimZ/5gtl", + "fileId": "a3QLt5d7ZGJ7Q4y2nUOZOl", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3768,7 +3768,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e8ikETRmRGR5HnLDzFuPsk" + "fileId": "a5YVIIDf1JgJMiR+V2v56w" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3793,7 +3793,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "68//pLO4FHCq0xzh001JSh" + "fileId": "daEeKKNH1GGrVwmjTDFXoA" }, { "__type__": "cc.PrefabInfo", @@ -3803,7 +3803,7 @@ "asset": { "__id__": 0 }, - "fileId": "2cIL4VK4pBZqu6znQO5QwS", + "fileId": "63shLIzgpN14rfG27S+QEH", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3993,7 +3993,7 @@ "__id__": 181 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4004,7 +4004,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "02jDaZhW1M7bfIhairqhPU", + "fileId": "821GqVb3RMEqENCET7QC7z", "prefabRootNode": { "__id__": 1 }, @@ -4030,7 +4030,7 @@ "__id__": 184 }, "asset": { - "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4041,7 +4041,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "e0OcwyLFVKsZahz+DlGaBS", + "fileId": "ea1bYnVClOgZx8PeVsSJSU", "prefabRootNode": { "__id__": 1 }, @@ -4067,7 +4067,7 @@ "__id__": 187 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4078,7 +4078,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "9425YDwcdLwZ/2zZICO7ie", + "fileId": "adZr83UqFIm5/ZEFUwrT7g", "prefabRootNode": { "__id__": 1 }, @@ -4104,7 +4104,7 @@ "__id__": 190 }, "asset": { - "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4115,7 +4115,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "fayj3yGKJErJr6vTwTHvNw", + "fileId": "423IffJeFCJ6ViBe4QI7ZM", "prefabRootNode": { "__id__": 1 }, @@ -4141,7 +4141,7 @@ "__id__": 193 }, "asset": { - "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4152,7 +4152,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "72T5gBKrZPuIBEzbRe4LZv", + "fileId": "90RPWw3OBDxJBifAX0Wv7z", "prefabRootNode": { "__id__": 1 }, @@ -4187,7 +4187,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "89ThJEVeBB7KHjXTkZFnLG" + "fileId": "76EoX6/ntELqYS0owH3rNC" }, { "__type__": "cc.PrefabInfo", @@ -4197,7 +4197,7 @@ "asset": { "__id__": 0 }, - "fileId": "839T9iBF9Lj41Xi36RyxiF", + "fileId": "cen8Gf+ytC646eDTbmb81s", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4228,7 +4228,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9317k5hKRAvLc1iQfzMCM9" + "fileId": "e2bIZS389PKJEckD5L/Xeo" }, { "__type__": "cc.PrefabInfo", @@ -4238,7 +4238,7 @@ "asset": { "__id__": 0 }, - "fileId": "68E5ArC3lP8JTuuomRXkN1", + "fileId": "82ZEZ3Z0dIh7FJpS5316OJ", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4269,7 +4269,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1cC7YUiMdJ8KU83xu/vtgh" + "fileId": "2fJ95Y1ABPiZ1VJGpXRYVc" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4294,7 +4294,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "99weM98AZNuYrTXwvexZ4p" + "fileId": "efbtJfbIJDQqazY1SMdkW2" }, { "__type__": "cc.PrefabInfo", @@ -4304,7 +4304,7 @@ "asset": { "__id__": 0 }, - "fileId": "51MVuC5hFJ0YlaGsa0LsEI", + "fileId": "2eajoVUNpAoZF6vkFshF/x", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4494,7 +4494,7 @@ "__id__": 210 }, "asset": { - "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4505,7 +4505,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "7d8BbfzG1J94Ke9RobbmkK", + "fileId": "a2KC2sV/ZN2bgJmvARxUhj", "prefabRootNode": { "__id__": 1 }, @@ -4531,7 +4531,7 @@ "__id__": 213 }, "asset": { - "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4542,7 +4542,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "1dE+xGTYVLxqBTg7xacVe6", + "fileId": "e8GCo9HtFCu7R4IxireMg/", "prefabRootNode": { "__id__": 1 }, @@ -4568,7 +4568,7 @@ "__id__": 216 }, "asset": { - "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4579,7 +4579,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "e9WGQFhdpJU5Zla76aOwkC", + "fileId": "a1oRuVT1BHwbLuNFC3h7NB", "prefabRootNode": { "__id__": 1 }, @@ -4605,7 +4605,7 @@ "__id__": 219 }, "asset": { - "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4616,7 +4616,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "66nS9HrfNFvZUmOKXVEigr", + "fileId": "04MaB/tAVJt5l1O1PNgNMq", "prefabRootNode": { "__id__": 1 }, @@ -4642,7 +4642,7 @@ "__id__": 222 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4653,7 +4653,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "578A/JgbpA47IP5eioZNK0", + "fileId": "4c4jqzQuJO15zpB6vFbk5b", "prefabRootNode": { "__id__": 1 }, @@ -4688,7 +4688,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a9g6UMUUNJAoX1P6Ws/KbD" + "fileId": "a1Uo4k9TNP5bxry8aeADow" }, { "__type__": "cc.PrefabInfo", @@ -4698,7 +4698,7 @@ "asset": { "__id__": 0 }, - "fileId": "570lNmk+1Bc4dtSDbYFod1", + "fileId": "fdIUdh8vVPVYZbuZI5xY0n", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4729,7 +4729,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "48ec9DQ6JOC5TenawtJoci" + "fileId": "f0tAqEmV5BBqv/u8mx3aGz" }, { "__type__": "cc.PrefabInfo", @@ -4739,7 +4739,7 @@ "asset": { "__id__": 0 }, - "fileId": "0dEtJ0HM9NcY0D7pNkJ/XZ", + "fileId": "51+EDPtdVG7qsQN1lcqb+6", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4770,7 +4770,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "31TLuT3gRPzLl91RpTozE2" + "fileId": "99Ot2ZxgBE25BOY8Op2nSV" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4795,7 +4795,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b3gy1e3CNIn54DjxbnOE86" + "fileId": "f39InFyV9JEZvaUd39Mdhi" }, { "__type__": "cc.PrefabInfo", @@ -4805,7 +4805,7 @@ "asset": { "__id__": 0 }, - "fileId": "9feL4FfRFF0KHpiijvyhco", + "fileId": "fbG/ZMP/ZLKYpFHiggLkq6", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4995,7 +4995,7 @@ "__id__": 239 }, "asset": { - "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", + "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5006,7 +5006,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "1fDz1DVKxF9LJu06G4rS9h", + "fileId": "1br+8oRyJNu7PifTE5VLd4", "prefabRootNode": { "__id__": 1 }, @@ -5032,7 +5032,7 @@ "__id__": 242 }, "asset": { - "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", + "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5043,7 +5043,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "04nbK36rVHj6iiPBeRIZhZ", + "fileId": "43L5XjhHNHWrpTCaUz1ZCe", "prefabRootNode": { "__id__": 1 }, @@ -5069,7 +5069,7 @@ "__id__": 245 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5080,7 +5080,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "7dIJhDUFhPWIVQHDrMNLor", + "fileId": "198mgT7mhMAakmIio5oECR", "prefabRootNode": { "__id__": 1 }, @@ -5106,7 +5106,7 @@ "__id__": 248 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5117,7 +5117,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "2eEvKcdPxBkaT4irvHYtsF", + "fileId": "7cZNBO3JdL75bjdMWl4nL8", "prefabRootNode": { "__id__": 1 }, @@ -5143,7 +5143,7 @@ "__id__": 251 }, "asset": { - "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5154,7 +5154,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "9cNhXJPWJLeoGUT101QisQ", + "fileId": "9czF2u+ZZMKZVhOtNUU8q+", "prefabRootNode": { "__id__": 1 }, @@ -5189,7 +5189,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b70wx2xNRBg4gQ8ol9ll7X" + "fileId": "fdOTSqixhCu5grvMEpFGyq" }, { "__type__": "cc.PrefabInfo", @@ -5199,7 +5199,7 @@ "asset": { "__id__": 0 }, - "fileId": "22Rbr90hhC36ZBYz1slNq9", + "fileId": "f6/bSvLDdB3LcMTGFx25L2", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5230,7 +5230,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d0WSffkuhO06TbTWb5BcJd" + "fileId": "7f4oGo2EdG3ZOlmeJLEOU7" }, { "__type__": "cc.PrefabInfo", @@ -5240,7 +5240,7 @@ "asset": { "__id__": 0 }, - "fileId": "645xXZaXNHsIzt90dC8ryY", + "fileId": "01xdQiXatGCZYkHXHhiPdF", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5271,7 +5271,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c85f6pRuhLcYWQBfM8oKvT" + "fileId": "c2QXWaqOhOr6Plo8nbL0UB" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -5296,7 +5296,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fdazufGbtKc5n7NADs4SWI" + "fileId": "d7GAc+IW9LO4lHHeyjcFvR" }, { "__type__": "cc.PrefabInfo", @@ -5306,7 +5306,7 @@ "asset": { "__id__": 0 }, - "fileId": "30k7XjD2hKQKpKU8ENZtkz", + "fileId": "2cUlwkI21O0ZZOASqAXWEr", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5331,7 +5331,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "4e0IDaZOtN1qa3uYYtkgL/" + "fileId": "688cL3mMFON5AptCcY3Mdf" }, { "__type__": "cc.UITransform", @@ -5359,7 +5359,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b1CKyn2ctI/6jqC5ZCP2Sq" + "fileId": "45crYDFtNF0JWPVONf0Og6" }, { "__type__": "cc.Graphics", @@ -5405,7 +5405,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a1bc7zq0NJja3qhVunLrIe" + "fileId": "ad+me6v4JNnJItURO4AjYn" }, { "__type__": "cc.PrefabInfo", @@ -5415,7 +5415,7 @@ "asset": { "__id__": 0 }, - "fileId": "b6jaF5laZBLLV5L1TaJnFk", + "fileId": "9bTV2iBqZJxZ8XJGEuIsII", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/Game/scripts/SlotBar.ts b/assets/Game/scripts/SlotBar.ts index e8f51a3..0b4e728 100644 --- a/assets/Game/scripts/SlotBar.ts +++ b/assets/Game/scripts/SlotBar.ts @@ -273,19 +273,13 @@ export class SlotBar extends Component { }); } - allowClickManualStop(bl: boolean) { - this.hasClickSpin = bl; - this.manualStopNode.active = bl - } - notAllowClickManualStop(bl: boolean) { - this.hasClickManualStop = bl; - } onBtnSpin() { // 第一次点击 旋转 if (!this.hasClickSpin && !this.hasClickManualStop) { AudioManager.instance.playSFX("Spin_Button_Click"); + this.hasClickSpin = true; this.node.emit(SLOT_BAR_EVENT.ON_SPIN_CLICK); this.spinAni.startSpin(); @@ -304,7 +298,7 @@ export class SlotBar extends Component { // 第一次点击 旋转 if (!this.hasClickSpin && !this.hasClickManualStop) { // AudioManager.instance.playSFX('Spin_Button_Click'); - + this.hasClickSpin = true; this.setBtnEnable(this.subBtn, false); @@ -322,7 +316,7 @@ export class SlotBar extends Component { onBtnTestSpin(event, args) { // 第一次点击 旋转 if (!this.hasClickSpin && !this.hasClickManualStop) { - // this.hasClickSpin = true; + this.hasClickSpin = true; this.node.emit(SLOT_BAR_EVENT.ON_TEST_SPIN_CLICK, args); this.setBtnEnable(this.subBtn, false); @@ -343,7 +337,7 @@ export class SlotBar extends Component { } manualStop() { - this.notAllowClickManualStop(true) + this.hasClickManualStop = true; this.spinAni.stopSpin(); this.setBtnEnable(this.spinBtn, false); } @@ -646,9 +640,8 @@ export class SlotBar extends Component { } resetAllState() { - this.allowClickManualStop(false) - this.notAllowClickManualStop(false) - + this.hasClickSpin = false; + this.hasClickManualStop = false; this.isAuto = false; this.setBtnVisible(this.spinBtn, true); diff --git a/assets/Game/scripts/SlotScene.ts b/assets/Game/scripts/SlotScene.ts index 396ae89..50d51f9 100644 --- a/assets/Game/scripts/SlotScene.ts +++ b/assets/Game/scripts/SlotScene.ts @@ -283,11 +283,10 @@ export class SlotScene extends Component { isFreeSpin: boolean = false, isFeatureBuy: boolean = false ) { - this.isReceiveMsg = false; try { this.gameState.isOnReconnect = false; - - this.isErr = false + this.isReceiveMsg = false; + this.isErr = false; this.slotGame.spin(this.gameState.isInFreeSpin); this.gameState.isOneRoundEnd = false; this.slotGame.changeBg(this.gameState.isInFreeSpin); @@ -303,9 +302,14 @@ export class SlotScene extends Component { } else { if (!isFreeSpin) { if (!isFeatureBuy) { - this.slotBar.setBalance(this.slotBar.getBalance() - this.slotBar.getBet()); + this.slotBar.setBalance( + this.slotBar.getBalance() - this.slotBar.getBet() + ); } else { - this.slotBar.setBalance(this.slotBar.getBalance() - (this.slotBar.getBet() * this.gameInfo.BuyMul)); + this.slotBar.setBalance( + this.slotBar.getBalance() - + this.slotBar.getBet() * this.gameInfo.BuyMul + ); } } } @@ -323,8 +327,7 @@ export class SlotScene extends Component { } if (!this.gameState.isDebug) { this.spinInfo = await callGameApi("spin", msg); - this.slotBar.allowClickManualStop(true) - this.slotBar.notAllowClickManualStop(false) + if (this.spinInfo.Frb.Ongoing) { if (!isFreeSpin) { let count = this.spinInfo.Frb.Ongoing.Frn; @@ -360,7 +363,7 @@ export class SlotScene extends Component { this.isReceiveMsg = true; await this.handleSpinResult(); } catch (error) { - this.isErr = true + this.isErr = true; let errCode = parseInt(error.message.split("#")[0]); if (isNaN(errCode)) { this.showErrorTip(4); @@ -386,13 +389,12 @@ export class SlotScene extends Component { if (!this.isReceiveMsg) return; // 免费游戏不能手动停止 - // if (this.gameState.isInFreeSpin) { - // return; - // } + if (this.gameState.isInFreeSpin) { + return; + } // 滚轮没有开始旋转的时候不能停止 if (!this.slotGame.isScroll()) return; - if (this.gameState.isFastSpin) return; this.slotBar.manualStop(); this.slotGame.manualStop(); diff --git a/assets/Game/scripts/game/BaseRoller.ts b/assets/Game/scripts/game/BaseRoller.ts index fe80998..ee5d10c 100644 --- a/assets/Game/scripts/game/BaseRoller.ts +++ b/assets/Game/scripts/game/BaseRoller.ts @@ -626,7 +626,7 @@ export abstract class BaseRoller extends Component { abstract collectExistingIcons(): void; - abstract manualStopScroll(data: number[], isExpect: boolean): void; + abstract manualStopScroll(data: number[]): void; abstract createLastPage(): void; diff --git a/assets/Game/scripts/game/Roller.ts b/assets/Game/scripts/game/Roller.ts index 83d78d5..0768e18 100644 --- a/assets/Game/scripts/game/Roller.ts +++ b/assets/Game/scripts/game/Roller.ts @@ -266,47 +266,42 @@ export class Roller extends BaseRoller { * 手动停止滚动 * @param data 停止时的图标数据 */ - async manualStopScroll(data: number[], isExpect: boolean) { - // 693399c17dcc61106f024135_1_1 - if (isExpect) { - this.resetInfo(); - this._stopData = data; - this._info.isManualStop = true; - Tween.stopAllByTarget(this._info.speedNode); + async manualStopScroll(data: number[]) { + if (this._info.isManualStop || + this._info.state === ROLLER_STATE.STOP) { + return; + } - // 回收所有动态图标 - while (this._info.icons.length > 0) { - let icon = this._info.icons.pop(); + + this._info.resetLxInfo(); + 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); + } + + // 回收固定位置图标 + for (let i = 0; i < this.row; i++) { + let icon = this._allIcons.get(this._posToIconKey.get(i)); + if (icon) { + this._allIcons.delete(this._posToIconKey.get(i)); + this._posToIconKey.delete(i); this.iconFactory.recycleIcon(icon); } - - // 回收固定位置图标 - for (let i = 0; i < this.row; i++) { - let icon = this._allIcons.get(this._posToIconKey.get(i)); - if (icon) { - this._allIcons.delete(this._posToIconKey.get(i)); - this._posToIconKey.delete(i); - this.iconFactory.recycleIcon(icon); - } - } - - this.createInitIcons(data); - this.changeState(ROLLER_STATE.STOP); - - } else { - if (this._info.isManualStop) { - return; - } - - this._stopData = data; - this._info.isManualStop = true; - - this._info.speedDataComplete = true; - let stopSpeedData = this._info.isFastSpin ? [[0, 8000]] : [[0.5, 5500]]; - if (this._info.receiveStopData) { - this.stopScrollWork(stopSpeedData); - } } + 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 35f57c1..9c7e4c7 100644 --- a/assets/Game/scripts/game/RollerManager.ts +++ b/assets/Game/scripts/game/RollerManager.ts @@ -196,7 +196,7 @@ export class RollerManager extends Component { let stopSpeedData = this._isFastSpin ? [[0, 6000]] : [[0.1, 3500]]; if (!this._isFastSpin) { - stopSpeedData = isExpect ? [[1, 4000], [0.5], [0.1, 2500], [0.5], [0.5, 725]] : [[this._isManualStop ? 0 : 0.1, 3500]]; + stopSpeedData = isExpect ? [[1, 4000], [0.5], [0.1, 2500], [0.5], [0.5, 725]] : [[0.1, 3500]]; } if (nextStopRollerId != -1) { @@ -570,7 +570,7 @@ export class RollerManager extends Component { let roller = this.allRollers[i]; let rollerCroSymbols = processedCroSymbols[i]; roller.setCroSymbols(rollerCroSymbols); - roller.manualStopScroll(stopData, this.checkNextRollerExpect(6, 3)) + roller.manualStopScroll(stopData) } this.upLayer.resetAndSyncAllSpecials(this);