Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 548307cc79 | |||
| 58dc911529 | |||
| d9d6a9bbe4 | |||
| 90d873c4cd | |||
| c035ac8c54 | |||
| 08bcd8faf1 |
@ -2327,7 +2327,7 @@
|
||||
"__id__": 88
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -2338,7 +2338,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "b2gk1wSqdKB7NRiii1T4Ig",
|
||||
"fileId": "aaJAtIa3xGoZ+odGpE0q2u",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2364,7 +2364,7 @@
|
||||
"__id__": 91
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -2375,7 +2375,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "15CCKzl0VLyLzQ1D6+/FVV",
|
||||
"fileId": "97p8L6dQtFWrTdHAB02LQW",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2412,7 +2412,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "0aNB0CstlGI73YvL8RJLcZ",
|
||||
"fileId": "2erBJaNe9Mrp5UKTwe53Uq",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2438,7 +2438,7 @@
|
||||
"__id__": 97
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
|
||||
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -2449,7 +2449,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "c2aIUU88xE+5kfYJ96KYJg",
|
||||
"fileId": "2bptwOAAJIN6kJpNCl3CYA",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2475,7 +2475,7 @@
|
||||
"__id__": 100
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b",
|
||||
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -2486,7 +2486,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "b79fmcYgdAvYHmGmqo783Y",
|
||||
"fileId": "6dG8ITKnRP8Lz0LWXFPHzY",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -2521,7 +2521,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "e04exNjW1K94U1vFjdYhnb"
|
||||
"fileId": "81jrSnnFtFgZNseoVipO3c"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -2531,7 +2531,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "f46jfmDslIDYfMj6sYpm7J",
|
||||
"fileId": "eegPp5Q41FBb0FG865dE11",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -2562,7 +2562,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "27dQcL2H5DkqY6fCc0oBMd"
|
||||
"fileId": "317Abb4thHEYsHaOS9p3l4"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -2572,7 +2572,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "79GNYZyL5D4620VNrPnW9U",
|
||||
"fileId": "98kAu8cApDrorNcEveyTis",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -2603,7 +2603,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "f3nGCKVLhGfqDSqz7Su4YV"
|
||||
"fileId": "76Rb+dshJMarke/HKtCpz4"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -2628,7 +2628,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "082Jx2rilG4aK2gS90h+b7"
|
||||
"fileId": "35wiUNh3tN1ZcE7qSzuaqs"
|
||||
},
|
||||
{
|
||||
"__type__": "5fd13+Xa69CZogb3Q/F1lnC",
|
||||
@ -2801,7 +2801,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "69y7gYlglBar3jbMzaUokr",
|
||||
"fileId": "b5dI+c89hEWJFy2z6lGv6S",
|
||||
"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": "f0EdPPTqZDQ5n5QJJ4lYdQ",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3028,7 +3028,7 @@
|
||||
"__id__": 126
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd",
|
||||
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3039,7 +3039,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "8cFkdl/mVHvYI1U32if7DB",
|
||||
"fileId": "aeo7ZbGw5J/ryM4qmTeB/A",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3065,7 +3065,7 @@
|
||||
"__id__": 129
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3076,7 +3076,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "9cRMA9vglOQ4VvAVS7s2Ka",
|
||||
"fileId": "dcakcWfYJM7oaAPnKmleE0",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3102,7 +3102,7 @@
|
||||
"__id__": 132
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
|
||||
"__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3113,7 +3113,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "1fCsiaCzxAjKbJMHWyb1VY",
|
||||
"fileId": "de+RJv+pBEfq8dvYXywnd9",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3139,7 +3139,7 @@
|
||||
"__id__": 135
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
|
||||
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3150,7 +3150,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "c2OVDq+w9AEpyVl9SHyUS9",
|
||||
"fileId": "335ENyEjJG5Jzb289U4xKZ",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3185,7 +3185,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "ba8Oz9vw5FZ5ZkrkVp2Osh"
|
||||
"fileId": "13CidbWvBNAbmQ+x6bIn7D"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3195,7 +3195,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "9dWbRxD9BHW5AEAe4QWMHN",
|
||||
"fileId": "49KgYsZTJMI6f8nYsEt9G7",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3226,7 +3226,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "bfMrN7ZthAlaosQ+e4fehY"
|
||||
"fileId": "092Ssg0QlGS40m2cIgaO34"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3236,7 +3236,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "9bOgOqflJPBK+0OkPbaKV0",
|
||||
"fileId": "11x9KcKgRAS6QLC2FzGQhC",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3267,7 +3267,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "7bJQ+FMQZHM5hW3+HyL6kq"
|
||||
"fileId": "a0YxRpZj1LNoqWy4HXSRJf"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -3292,7 +3292,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "884Hh1M3pN4pwnzKpoJoLa"
|
||||
"fileId": "d65q7lrp9PD65hWCVVJjKy"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3302,7 +3302,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "3bcWeEhYdBHadJ1PA2twt/",
|
||||
"fileId": "03ZHBEYH5Ei7qzlucsSNnK",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3492,7 +3492,7 @@
|
||||
"__id__": 152
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3503,7 +3503,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "f8SjINLZFNqZJNLRkriBIs",
|
||||
"fileId": "13103AIqBG05OMwjpBByHQ",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3529,7 +3529,7 @@
|
||||
"__id__": 155
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c",
|
||||
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3540,7 +3540,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "94TL7Si4hBYIATM6dr/x7b",
|
||||
"fileId": "58U2GDouNLVYGuWFjw1Ssf",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3566,7 +3566,7 @@
|
||||
"__id__": 158
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
|
||||
"__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3577,7 +3577,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "40VlNfprRCjab+iDKTKGan",
|
||||
"fileId": "03alJx0M1G4rwMfkZ+5Vih",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3603,7 +3603,7 @@
|
||||
"__id__": 161
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
|
||||
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3614,7 +3614,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "7ccN6GcjdJKZPVQwoh/RR3",
|
||||
"fileId": "592T1RiQhJ8b2BZlA7LBCk",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3640,7 +3640,7 @@
|
||||
"__id__": 164
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
|
||||
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -3651,7 +3651,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "2aejUPTYhHELrA7gZ1ON74",
|
||||
"fileId": "9bGZnpfmxNK4oaDu07Hdmf",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -3686,7 +3686,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "fb36k349ZIAoNLKjnZENE3"
|
||||
"fileId": "e00uqd4jpPuJdG5FIP0QEe"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3696,7 +3696,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "1aP2zaoa5BQ5J+2G542cdM",
|
||||
"fileId": "b1BBVMcYRI8IQ8UHsCKcTe",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3727,7 +3727,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "3eUbX8MEhF4Zhu8VHt4RGm"
|
||||
"fileId": "f3yeRT8bRLKYpbEHKTLDo4"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3737,7 +3737,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "0aYp+6fclBkb+ZimZ/5gtl",
|
||||
"fileId": "b2hROy+SdMlIDHfs+cmrxu",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3768,7 +3768,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "e8ikETRmRGR5HnLDzFuPsk"
|
||||
"fileId": "b8/4xrhmlP05oGBfhDMv08"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -3793,7 +3793,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "68//pLO4FHCq0xzh001JSh"
|
||||
"fileId": "52gnr7qhRN7JwnCjw0S0G1"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3803,7 +3803,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "2cIL4VK4pBZqu6znQO5QwS",
|
||||
"fileId": "9eT9LrXplHVqXXCyeosS5X",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3993,7 +3993,7 @@
|
||||
"__id__": 181
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
|
||||
"__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -4004,7 +4004,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "02jDaZhW1M7bfIhairqhPU",
|
||||
"fileId": "afmmD7wiZBi7+cr7kpshC3",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4030,7 +4030,7 @@
|
||||
"__id__": 184
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
|
||||
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -4041,7 +4041,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "e0OcwyLFVKsZahz+DlGaBS",
|
||||
"fileId": "180DnYgbFFtYX6mmHb7p4L",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4067,7 +4067,7 @@
|
||||
"__id__": 187
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -4078,7 +4078,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "9425YDwcdLwZ/2zZICO7ie",
|
||||
"fileId": "c4U1JmwwBCVYjwq4AjZFCA",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4104,7 +4104,7 @@
|
||||
"__id__": 190
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -4115,7 +4115,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "fayj3yGKJErJr6vTwTHvNw",
|
||||
"fileId": "87CXQIz3hN5a4q/S9Lkf67",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4141,7 +4141,7 @@
|
||||
"__id__": 193
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
|
||||
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -4152,7 +4152,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "72T5gBKrZPuIBEzbRe4LZv",
|
||||
"fileId": "e5aYkYJURLxYIgno/QfbcT",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4187,7 +4187,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "89ThJEVeBB7KHjXTkZFnLG"
|
||||
"fileId": "276oikTq9Azb0lqg7/Dr5q"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4197,7 +4197,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "839T9iBF9Lj41Xi36RyxiF",
|
||||
"fileId": "63d3pnX/1I+6zTQM4nB4CO",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4228,7 +4228,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "9317k5hKRAvLc1iQfzMCM9"
|
||||
"fileId": "72uKsm5flCuL5kh1r7vL17"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4238,7 +4238,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "68E5ArC3lP8JTuuomRXkN1",
|
||||
"fileId": "6bXtLQ5XlPmLsm2pXPxwwp",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4269,7 +4269,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "1cC7YUiMdJ8KU83xu/vtgh"
|
||||
"fileId": "d2+0H34mFMeoX2zSz7xizC"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -4294,7 +4294,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "99weM98AZNuYrTXwvexZ4p"
|
||||
"fileId": "2chT2dWP9L6L2060gVg6yL"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4304,7 +4304,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "51MVuC5hFJ0YlaGsa0LsEI",
|
||||
"fileId": "2bg7VTBRRDXILKwfHLmheB",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4494,7 +4494,7 @@
|
||||
"__id__": 210
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
|
||||
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -4505,7 +4505,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "7d8BbfzG1J94Ke9RobbmkK",
|
||||
"fileId": "bdY1hX019M6pYjY61SQiIk",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4531,7 +4531,7 @@
|
||||
"__id__": 213
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -4542,7 +4542,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "1dE+xGTYVLxqBTg7xacVe6",
|
||||
"fileId": "bbHRGW3fdNzIpSZOuAXCNC",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4568,7 +4568,7 @@
|
||||
"__id__": 216
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
|
||||
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -4579,7 +4579,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "e9WGQFhdpJU5Zla76aOwkC",
|
||||
"fileId": "ffUPdvZXhKabHjcqHOPZeP",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4605,7 +4605,7 @@
|
||||
"__id__": 219
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
|
||||
"__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -4616,7 +4616,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "66nS9HrfNFvZUmOKXVEigr",
|
||||
"fileId": "728NXrej1B7KCEylObF1JX",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4642,7 +4642,7 @@
|
||||
"__id__": 222
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c",
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -4653,7 +4653,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "578A/JgbpA47IP5eioZNK0",
|
||||
"fileId": "2bIaXrnjdPWJvi00ePgBrq",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -4688,7 +4688,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "a9g6UMUUNJAoX1P6Ws/KbD"
|
||||
"fileId": "d6qKdBtBhO2J1mt+EMTCDY"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4698,7 +4698,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "570lNmk+1Bc4dtSDbYFod1",
|
||||
"fileId": "17TLnpOcFLtYHWnttuSrtx",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4729,7 +4729,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "48ec9DQ6JOC5TenawtJoci"
|
||||
"fileId": "e9It6qj5VNGq7XeNd1Nb0+"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4739,7 +4739,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "0dEtJ0HM9NcY0D7pNkJ/XZ",
|
||||
"fileId": "afbe2oYpBPip7+QoCrfRJ9",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4770,7 +4770,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "31TLuT3gRPzLl91RpTozE2"
|
||||
"fileId": "21xAQWj6pOj6gFyf64vnoG"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -4795,7 +4795,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "b3gy1e3CNIn54DjxbnOE86"
|
||||
"fileId": "baFg0SgRZMFoF/UolBY4eX"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4805,7 +4805,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "9feL4FfRFF0KHpiijvyhco",
|
||||
"fileId": "dcCjAS62xPEppaHDf3VDWy",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4995,7 +4995,7 @@
|
||||
"__id__": 239
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
|
||||
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -5006,7 +5006,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "1fDz1DVKxF9LJu06G4rS9h",
|
||||
"fileId": "ecn1UmlnJINrlJpccpCxGf",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -5032,7 +5032,7 @@
|
||||
"__id__": 242
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -5043,7 +5043,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "04nbK36rVHj6iiPBeRIZhZ",
|
||||
"fileId": "ecIn5wSxFJLK+hB/lkTBVg",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -5069,7 +5069,7 @@
|
||||
"__id__": 245
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd",
|
||||
"__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -5080,7 +5080,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "7dIJhDUFhPWIVQHDrMNLor",
|
||||
"fileId": "cdjriaJRNGx7v5y1afmaTM",
|
||||
"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": "9aBYhs8YFGAYuUS30Srlql",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -5143,7 +5143,7 @@
|
||||
"__id__": 251
|
||||
},
|
||||
"asset": {
|
||||
"__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
|
||||
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
|
||||
"__expectedType__": "cc.Prefab"
|
||||
},
|
||||
"fileId": "fchELCmEtHhb3lT1fagDGR",
|
||||
@ -5154,7 +5154,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInstance",
|
||||
"fileId": "9cNhXJPWJLeoGUT101QisQ",
|
||||
"fileId": "79PeXJlSJK8KVM98prnpzr",
|
||||
"prefabRootNode": {
|
||||
"__id__": 1
|
||||
},
|
||||
@ -5189,7 +5189,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "b70wx2xNRBg4gQ8ol9ll7X"
|
||||
"fileId": "27CzIOsbRAQLpZ48h3GD2/"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -5199,7 +5199,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "22Rbr90hhC36ZBYz1slNq9",
|
||||
"fileId": "342dYkEltBRYxXNXd9o/lS",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -5230,7 +5230,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "d0WSffkuhO06TbTWb5BcJd"
|
||||
"fileId": "b9WRxkSppH/IAUpQwKUBGB"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -5240,7 +5240,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "645xXZaXNHsIzt90dC8ryY",
|
||||
"fileId": "43lqGalidA7qBCrAe9hrnK",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -5271,7 +5271,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "c85f6pRuhLcYWQBfM8oKvT"
|
||||
"fileId": "81DZaUlXdAnqh0EUSt140s"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -5296,7 +5296,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "fdazufGbtKc5n7NADs4SWI"
|
||||
"fileId": "54GmcYAlBD1ZJcTroJeYJ4"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -5306,7 +5306,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "30k7XjD2hKQKpKU8ENZtkz",
|
||||
"fileId": "d7WiAjMVFPlKx7Aq+NGEA+",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -5331,7 +5331,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "4e0IDaZOtN1qa3uYYtkgL/"
|
||||
"fileId": "03nqSPfWRLep7vKiqslueV"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.UITransform",
|
||||
@ -5359,7 +5359,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "b1CKyn2ctI/6jqC5ZCP2Sq"
|
||||
"fileId": "a4JjGa7ndIQ5rIZ6hkOSKV"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.Graphics",
|
||||
@ -5405,7 +5405,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "a1bc7zq0NJja3qhVunLrIe"
|
||||
"fileId": "dfCIE1QTFDFLciUM86wSib"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -5415,7 +5415,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "b6jaF5laZBLLV5L1TaJnFk",
|
||||
"fileId": "01kG114+VNNrTGTJCK/Yp2",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -18269,7 +18269,7 @@
|
||||
"__id__": 835
|
||||
},
|
||||
"_children": [],
|
||||
"_active": true,
|
||||
"_active": false,
|
||||
"_components": [
|
||||
{
|
||||
"__id__": 837
|
||||
|
||||
@ -273,19 +273,14 @@ 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.manualStopNode.active = true
|
||||
this.node.emit(SLOT_BAR_EVENT.ON_SPIN_CLICK);
|
||||
this.spinAni.startSpin();
|
||||
|
||||
@ -304,8 +299,8 @@ export class SlotBar extends Component {
|
||||
// 第一次点击 旋转
|
||||
if (!this.hasClickSpin && !this.hasClickManualStop) {
|
||||
// AudioManager.instance.playSFX('Spin_Button_Click');
|
||||
|
||||
|
||||
this.hasClickSpin = true;
|
||||
this.manualStopNode.active = true
|
||||
|
||||
this.setBtnEnable(this.subBtn, false);
|
||||
this.setBtnEnable(this.addBtn, false);
|
||||
@ -322,7 +317,8 @@ export class SlotBar extends Component {
|
||||
onBtnTestSpin(event, args) {
|
||||
// 第一次点击 旋转
|
||||
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.setBtnEnable(this.subBtn, false);
|
||||
@ -343,7 +339,7 @@ export class SlotBar extends Component {
|
||||
}
|
||||
|
||||
manualStop() {
|
||||
this.notAllowClickManualStop(true)
|
||||
this.hasClickManualStop = true;
|
||||
this.spinAni.stopSpin();
|
||||
this.setBtnEnable(this.spinBtn, false);
|
||||
}
|
||||
@ -646,9 +642,9 @@ export class SlotBar extends Component {
|
||||
}
|
||||
|
||||
resetAllState() {
|
||||
this.allowClickManualStop(false)
|
||||
this.notAllowClickManualStop(false)
|
||||
|
||||
this.hasClickSpin = false;
|
||||
this.manualStopNode.active = false
|
||||
this.hasClickManualStop = false;
|
||||
|
||||
this.isAuto = false;
|
||||
this.setBtnVisible(this.spinBtn, true);
|
||||
|
||||
@ -286,8 +286,7 @@ export class SlotScene extends Component {
|
||||
try {
|
||||
this.gameState.isOnReconnect = false;
|
||||
this.isReceiveMsg = false;
|
||||
|
||||
this.isErr = 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,15 +389,16 @@ export class SlotScene extends Component {
|
||||
if (!this.isReceiveMsg) return;
|
||||
|
||||
// 免费游戏不能手动停止
|
||||
// if (this.gameState.isInFreeSpin) {
|
||||
// return;
|
||||
// }
|
||||
if (this.gameState.isInFreeSpin) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 滚轮没有开始旋转的时候不能停止
|
||||
if (!this.slotGame.isScroll()) return;
|
||||
|
||||
this.slotBar.manualStop();
|
||||
this.slotGame.manualStop();
|
||||
|
||||
}
|
||||
|
||||
private handleErrSpin() {
|
||||
|
||||
@ -267,12 +267,18 @@ export class Roller extends BaseRoller {
|
||||
* @param data 停止时的图标数据
|
||||
*/
|
||||
async manualStopScroll(data: number[]) {
|
||||
this.resetInfo();
|
||||
if (this._info.isManualStop ||
|
||||
this._info.state === ROLLER_STATE.STOP) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
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);
|
||||
@ -287,8 +293,14 @@ 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);
|
||||
}
|
||||
|
||||
|
||||
@ -1578,7 +1578,7 @@
|
||||
"__prefab": null,
|
||||
"_contentSize": {
|
||||
"__type__": "cc.Size",
|
||||
"width": 82.0556640625,
|
||||
"width": 60.921875,
|
||||
"height": 56.4
|
||||
},
|
||||
"_anchorPoint": {
|
||||
@ -1608,7 +1608,7 @@
|
||||
"b": 255,
|
||||
"a": 255
|
||||
},
|
||||
"_string": "50%",
|
||||
"_string": "0%",
|
||||
"_horizontalAlign": 1,
|
||||
"_verticalAlign": 1,
|
||||
"_actualFontSize": 38,
|
||||
|
||||
@ -7,7 +7,7 @@ import { PREVIEW } from "cc/env"
|
||||
const gameId = "rp_11001";
|
||||
// let apiaddr = "https://rpgames-api.rpfafafahkdev.com";
|
||||
let apiaddr = "";
|
||||
let token = "eyJQIjoxMDA5NDksIkUiOjE3NzE5NDI0MjksIlMiOjk5NiwiRCI6InJwXzExMDAxIn0.86Uf4ewuuLubSBEzhNAJlEY8Ag4pMVKVHBqAikAvSYo";
|
||||
let token = "eyJQIjoxMDA5NDksIkUiOjE3NzIwMjYxNzYsIlMiOjEwMDMsIkQiOiJycF8xMTAwMSJ9.3wfZ318ajoHyaEkAcGF9VKAW6qXko5aTVFw1K1rr478";
|
||||
|
||||
let language = "en"
|
||||
let currency = "THB"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user