Compare commits

..

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

3 changed files with 108 additions and 111 deletions

View File

@ -2327,7 +2327,7 @@
"__id__": 88 "__id__": 88
}, },
"asset": { "asset": {
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -2338,7 +2338,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "aaJAtIa3xGoZ+odGpE0q2u", "fileId": "236gZQoZpLUot+ZOt6xoEJ",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2364,7 +2364,7 @@
"__id__": 91 "__id__": 91
}, },
"asset": { "asset": {
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -2375,7 +2375,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "97p8L6dQtFWrTdHAB02LQW", "fileId": "13Owlsg+9C+4MGkAImYZ0d",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2401,7 +2401,7 @@
"__id__": 94 "__id__": 94
}, },
"asset": { "asset": {
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -2412,7 +2412,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "2erBJaNe9Mrp5UKTwe53Uq", "fileId": "70ZMLJQNVFPJSo+ZLgUILO",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2438,7 +2438,7 @@
"__id__": 97 "__id__": 97
}, },
"asset": { "asset": {
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -2449,7 +2449,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "2bptwOAAJIN6kJpNCl3CYA", "fileId": "97ubHEk9xJBq60DHgrpGm1",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2475,7 +2475,7 @@
"__id__": 100 "__id__": 100
}, },
"asset": { "asset": {
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -2486,7 +2486,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "6dG8ITKnRP8Lz0LWXFPHzY", "fileId": "d7zsqY+LlFFYovJ+EL1Bce",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -2521,7 +2521,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "81jrSnnFtFgZNseoVipO3c" "fileId": "3f1L62GOFGcpMSLEgFxw5Y"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2531,7 +2531,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "eegPp5Q41FBb0FG865dE11", "fileId": "7dfheaOqhB/LSJ6trmflqc",
"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": "e96AsctINBPIbQZYV3GVOA"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -2572,7 +2572,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "98kAu8cApDrorNcEveyTis", "fileId": "69GiwbyFVDpqGd+29Nbrxg",
"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": "dcPDkUHWVAhZ1KoGnmXgtf"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -2628,7 +2628,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "35wiUNh3tN1ZcE7qSzuaqs" "fileId": "3bNjRMocxDxIcQNUCXasqw"
}, },
{ {
"__type__": "5fd13+Xa69CZogb3Q/F1lnC", "__type__": "5fd13+Xa69CZogb3Q/F1lnC",
@ -2801,7 +2801,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "b5dI+c89hEWJFy2z6lGv6S", "fileId": "3faKtHaKxKYYMSQprP10rL",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -3002,7 +3002,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "f0EdPPTqZDQ5n5QJJ4lYdQ", "fileId": "e6HNoU/8FP2onytwBaDZrw",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3028,7 +3028,7 @@
"__id__": 126 "__id__": 126
}, },
"asset": { "asset": {
"__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
"__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": "64NQHiZ3tHA6ZVDBPV/Zap",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3065,7 +3065,7 @@
"__id__": 129 "__id__": 129
}, },
"asset": { "asset": {
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3076,7 +3076,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "dcakcWfYJM7oaAPnKmleE0", "fileId": "3e0tjoR8xNp7Cq14QxfUo+",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3102,7 +3102,7 @@
"__id__": 132 "__id__": 132
}, },
"asset": { "asset": {
"__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b",
"__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": "ffBc48wfFGBJiwNKBJo4RE",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3139,7 +3139,7 @@
"__id__": 135 "__id__": 135
}, },
"asset": { "asset": {
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3150,7 +3150,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "335ENyEjJG5Jzb289U4xKZ", "fileId": "28gqQOTKxJ7o2HUwfbO5zD",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3185,7 +3185,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "13CidbWvBNAbmQ+x6bIn7D" "fileId": "28mgzDII9HnLZlFrkY+D7A"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3195,7 +3195,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "49KgYsZTJMI6f8nYsEt9G7", "fileId": "e72JOpcrlE/qOzBn5XPQdu",
"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": "79eXE8vBlNdatuJywEY231"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3236,7 +3236,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "11x9KcKgRAS6QLC2FzGQhC", "fileId": "b650oZPcRNFqC8OBCe6MWG",
"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": "5bg/skncNK4I1q3LmsmoEk"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3292,7 +3292,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d65q7lrp9PD65hWCVVJjKy" "fileId": "19juE+XhNKp6djJEuKkkkI"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3302,7 +3302,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "03ZHBEYH5Ei7qzlucsSNnK", "fileId": "17EKrAa6tEVY33E1nUrXV7",
"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__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3503,7 +3503,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "13103AIqBG05OMwjpBByHQ", "fileId": "a1Gu7xmQ9LYYCr0sVR2afO",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3529,7 +3529,7 @@
"__id__": 155 "__id__": 155
}, },
"asset": { "asset": {
"__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3540,7 +3540,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "58U2GDouNLVYGuWFjw1Ssf", "fileId": "efzMsGPhlDIYi94s9pT0RQ",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3566,7 +3566,7 @@
"__id__": 158 "__id__": 158
}, },
"asset": { "asset": {
"__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3577,7 +3577,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "03alJx0M1G4rwMfkZ+5Vih", "fileId": "4aFbVqZBlIbIBVbFPttFk5",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3603,7 +3603,7 @@
"__id__": 161 "__id__": 161
}, },
"asset": { "asset": {
"__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3614,7 +3614,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "592T1RiQhJ8b2BZlA7LBCk", "fileId": "07PNaEl3JFOJit6A0/iHoo",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3640,7 +3640,7 @@
"__id__": 164 "__id__": 164
}, },
"asset": { "asset": {
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -3651,7 +3651,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "9bGZnpfmxNK4oaDu07Hdmf", "fileId": "27iOVLl4pIgKJ8IO+IGSKR",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -3686,7 +3686,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "e00uqd4jpPuJdG5FIP0QEe" "fileId": "97M079GKBJ5qLjBHsfnrfr"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3696,7 +3696,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "b1BBVMcYRI8IQ8UHsCKcTe", "fileId": "11L2GQo+xDUq7A0aqZZWV/",
"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": "6euaXohStCDarSGHinKLQE"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3737,7 +3737,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "b2hROy+SdMlIDHfs+cmrxu", "fileId": "a3QLt5d7ZGJ7Q4y2nUOZOl",
"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": "a5YVIIDf1JgJMiR+V2v56w"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -3793,7 +3793,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "52gnr7qhRN7JwnCjw0S0G1" "fileId": "daEeKKNH1GGrVwmjTDFXoA"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -3803,7 +3803,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "9eT9LrXplHVqXXCyeosS5X", "fileId": "63shLIzgpN14rfG27S+QEH",
"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__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4004,7 +4004,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "afmmD7wiZBi7+cr7kpshC3", "fileId": "821GqVb3RMEqENCET7QC7z",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4030,7 +4030,7 @@
"__id__": 184 "__id__": 184
}, },
"asset": { "asset": {
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4041,7 +4041,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "180DnYgbFFtYX6mmHb7p4L", "fileId": "ea1bYnVClOgZx8PeVsSJSU",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4067,7 +4067,7 @@
"__id__": 187 "__id__": 187
}, },
"asset": { "asset": {
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4078,7 +4078,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "c4U1JmwwBCVYjwq4AjZFCA", "fileId": "adZr83UqFIm5/ZEFUwrT7g",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4104,7 +4104,7 @@
"__id__": 190 "__id__": 190
}, },
"asset": { "asset": {
"__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4115,7 +4115,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "87CXQIz3hN5a4q/S9Lkf67", "fileId": "423IffJeFCJ6ViBe4QI7ZM",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4141,7 +4141,7 @@
"__id__": 193 "__id__": 193
}, },
"asset": { "asset": {
"__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4152,7 +4152,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "e5aYkYJURLxYIgno/QfbcT", "fileId": "90RPWw3OBDxJBifAX0Wv7z",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4187,7 +4187,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "276oikTq9Azb0lqg7/Dr5q" "fileId": "76EoX6/ntELqYS0owH3rNC"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4197,7 +4197,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "63d3pnX/1I+6zTQM4nB4CO", "fileId": "cen8Gf+ytC646eDTbmb81s",
"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": "e2bIZS389PKJEckD5L/Xeo"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4238,7 +4238,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "6bXtLQ5XlPmLsm2pXPxwwp", "fileId": "82ZEZ3Z0dIh7FJpS5316OJ",
"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": "2fJ95Y1ABPiZ1VJGpXRYVc"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -4294,7 +4294,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "2chT2dWP9L6L2060gVg6yL" "fileId": "efbtJfbIJDQqazY1SMdkW2"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4304,7 +4304,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "2bg7VTBRRDXILKwfHLmheB", "fileId": "2eajoVUNpAoZF6vkFshF/x",
"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__": "79c428b2-5899-404c-8495-991b407ef71b",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4505,7 +4505,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "bdY1hX019M6pYjY61SQiIk", "fileId": "a2KC2sV/ZN2bgJmvARxUhj",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4531,7 +4531,7 @@
"__id__": 213 "__id__": 213
}, },
"asset": { "asset": {
"__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4542,7 +4542,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "bbHRGW3fdNzIpSZOuAXCNC", "fileId": "e8GCo9HtFCu7R4IxireMg/",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4568,7 +4568,7 @@
"__id__": 216 "__id__": 216
}, },
"asset": { "asset": {
"__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4579,7 +4579,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "ffUPdvZXhKabHjcqHOPZeP", "fileId": "a1oRuVT1BHwbLuNFC3h7NB",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4605,7 +4605,7 @@
"__id__": 219 "__id__": 219
}, },
"asset": { "asset": {
"__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4616,7 +4616,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "728NXrej1B7KCEylObF1JX", "fileId": "04MaB/tAVJt5l1O1PNgNMq",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4642,7 +4642,7 @@
"__id__": 222 "__id__": 222
}, },
"asset": { "asset": {
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -4653,7 +4653,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "2bIaXrnjdPWJvi00ePgBrq", "fileId": "4c4jqzQuJO15zpB6vFbk5b",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -4688,7 +4688,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "d6qKdBtBhO2J1mt+EMTCDY" "fileId": "a1Uo4k9TNP5bxry8aeADow"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4698,7 +4698,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "17TLnpOcFLtYHWnttuSrtx", "fileId": "fdIUdh8vVPVYZbuZI5xY0n",
"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": "f0tAqEmV5BBqv/u8mx3aGz"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4739,7 +4739,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "afbe2oYpBPip7+QoCrfRJ9", "fileId": "51+EDPtdVG7qsQN1lcqb+6",
"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": "99Ot2ZxgBE25BOY8Op2nSV"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -4795,7 +4795,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "baFg0SgRZMFoF/UolBY4eX" "fileId": "f39InFyV9JEZvaUd39Mdhi"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -4805,7 +4805,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "dcCjAS62xPEppaHDf3VDWy", "fileId": "fbG/ZMP/ZLKYpFHiggLkq6",
"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__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -5006,7 +5006,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "ecn1UmlnJINrlJpccpCxGf", "fileId": "1br+8oRyJNu7PifTE5VLd4",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5032,7 +5032,7 @@
"__id__": 242 "__id__": 242
}, },
"asset": { "asset": {
"__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7",
"__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": "43L5XjhHNHWrpTCaUz1ZCe",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5069,7 +5069,7 @@
"__id__": 245 "__id__": 245
}, },
"asset": { "asset": {
"__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__uuid__": "a185ad99-a791-4309-9851-549c756647b9",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -5080,7 +5080,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "cdjriaJRNGx7v5y1afmaTM", "fileId": "198mgT7mhMAakmIio5oECR",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5117,7 +5117,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "9aBYhs8YFGAYuUS30Srlql", "fileId": "7cZNBO3JdL75bjdMWl4nL8",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5143,7 +5143,7 @@
"__id__": 251 "__id__": 251
}, },
"asset": { "asset": {
"__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "fchELCmEtHhb3lT1fagDGR", "fileId": "fchELCmEtHhb3lT1fagDGR",
@ -5154,7 +5154,7 @@
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "79PeXJlSJK8KVM98prnpzr", "fileId": "9czF2u+ZZMKZVhOtNUU8q+",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
@ -5189,7 +5189,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "27CzIOsbRAQLpZ48h3GD2/" "fileId": "fdOTSqixhCu5grvMEpFGyq"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -5199,7 +5199,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "342dYkEltBRYxXNXd9o/lS", "fileId": "f6/bSvLDdB3LcMTGFx25L2",
"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": "7f4oGo2EdG3ZOlmeJLEOU7"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -5240,7 +5240,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "43lqGalidA7qBCrAe9hrnK", "fileId": "01xdQiXatGCZYkHXHhiPdF",
"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": "c2QXWaqOhOr6Plo8nbL0UB"
}, },
{ {
"__type__": "45522uB1sdFu4FJAojtnha4", "__type__": "45522uB1sdFu4FJAojtnha4",
@ -5296,7 +5296,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "54GmcYAlBD1ZJcTroJeYJ4" "fileId": "d7GAc+IW9LO4lHHeyjcFvR"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -5306,7 +5306,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "d7WiAjMVFPlKx7Aq+NGEA+", "fileId": "2cUlwkI21O0ZZOASqAXWEr",
"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": "688cL3mMFON5AptCcY3Mdf"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
@ -5359,7 +5359,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "a4JjGa7ndIQ5rIZ6hkOSKV" "fileId": "45crYDFtNF0JWPVONf0Og6"
}, },
{ {
"__type__": "cc.Graphics", "__type__": "cc.Graphics",
@ -5405,7 +5405,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "dfCIE1QTFDFLciUM86wSib" "fileId": "ad+me6v4JNnJItURO4AjYn"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
@ -5415,7 +5415,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "01kG114+VNNrTGTJCK/Yp2", "fileId": "9bTV2iBqZJxZ8XJGEuIsII",
"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

@ -280,7 +280,6 @@ 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.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();
@ -300,7 +299,7 @@ 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.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);
@ -318,7 +317,6 @@ export class SlotBar extends Component {
// 第一次点击 旋转 // 第一次点击 旋转
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);
@ -643,7 +641,6 @@ export class SlotBar extends Component {
resetAllState() { resetAllState() {
this.hasClickSpin = false; this.hasClickSpin = false;
this.manualStopNode.active = false
this.hasClickManualStop = false; this.hasClickManualStop = false;
this.isAuto = false; this.isAuto = false;

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,