Compare commits

..

No commits in common. "master" and "v0.0.93" have entirely different histories.

6 changed files with 135 additions and 147 deletions

View File

@ -2327,7 +2327,7 @@
"__id__": 88 "__id__": 88
}, },
"asset": { "asset": {
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -2338,7 +2338,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "aaJAtIa3xGoZ+odGpE0q2u", "fileId": "b2gk1wSqdKB7NRiii1T4Ig",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2364,7 +2364,7 @@
"__id__": 91 "__id__": 91
}, },
"asset": { "asset": {
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -2375,7 +2375,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "97p8L6dQtFWrTdHAB02LQW", "fileId": "15CCKzl0VLyLzQ1D6+/FVV",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2412,7 +2412,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "2erBJaNe9Mrp5UKTwe53Uq", "fileId": "0aNB0CstlGI73YvL8RJLcZ",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2438,7 +2438,7 @@
"__id__": 97 "__id__": 97
}, },
"asset": { "asset": {
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -2449,7 +2449,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "2bptwOAAJIN6kJpNCl3CYA", "fileId": "c2aIUU88xE+5kfYJ96KYJg",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2475,7 +2475,7 @@
"__id__": 100 "__id__": 100
}, },
"asset": { "asset": {
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -2486,7 +2486,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "6dG8ITKnRP8Lz0LWXFPHzY", "fileId": "b79fmcYgdAvYHmGmqo783Y",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2521,7 +2521,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "81jrSnnFtFgZNseoVipO3c" "fileId": "e04exNjW1K94U1vFjdYhnb"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2531,7 +2531,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "eegPp5Q41FBb0FG865dE11", "fileId": "f46jfmDslIDYfMj6sYpm7J",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2562,7 +2562,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "317Abb4thHEYsHaOS9p3l4" "fileId": "27dQcL2H5DkqY6fCc0oBMd"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2572,7 +2572,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "98kAu8cApDrorNcEveyTis", "fileId": "79GNYZyL5D4620VNrPnW9U",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2603,7 +2603,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "76Rb+dshJMarke/HKtCpz4" "fileId": "f3nGCKVLhGfqDSqz7Su4YV"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -2628,7 +2628,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "35wiUNh3tN1ZcE7qSzuaqs" "fileId": "082Jx2rilG4aK2gS90h+b7"
}, },
{ {
"__type__": "5fd13+Xa69CZogb3Q/F1lnC", "__type__": "5fd13+Xa69CZogb3Q/F1lnC",
@ -2801,7 +2801,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "b5dI+c89hEWJFy2z6lGv6S", "fileId": "69y7gYlglBar3jbMzaUokr",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -2991,7 +2991,7 @@
"__id__": 123 "__id__": 123
}, },
"asset": { "asset": {
"__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3002,7 +3002,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "f0EdPPTqZDQ5n5QJJ4lYdQ", "fileId": "34BOuJ3YhA7rCRDcH4gMqq",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3028,7 +3028,7 @@
"__id__": 126 "__id__": 126
}, },
"asset": { "asset": {
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3039,7 +3039,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "aeo7ZbGw5J/ryM4qmTeB/A", "fileId": "8cFkdl/mVHvYI1U32if7DB",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3065,7 +3065,7 @@
"__id__": 129 "__id__": 129
}, },
"asset": { "asset": {
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3076,7 +3076,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "dcakcWfYJM7oaAPnKmleE0", "fileId": "9cRMA9vglOQ4VvAVS7s2Ka",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3102,7 +3102,7 @@
"__id__": 132 "__id__": 132
}, },
"asset": { "asset": {
"__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3113,7 +3113,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "de+RJv+pBEfq8dvYXywnd9", "fileId": "1fCsiaCzxAjKbJMHWyb1VY",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3139,7 +3139,7 @@
"__id__": 135 "__id__": 135
}, },
"asset": { "asset": {
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3150,7 +3150,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "335ENyEjJG5Jzb289U4xKZ", "fileId": "c2OVDq+w9AEpyVl9SHyUS9",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3185,7 +3185,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "13CidbWvBNAbmQ+x6bIn7D" "fileId": "ba8Oz9vw5FZ5ZkrkVp2Osh"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3195,7 +3195,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "49KgYsZTJMI6f8nYsEt9G7", "fileId": "9dWbRxD9BHW5AEAe4QWMHN",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3226,7 +3226,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "092Ssg0QlGS40m2cIgaO34" "fileId": "bfMrN7ZthAlaosQ+e4fehY"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3236,7 +3236,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "11x9KcKgRAS6QLC2FzGQhC", "fileId": "9bOgOqflJPBK+0OkPbaKV0",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3267,7 +3267,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "a0YxRpZj1LNoqWy4HXSRJf" "fileId": "7bJQ+FMQZHM5hW3+HyL6kq"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3292,7 +3292,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d65q7lrp9PD65hWCVVJjKy" "fileId": "884Hh1M3pN4pwnzKpoJoLa"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3302,7 +3302,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "03ZHBEYH5Ei7qzlucsSNnK", "fileId": "3bcWeEhYdBHadJ1PA2twt/",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3492,7 +3492,7 @@
"__id__": 152 "__id__": 152
}, },
"asset": { "asset": {
"__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3503,7 +3503,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "13103AIqBG05OMwjpBByHQ", "fileId": "f8SjINLZFNqZJNLRkriBIs",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3529,7 +3529,7 @@
"__id__": 155 "__id__": 155
}, },
"asset": { "asset": {
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3540,7 +3540,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "58U2GDouNLVYGuWFjw1Ssf", "fileId": "94TL7Si4hBYIATM6dr/x7b",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3566,7 +3566,7 @@
"__id__": 158 "__id__": 158
}, },
"asset": { "asset": {
"__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3577,7 +3577,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "03alJx0M1G4rwMfkZ+5Vih", "fileId": "40VlNfprRCjab+iDKTKGan",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3603,7 +3603,7 @@
"__id__": 161 "__id__": 161
}, },
"asset": { "asset": {
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3614,7 +3614,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "592T1RiQhJ8b2BZlA7LBCk", "fileId": "7ccN6GcjdJKZPVQwoh/RR3",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3640,7 +3640,7 @@
"__id__": 164 "__id__": 164
}, },
"asset": { "asset": {
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3651,7 +3651,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "9bGZnpfmxNK4oaDu07Hdmf", "fileId": "2aejUPTYhHELrA7gZ1ON74",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3686,7 +3686,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "e00uqd4jpPuJdG5FIP0QEe" "fileId": "fb36k349ZIAoNLKjnZENE3"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3696,7 +3696,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "b1BBVMcYRI8IQ8UHsCKcTe", "fileId": "1aP2zaoa5BQ5J+2G542cdM",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3727,7 +3727,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "f3yeRT8bRLKYpbEHKTLDo4" "fileId": "3eUbX8MEhF4Zhu8VHt4RGm"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3737,7 +3737,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "b2hROy+SdMlIDHfs+cmrxu", "fileId": "0aYp+6fclBkb+ZimZ/5gtl",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3768,7 +3768,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "b8/4xrhmlP05oGBfhDMv08" "fileId": "e8ikETRmRGR5HnLDzFuPsk"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3793,7 +3793,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "52gnr7qhRN7JwnCjw0S0G1" "fileId": "68//pLO4FHCq0xzh001JSh"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3803,7 +3803,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "9eT9LrXplHVqXXCyeosS5X", "fileId": "2cIL4VK4pBZqu6znQO5QwS",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3993,7 +3993,7 @@
"__id__": 181 "__id__": 181
}, },
"asset": { "asset": {
"__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4004,7 +4004,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "afmmD7wiZBi7+cr7kpshC3", "fileId": "02jDaZhW1M7bfIhairqhPU",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4030,7 +4030,7 @@
"__id__": 184 "__id__": 184
}, },
"asset": { "asset": {
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4041,7 +4041,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "180DnYgbFFtYX6mmHb7p4L", "fileId": "e0OcwyLFVKsZahz+DlGaBS",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4067,7 +4067,7 @@
"__id__": 187 "__id__": 187
}, },
"asset": { "asset": {
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4078,7 +4078,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "c4U1JmwwBCVYjwq4AjZFCA", "fileId": "9425YDwcdLwZ/2zZICO7ie",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4104,7 +4104,7 @@
"__id__": 190 "__id__": 190
}, },
"asset": { "asset": {
"__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4115,7 +4115,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "87CXQIz3hN5a4q/S9Lkf67", "fileId": "fayj3yGKJErJr6vTwTHvNw",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4141,7 +4141,7 @@
"__id__": 193 "__id__": 193
}, },
"asset": { "asset": {
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4152,7 +4152,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "e5aYkYJURLxYIgno/QfbcT", "fileId": "72T5gBKrZPuIBEzbRe4LZv",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4187,7 +4187,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "276oikTq9Azb0lqg7/Dr5q" "fileId": "89ThJEVeBB7KHjXTkZFnLG"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4197,7 +4197,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "63d3pnX/1I+6zTQM4nB4CO", "fileId": "839T9iBF9Lj41Xi36RyxiF",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4228,7 +4228,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "72uKsm5flCuL5kh1r7vL17" "fileId": "9317k5hKRAvLc1iQfzMCM9"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4238,7 +4238,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "6bXtLQ5XlPmLsm2pXPxwwp", "fileId": "68E5ArC3lP8JTuuomRXkN1",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4269,7 +4269,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d2+0H34mFMeoX2zSz7xizC" "fileId": "1cC7YUiMdJ8KU83xu/vtgh"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -4294,7 +4294,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "2chT2dWP9L6L2060gVg6yL" "fileId": "99weM98AZNuYrTXwvexZ4p"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4304,7 +4304,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "2bg7VTBRRDXILKwfHLmheB", "fileId": "51MVuC5hFJ0YlaGsa0LsEI",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4494,7 +4494,7 @@
"__id__": 210 "__id__": 210
}, },
"asset": { "asset": {
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4505,7 +4505,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "bdY1hX019M6pYjY61SQiIk", "fileId": "7d8BbfzG1J94Ke9RobbmkK",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4531,7 +4531,7 @@
"__id__": 213 "__id__": 213
}, },
"asset": { "asset": {
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4542,7 +4542,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "bbHRGW3fdNzIpSZOuAXCNC", "fileId": "1dE+xGTYVLxqBTg7xacVe6",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4568,7 +4568,7 @@
"__id__": 216 "__id__": 216
}, },
"asset": { "asset": {
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4579,7 +4579,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "ffUPdvZXhKabHjcqHOPZeP", "fileId": "e9WGQFhdpJU5Zla76aOwkC",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4605,7 +4605,7 @@
"__id__": 219 "__id__": 219
}, },
"asset": { "asset": {
"__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4616,7 +4616,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "728NXrej1B7KCEylObF1JX", "fileId": "66nS9HrfNFvZUmOKXVEigr",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4642,7 +4642,7 @@
"__id__": 222 "__id__": 222
}, },
"asset": { "asset": {
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4653,7 +4653,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "2bIaXrnjdPWJvi00ePgBrq", "fileId": "578A/JgbpA47IP5eioZNK0",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4688,7 +4688,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d6qKdBtBhO2J1mt+EMTCDY" "fileId": "a9g6UMUUNJAoX1P6Ws/KbD"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4698,7 +4698,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "17TLnpOcFLtYHWnttuSrtx", "fileId": "570lNmk+1Bc4dtSDbYFod1",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4729,7 +4729,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "e9It6qj5VNGq7XeNd1Nb0+" "fileId": "48ec9DQ6JOC5TenawtJoci"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4739,7 +4739,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "afbe2oYpBPip7+QoCrfRJ9", "fileId": "0dEtJ0HM9NcY0D7pNkJ/XZ",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4770,7 +4770,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "21xAQWj6pOj6gFyf64vnoG" "fileId": "31TLuT3gRPzLl91RpTozE2"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -4795,7 +4795,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "baFg0SgRZMFoF/UolBY4eX" "fileId": "b3gy1e3CNIn54DjxbnOE86"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4805,7 +4805,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "dcCjAS62xPEppaHDf3VDWy", "fileId": "9feL4FfRFF0KHpiijvyhco",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -4995,7 +4995,7 @@
"__id__": 239 "__id__": 239
}, },
"asset": { "asset": {
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -5006,7 +5006,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "ecn1UmlnJINrlJpccpCxGf", "fileId": "1fDz1DVKxF9LJu06G4rS9h",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5032,7 +5032,7 @@
"__id__": 242 "__id__": 242
}, },
"asset": { "asset": {
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -5043,7 +5043,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "ecIn5wSxFJLK+hB/lkTBVg", "fileId": "04nbK36rVHj6iiPBeRIZhZ",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5069,7 +5069,7 @@
"__id__": 245 "__id__": 245
}, },
"asset": { "asset": {
"__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -5080,7 +5080,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "cdjriaJRNGx7v5y1afmaTM", "fileId": "7dIJhDUFhPWIVQHDrMNLor",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5106,7 +5106,7 @@
"__id__": 248 "__id__": 248
}, },
"asset": { "asset": {
"__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -5117,7 +5117,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "9aBYhs8YFGAYuUS30Srlql", "fileId": "2eEvKcdPxBkaT4irvHYtsF",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5143,7 +5143,7 @@
"__id__": 251 "__id__": 251
}, },
"asset": { "asset": {
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -5154,7 +5154,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "79PeXJlSJK8KVM98prnpzr", "fileId": "9cNhXJPWJLeoGUT101QisQ",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5189,7 +5189,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "27CzIOsbRAQLpZ48h3GD2/" "fileId": "b70wx2xNRBg4gQ8ol9ll7X"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -5199,7 +5199,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "342dYkEltBRYxXNXd9o/lS", "fileId": "22Rbr90hhC36ZBYz1slNq9",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -5230,7 +5230,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "b9WRxkSppH/IAUpQwKUBGB" "fileId": "d0WSffkuhO06TbTWb5BcJd"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -5240,7 +5240,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "43lqGalidA7qBCrAe9hrnK", "fileId": "645xXZaXNHsIzt90dC8ryY",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -5271,7 +5271,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "81DZaUlXdAnqh0EUSt140s" "fileId": "c85f6pRuhLcYWQBfM8oKvT"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -5296,7 +5296,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "54GmcYAlBD1ZJcTroJeYJ4" "fileId": "fdazufGbtKc5n7NADs4SWI"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -5306,7 +5306,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "d7WiAjMVFPlKx7Aq+NGEA+", "fileId": "30k7XjD2hKQKpKU8ENZtkz",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -5331,7 +5331,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "03nqSPfWRLep7vKiqslueV" "fileId": "4e0IDaZOtN1qa3uYYtkgL/"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
@ -5359,7 +5359,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "a4JjGa7ndIQ5rIZ6hkOSKV" "fileId": "b1CKyn2ctI/6jqC5ZCP2Sq"
}, },
{ {
"__type__": "cc.Graphics", "__type__": "cc.Graphics",
@ -5405,7 +5405,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "dfCIE1QTFDFLciUM86wSib" "fileId": "a1bc7zq0NJja3qhVunLrIe"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -5415,7 +5415,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "01kG114+VNNrTGTJCK/Yp2", "fileId": "b6jaF5laZBLLV5L1TaJnFk",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -18269,7 +18269,7 @@
"__id__": 835 "__id__": 835
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 837 "__id__": 837

View File

@ -273,14 +273,19 @@ export class SlotBar extends Component {
}); });
} }
allowClickManualStop(bl: boolean) {
this.hasClickSpin = bl;
this.manualStopNode.active = bl
}
notAllowClickManualStop(bl: boolean) {
this.hasClickManualStop = bl;
}
onBtnSpin() { onBtnSpin() {
// 第一次点击 旋转 // 第一次点击 旋转
if (!this.hasClickSpin && !this.hasClickManualStop) { if (!this.hasClickSpin && !this.hasClickManualStop) {
AudioManager.instance.playSFX("Spin_Button_Click"); AudioManager.instance.playSFX("Spin_Button_Click");
this.hasClickSpin = true;
this.manualStopNode.active = true
this.node.emit(SLOT_BAR_EVENT.ON_SPIN_CLICK); this.node.emit(SLOT_BAR_EVENT.ON_SPIN_CLICK);
this.spinAni.startSpin(); this.spinAni.startSpin();
@ -299,8 +304,8 @@ export class SlotBar extends Component {
// 第一次点击 旋转 // 第一次点击 旋转
if (!this.hasClickSpin && !this.hasClickManualStop) { if (!this.hasClickSpin && !this.hasClickManualStop) {
// AudioManager.instance.playSFX('Spin_Button_Click'); // AudioManager.instance.playSFX('Spin_Button_Click');
this.hasClickSpin = true;
this.manualStopNode.active = true
this.setBtnEnable(this.subBtn, false); this.setBtnEnable(this.subBtn, false);
this.setBtnEnable(this.addBtn, false); this.setBtnEnable(this.addBtn, false);
@ -317,8 +322,7 @@ export class SlotBar extends Component {
onBtnTestSpin(event, args) { onBtnTestSpin(event, args) {
// 第一次点击 旋转 // 第一次点击 旋转
if (!this.hasClickSpin && !this.hasClickManualStop) { if (!this.hasClickSpin && !this.hasClickManualStop) {
this.hasClickSpin = true; // this.hasClickSpin = true;
this.manualStopNode.active = true
this.node.emit(SLOT_BAR_EVENT.ON_TEST_SPIN_CLICK, args); this.node.emit(SLOT_BAR_EVENT.ON_TEST_SPIN_CLICK, args);
this.setBtnEnable(this.subBtn, false); this.setBtnEnable(this.subBtn, false);
@ -339,7 +343,7 @@ export class SlotBar extends Component {
} }
manualStop() { manualStop() {
this.hasClickManualStop = true; this.notAllowClickManualStop(true)
this.spinAni.stopSpin(); this.spinAni.stopSpin();
this.setBtnEnable(this.spinBtn, false); this.setBtnEnable(this.spinBtn, false);
} }
@ -642,9 +646,9 @@ export class SlotBar extends Component {
} }
resetAllState() { resetAllState() {
this.hasClickSpin = false; this.allowClickManualStop(false)
this.manualStopNode.active = false this.notAllowClickManualStop(false)
this.hasClickManualStop = false;
this.isAuto = false; this.isAuto = false;
this.setBtnVisible(this.spinBtn, true); this.setBtnVisible(this.spinBtn, true);

View File

@ -286,7 +286,8 @@ export class SlotScene extends Component {
try { try {
this.gameState.isOnReconnect = false; this.gameState.isOnReconnect = false;
this.isReceiveMsg = false; this.isReceiveMsg = false;
this.isErr = false;
this.isErr = false
this.slotGame.spin(this.gameState.isInFreeSpin); this.slotGame.spin(this.gameState.isInFreeSpin);
this.gameState.isOneRoundEnd = false; this.gameState.isOneRoundEnd = false;
this.slotGame.changeBg(this.gameState.isInFreeSpin); this.slotGame.changeBg(this.gameState.isInFreeSpin);
@ -302,14 +303,9 @@ export class SlotScene extends Component {
} else { } else {
if (!isFreeSpin) { if (!isFreeSpin) {
if (!isFeatureBuy) { if (!isFeatureBuy) {
this.slotBar.setBalance( this.slotBar.setBalance(this.slotBar.getBalance() - this.slotBar.getBet());
this.slotBar.getBalance() - this.slotBar.getBet()
);
} else { } else {
this.slotBar.setBalance( this.slotBar.setBalance(this.slotBar.getBalance() - (this.slotBar.getBet() * this.gameInfo.BuyMul));
this.slotBar.getBalance() -
this.slotBar.getBet() * this.gameInfo.BuyMul
);
} }
} }
} }
@ -327,7 +323,8 @@ export class SlotScene extends Component {
} }
if (!this.gameState.isDebug) { if (!this.gameState.isDebug) {
this.spinInfo = await callGameApi("spin", msg); this.spinInfo = await callGameApi("spin", msg);
this.slotBar.allowClickManualStop(true)
this.slotBar.notAllowClickManualStop(false)
if (this.spinInfo.Frb.Ongoing) { if (this.spinInfo.Frb.Ongoing) {
if (!isFreeSpin) { if (!isFreeSpin) {
let count = this.spinInfo.Frb.Ongoing.Frn; let count = this.spinInfo.Frb.Ongoing.Frn;
@ -363,7 +360,7 @@ export class SlotScene extends Component {
this.isReceiveMsg = true; this.isReceiveMsg = true;
await this.handleSpinResult(); await this.handleSpinResult();
} catch (error) { } catch (error) {
this.isErr = true; this.isErr = true
let errCode = parseInt(error.message.split("#")[0]); let errCode = parseInt(error.message.split("#")[0]);
if (isNaN(errCode)) { if (isNaN(errCode)) {
this.showErrorTip(4); this.showErrorTip(4);
@ -389,16 +386,15 @@ export class SlotScene extends Component {
if (!this.isReceiveMsg) return; if (!this.isReceiveMsg) return;
// 免费游戏不能手动停止 // 免费游戏不能手动停止
if (this.gameState.isInFreeSpin) { // if (this.gameState.isInFreeSpin) {
return; // return;
} // }
// 滚轮没有开始旋转的时候不能停止 // 滚轮没有开始旋转的时候不能停止
if (!this.slotGame.isScroll()) return; if (!this.slotGame.isScroll()) return;
this.slotBar.manualStop(); this.slotBar.manualStop();
this.slotGame.manualStop(); this.slotGame.manualStop();
} }
private handleErrSpin() { private handleErrSpin() {

View File

@ -267,18 +267,12 @@ export class Roller extends BaseRoller {
* @param data * @param data
*/ */
async manualStopScroll(data: number[]) { async manualStopScroll(data: number[]) {
if (this._info.isManualStop || this.resetInfo();
this._info.state === ROLLER_STATE.STOP) {
return;
}
this._info.resetLxInfo();
this._stopData = data; this._stopData = data;
this._info.isManualStop = true; this._info.isManualStop = true;
Tween.stopAllByTarget(this._info.speedNode); Tween.stopAllByTarget(this._info.speedNode);
// 直接回收所有动态图标 // 回收所有动态图标
while (this._info.icons.length > 0) { while (this._info.icons.length > 0) {
let icon = this._info.icons.pop(); let icon = this._info.icons.pop();
this.iconFactory.recycleIcon(icon); this.iconFactory.recycleIcon(icon);
@ -293,14 +287,8 @@ export class Roller extends BaseRoller {
this.iconFactory.recycleIcon(icon); this.iconFactory.recycleIcon(icon);
} }
} }
this._allIcons.clear();
this._posToIconKey.clear();
this.createInitIcons(data); this.createInitIcons(data);
// 为所有创建的图标播放动画
for (let icon of this._allIcons.values()) {
icon.getComponent(Icon).playSpawnAni();
}
this.changeState(ROLLER_STATE.STOP); this.changeState(ROLLER_STATE.STOP);
} }

View File

@ -1578,7 +1578,7 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60.921875, "width": 82.0556640625,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
@ -1608,7 +1608,7 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_string": "0%", "_string": "50%",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 38, "_actualFontSize": 38,

View File

@ -7,7 +7,7 @@ import { PREVIEW } from "cc/env"
const gameId = "rp_11001"; const gameId = "rp_11001";
// let apiaddr = "https://rpgames-api.rpfafafahkdev.com"; // let apiaddr = "https://rpgames-api.rpfafafahkdev.com";
let apiaddr = ""; let apiaddr = "";
let token = "eyJQIjoxMDA5NDksIkUiOjE3NzIwMjYxNzYsIlMiOjEwMDMsIkQiOiJycF8xMTAwMSJ9.3wfZ318ajoHyaEkAcGF9VKAW6qXko5aTVFw1K1rr478"; let token = "eyJQIjoxMDA5NDksIkUiOjE3NzE5NDI0MjksIlMiOjk5NiwiRCI6InJwXzExMDAxIn0.86Uf4ewuuLubSBEzhNAJlEY8Ag4pMVKVHBqAikAvSYo";
let language = "en" let language = "en"
let currency = "THB" let currency = "THB"