diff --git a/assets/Game/prefabs/AutoSpinPanel/AutoSpinPanel.prefab b/assets/Game/prefabs/AutoSpinPanel/AutoSpinPanel.prefab index ab9b884..6daf836 100644 --- a/assets/Game/prefabs/AutoSpinPanel/AutoSpinPanel.prefab +++ b/assets/Game/prefabs/AutoSpinPanel/AutoSpinPanel.prefab @@ -577,9 +577,9 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 38, + "g": 134, + "b": 144, "a": 255 }, "_spriteFrame": { @@ -1067,9 +1067,9 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 38, + "g": 134, + "b": 144, "a": 255 }, "_spriteFrame": { diff --git a/assets/Game/prefabs/FeatureBuy/FeatureBuy.prefab b/assets/Game/prefabs/FeatureBuy/FeatureBuy.prefab index 3bd4354..c876ea3 100644 --- a/assets/Game/prefabs/FeatureBuy/FeatureBuy.prefab +++ b/assets/Game/prefabs/FeatureBuy/FeatureBuy.prefab @@ -28,17 +28,17 @@ "_active": true, "_components": [ { - "__id__": 112 + "__id__": 106 }, { - "__id__": 114 + "__id__": 108 }, { - "__id__": 116 + "__id__": 110 } ], "_prefab": { - "__id__": 118 + "__id__": 112 }, "_lpos": { "__type__": "cc.Vec3", @@ -281,29 +281,29 @@ "__id__": 34 }, { - "__id__": 61 + "__id__": 55 }, { - "__id__": 71 + "__id__": 65 }, { - "__id__": 83 + "__id__": 77 }, { - "__id__": 95 + "__id__": 89 } ], "_active": true, "_components": [ { - "__id__": 107 + "__id__": 101 }, { - "__id__": 109 + "__id__": 103 } ], "_prefab": { - "__id__": 111 + "__id__": 105 }, "_lpos": { "__type__": "cc.Vec3", @@ -824,11 +824,11 @@ "_active": true, "_components": [ { - "__id__": 58 + "__id__": 52 } ], "_prefab": { - "__id__": 60 + "__id__": 54 }, "_lpos": { "__type__": "cc.Vec3", @@ -870,25 +870,22 @@ "_children": [ { "__id__": 36 - }, - { - "__id__": 44 } ], "_active": true, "_components": [ { - "__id__": 50 + "__id__": 44 }, { - "__id__": 52 + "__id__": 46 }, { - "__id__": 54 + "__id__": 48 } ], "_prefab": { - "__id__": 57 + "__id__": 51 }, "_lpos": { "__type__": "cc.Vec3", @@ -1077,142 +1074,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "spin", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 35 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 45 - }, - { - "__id__": 47 - } - ], - "_prefab": { - "__id__": 49 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.6, - "y": 0.6, - "z": 1 - }, - "_mobility": 0, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 44 - }, - "_enabled": true, - "__prefab": { - "__id__": 46 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 698.6300048828125, - "height": 388.1600036621094 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.49972087181647534, - "y": 0.3975164921578961 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "acw8Ijv1NJ/pJBokSpHy5H" - }, - { - "__type__": "sp.Skeleton", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 44 - }, - "_enabled": true, - "__prefab": { - "__id__": 48 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_skeletonData": { - "__uuid__": "ef7ec849-1c96-4238-978e-f6b6e4b8973a", - "__expectedType__": "sp.SkeletonData" - }, - "defaultSkin": "default", - "defaultAnimation": "animation", - "_premultipliedAlpha": false, - "_timeScale": 1, - "_preCacheMode": 0, - "_cacheMode": 0, - "_sockets": [], - "_useTint": false, - "_debugMesh": false, - "_debugBones": false, - "_debugSlots": false, - "_enableBatch": false, - "loop": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "65dEPBE71FtL8h2xJZysBl" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "02492lVbNMAL4yk2NCl9NP", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.UITransform", "_name": "", @@ -1223,7 +1084,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", @@ -1251,7 +1112,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 47 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1296,11 +1157,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 49 }, "clickEvents": [ { - "__id__": 56 + "__id__": 50 } ], "_interactable": true, @@ -1388,7 +1249,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 53 }, "_contentSize": { "__type__": "cc.Size", @@ -1429,17 +1290,17 @@ }, "_children": [ { - "__id__": 62 + "__id__": 56 } ], "_active": true, "_components": [ { - "__id__": 68 + "__id__": 62 } ], "_prefab": { - "__id__": 70 + "__id__": 64 }, "_lpos": { "__type__": "cc.Vec3", @@ -1476,20 +1337,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 61 + "__id__": 55 }, "_children": [], "_active": true, "_components": [ { - "__id__": 63 + "__id__": 57 }, { - "__id__": 65 + "__id__": 59 } ], "_prefab": { - "__id__": 67 + "__id__": 61 }, "_lpos": { "__type__": "cc.Vec3", @@ -1526,11 +1387,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 58 }, "_contentSize": { "__type__": "cc.Size", @@ -1554,11 +1415,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 60 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1638,11 +1499,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 63 }, "_contentSize": { "__type__": "cc.Size", @@ -1683,17 +1544,17 @@ }, "_children": [ { - "__id__": 72 + "__id__": 66 } ], "_active": true, "_components": [ { - "__id__": 80 + "__id__": 74 } ], "_prefab": { - "__id__": 82 + "__id__": 76 }, "_lpos": { "__type__": "cc.Vec3", @@ -1730,23 +1591,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 71 + "__id__": 65 }, "_children": [], "_active": true, "_components": [ { - "__id__": 73 + "__id__": 67 }, { - "__id__": 75 + "__id__": 69 }, { - "__id__": 77 + "__id__": 71 } ], "_prefab": { - "__id__": 79 + "__id__": 73 }, "_lpos": { "__type__": "cc.Vec3", @@ -1783,11 +1644,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 68 }, "_contentSize": { "__type__": "cc.Size", @@ -1811,11 +1672,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 70 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1856,11 +1717,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 72 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 72 }, "spriteName": "8", "_id": "" @@ -1888,11 +1749,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 71 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 75 }, "_contentSize": { "__type__": "cc.Size", @@ -1933,17 +1794,17 @@ }, "_children": [ { - "__id__": 84 + "__id__": 78 } ], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 86 } ], "_prefab": { - "__id__": 94 + "__id__": 88 }, "_lpos": { "__type__": "cc.Vec3", @@ -1980,23 +1841,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 83 + "__id__": 77 }, "_children": [], "_active": true, "_components": [ { - "__id__": 85 + "__id__": 79 }, { - "__id__": 87 + "__id__": 81 }, { - "__id__": 89 + "__id__": 83 } ], "_prefab": { - "__id__": 91 + "__id__": 85 }, "_lpos": { "__type__": "cc.Vec3", @@ -2033,11 +1894,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 80 }, "_contentSize": { "__type__": "cc.Size", @@ -2061,11 +1922,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 82 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2106,11 +1967,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 84 }, "spriteName": "9", "_id": "" @@ -2138,11 +1999,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -2183,17 +2044,17 @@ }, "_children": [ { - "__id__": 96 + "__id__": 90 } ], "_active": true, "_components": [ { - "__id__": 104 + "__id__": 98 } ], "_prefab": { - "__id__": 106 + "__id__": 100 }, "_lpos": { "__type__": "cc.Vec3", @@ -2230,23 +2091,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 95 + "__id__": 89 }, "_children": [], "_active": true, "_components": [ { - "__id__": 97 + "__id__": 91 }, { - "__id__": 99 + "__id__": 93 }, { - "__id__": 101 + "__id__": 95 } ], "_prefab": { - "__id__": 103 + "__id__": 97 }, "_lpos": { "__type__": "cc.Vec3", @@ -2283,11 +2144,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 96 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 92 }, "_contentSize": { "__type__": "cc.Size", @@ -2311,11 +2172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 96 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 94 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2356,11 +2217,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 96 + "__id__": 90 }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 96 }, "spriteName": "7", "_id": "" @@ -2388,11 +2249,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 99 }, "_contentSize": { "__type__": "cc.Size", @@ -2433,7 +2294,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 102 }, "_contentSize": { "__type__": "cc.Size", @@ -2461,7 +2322,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 104 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2519,7 +2380,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 107 }, "_contentSize": { "__type__": "cc.Size", @@ -2547,7 +2408,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 109 }, "_alignFlags": 45, "_target": null, @@ -2583,10 +2444,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 111 }, "costLabel": { - "__id__": 65 + "__id__": 59 }, "_id": "" }, diff --git a/assets/Game/prefabs/History/history.prefab b/assets/Game/prefabs/History/history.prefab index 54349c0..1ccb573 100644 --- a/assets/Game/prefabs/History/history.prefab +++ b/assets/Game/prefabs/History/history.prefab @@ -3161,13 +3161,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 38, + "g": 134, + "b": 144, "a": 255 }, "_spriteFrame": { - "__uuid__": "49f385f4-2c47-4a9e-aba4-967a1c4df18d@f9941", + "__uuid__": "48a4a38e-02aa-4540-9e09-279928453b1e@38900", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -3182,7 +3182,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "48a4a38e-02aa-4540-9e09-279928453b1e", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Game/prefabs/Paytable/paytable.prefab b/assets/Game/prefabs/Paytable/paytable.prefab index 6852114..b906c1d 100644 --- a/assets/Game/prefabs/Paytable/paytable.prefab +++ b/assets/Game/prefabs/Paytable/paytable.prefab @@ -20984,13 +20984,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 38, + "g": 134, + "b": 144, "a": 255 }, "_spriteFrame": { - "__uuid__": "49f385f4-2c47-4a9e-aba4-967a1c4df18d@f9941", + "__uuid__": "48a4a38e-02aa-4540-9e09-279928453b1e@38900", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -21005,7 +21005,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "48a4a38e-02aa-4540-9e09-279928453b1e", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Game/prefabs/Rules/rules.prefab b/assets/Game/prefabs/Rules/rules.prefab index 8b8f5db..e703ee1 100644 --- a/assets/Game/prefabs/Rules/rules.prefab +++ b/assets/Game/prefabs/Rules/rules.prefab @@ -27249,13 +27249,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 38, + "g": 134, + "b": 144, "a": 255 }, "_spriteFrame": { - "__uuid__": "49f385f4-2c47-4a9e-aba4-967a1c4df18d@f9941", + "__uuid__": "48a4a38e-02aa-4540-9e09-279928453b1e@38900", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -27270,7 +27270,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "48a4a38e-02aa-4540-9e09-279928453b1e", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { diff --git a/assets/Game/prefabs/SlotScene.prefab b/assets/Game/prefabs/SlotScene.prefab index 637e8b8..ff60b7e 100644 --- a/assets/Game/prefabs/SlotScene.prefab +++ b/assets/Game/prefabs/SlotScene.prefab @@ -2318,7 +2318,7 @@ "__id__": 88 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2329,7 +2329,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "11Qu9naP9LCZLEb4EkzPtz", + "fileId": "b0J2TZIQ1G742hNFyTy+72", "prefabRootNode": { "__id__": 1 }, @@ -2355,7 +2355,7 @@ "__id__": 91 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2366,7 +2366,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "84Ey/WWE5EVpJvF2zSjyCZ", + "fileId": "440B9eof9JKI7rsdnQ3aT1", "prefabRootNode": { "__id__": 1 }, @@ -2392,7 +2392,7 @@ "__id__": 94 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2403,7 +2403,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "b00ft8bn9AgK1cqhWHKBI4", + "fileId": "d6YM3rjihHypjrXzva6YxO", "prefabRootNode": { "__id__": 1 }, @@ -2429,7 +2429,7 @@ "__id__": 97 }, "asset": { - "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", + "__uuid__": "31e7557b-3a6b-4d2d-9daf-5a5e4b522638", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2440,7 +2440,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "cfX/UqbT9F5rQqpxf6YFNw", + "fileId": "97+cNDCLNHkoYAvU+6RbS1", "prefabRootNode": { "__id__": 1 }, @@ -2466,7 +2466,7 @@ "__id__": 100 }, "asset": { - "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", + "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2477,7 +2477,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "1d5dIHKMZJUoqMIZtILs+a", + "fileId": "35Mg0Ojm1Jn4QipTCdWNKq", "prefabRootNode": { "__id__": 1 }, @@ -2512,7 +2512,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "dcS8SzZDpJ2bSeKcCeJYa4" + "fileId": "74ZdMpZBNBK4hGxis39sfn" }, { "__type__": "cc.PrefabInfo", @@ -2522,7 +2522,7 @@ "asset": { "__id__": 0 }, - "fileId": "38qcSkWXFLAaeVBnWsQB47", + "fileId": "6bMtgxn85KPbpBy7g0H08y", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2553,7 +2553,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2aI0VgnadKg6+83IxtV766" + "fileId": "1dmb7COxhOU5WAJdWArBNg" }, { "__type__": "cc.PrefabInfo", @@ -2563,7 +2563,7 @@ "asset": { "__id__": 0 }, - "fileId": "18XQa3nMJMC72F3F8oTxWb", + "fileId": "d0ivDX0INKh6FZ6hJVT92u", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2594,7 +2594,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3fEhso0mdMNIwRcfweKCRY" + "fileId": "00s8SfprRM4ZzWTaRg18gt" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -2619,7 +2619,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "709iX3+xxP85AZwgb5N8Kp" + "fileId": "99QykrYg9J/qqesxTSdLFe" }, { "__type__": "5fd13+Xa69CZogb3Q/F1lnC", @@ -2792,7 +2792,7 @@ "asset": { "__id__": 0 }, - "fileId": "dfDHU6nLZI9KKZ5goVm4/Z", + "fileId": "12eqCh/FFM6aJO0TG3F/22", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2982,7 +2982,7 @@ "__id__": 123 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -2993,7 +2993,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "cfJvo/T/BNDZ8Erb/FjR5J", + "fileId": "f32RAC6JJLgY1Tosylnm5+", "prefabRootNode": { "__id__": 1 }, @@ -3019,7 +3019,7 @@ "__id__": 126 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3030,7 +3030,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "297p/3HURKzaW9TEjmToyM", + "fileId": "1cUy80a/ZGvIXHUFwEg5XY", "prefabRootNode": { "__id__": 1 }, @@ -3056,7 +3056,7 @@ "__id__": 129 }, "asset": { - "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", + "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3067,7 +3067,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "aaqCdRzAxA7JIAL6p7y6c8", + "fileId": "89YyeXGINEQapUS6R8v7Wb", "prefabRootNode": { "__id__": 1 }, @@ -3093,7 +3093,7 @@ "__id__": 132 }, "asset": { - "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", + "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3104,7 +3104,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "dbg/a4EVNFQ7oXcrwTF6Us", + "fileId": "04BHX2145J5bosKFRW/aUW", "prefabRootNode": { "__id__": 1 }, @@ -3130,7 +3130,7 @@ "__id__": 135 }, "asset": { - "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", + "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3141,7 +3141,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "2cSPxgBfFGT5yHAhMIGwK0", + "fileId": "1cd7NMQftJJL2FxOjQgKH6", "prefabRootNode": { "__id__": 1 }, @@ -3176,7 +3176,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ccEYbeZr5JfIfYc5ntmGWK" + "fileId": "08obGmZwtPt5Z8ET0ncSNe" }, { "__type__": "cc.PrefabInfo", @@ -3186,7 +3186,7 @@ "asset": { "__id__": 0 }, - "fileId": "bfvnfQRyJHC7d4Q03Ho2fE", + "fileId": "acJOdt0oZDjaiOp6tc1y7y", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3217,7 +3217,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "29QCaMHXtGurByo9+dNYGI" + "fileId": "deieIbyndE86QTbbEBd9Qa" }, { "__type__": "cc.PrefabInfo", @@ -3227,7 +3227,7 @@ "asset": { "__id__": 0 }, - "fileId": "8f14ZR5spOxIs+bpwPXomn", + "fileId": "47JjRHzv1NC67GYTunllJ+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3258,7 +3258,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e2P68ZpfZFHYyWtby6zwC2" + "fileId": "bedrd+A0ZKSpd6MALe97LI" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3283,7 +3283,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6dwonCbJNBv5mkQhUm+uWd" + "fileId": "2bWnDcrOxJa7ZvSvu47rTj" }, { "__type__": "cc.PrefabInfo", @@ -3293,7 +3293,7 @@ "asset": { "__id__": 0 }, - "fileId": "be9iZbAfZHQK1+WZoTJ7mq", + "fileId": "9fXrJeY21A6qp67B+acSzo", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3483,7 +3483,7 @@ "__id__": 152 }, "asset": { - "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", + "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3494,7 +3494,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "baLtlgdiRF9olQFp7M1jkX", + "fileId": "e3fAyR1K9Em5Fe/3DYPyQI", "prefabRootNode": { "__id__": 1 }, @@ -3531,7 +3531,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "01EvbcsiZBSoLP3dZONVd7", + "fileId": "3d9YaXXtNESK1TVZqwUju3", "prefabRootNode": { "__id__": 1 }, @@ -3557,7 +3557,7 @@ "__id__": 158 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "e218006e-19e0-486f-b9db-e13d4c1f6cad", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3568,7 +3568,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "b0K0T3tcdL74I3920OPqDZ", + "fileId": "abYp7WrYZJyp1imnR2eDKs", "prefabRootNode": { "__id__": 1 }, @@ -3594,7 +3594,7 @@ "__id__": 161 }, "asset": { - "__uuid__": "a4cde73d-6ad9-430a-9b55-6f16ff2da91e", + "__uuid__": "55a879b3-2ccd-48e3-bd43-c984e67f1637", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3605,7 +3605,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "5cBN8cIaNLZ7u/YAlc0alT", + "fileId": "1a7il4LulLTJ/Iro6mqM3p", "prefabRootNode": { "__id__": 1 }, @@ -3631,7 +3631,7 @@ "__id__": 164 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3642,7 +3642,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "f7bZxdvRlAxrSTOIxJPFyt", + "fileId": "3arKBWpdVBJ601TYXxI6LK", "prefabRootNode": { "__id__": 1 }, @@ -3677,7 +3677,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ffJV6UBCFASZhhsJBlra3/" + "fileId": "2d58Nx3YVD+YbXcV8Lq7Re" }, { "__type__": "cc.PrefabInfo", @@ -3687,7 +3687,7 @@ "asset": { "__id__": 0 }, - "fileId": "efC6CzSHpNA5fXKSDmDILZ", + "fileId": "cbmvrKhGdM8KAFQoiMXX1l", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3718,7 +3718,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "38az7W4HBAPoqhBt+7a15J" + "fileId": "feWivHykVGv72ebUGJatGA" }, { "__type__": "cc.PrefabInfo", @@ -3728,7 +3728,7 @@ "asset": { "__id__": 0 }, - "fileId": "0drS5uiMhJJbc80aweBZeP", + "fileId": "ceASiLYiVHQry6UH2mndZG", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3759,7 +3759,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "dfxddiDjpAkb68f67eXxSU" + "fileId": "f8MmaBgQBBUL2dpMwvsYaE" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -3784,7 +3784,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "982pSAoThKxYSpAAr37muo" + "fileId": "ccWip3cXhBb4/t20hX4VkF" }, { "__type__": "cc.PrefabInfo", @@ -3794,7 +3794,7 @@ "asset": { "__id__": 0 }, - "fileId": "38ocjIUNFKpJv4LTP6Spxx", + "fileId": "71lNtX2ytFoYQI8KPNRrva", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -3984,7 +3984,7 @@ "__id__": 181 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -3995,7 +3995,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "7frK7g+lZKtovjhO7HA/j+", + "fileId": "9fvN4grUlDoZ3Qg3+c9RE+", "prefabRootNode": { "__id__": 1 }, @@ -4021,7 +4021,7 @@ "__id__": 184 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4032,7 +4032,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "50kwFAFZFAJ4yxIduZWU5H", + "fileId": "60EBkZRYRF3JRhY9k/JR0p", "prefabRootNode": { "__id__": 1 }, @@ -4058,7 +4058,7 @@ "__id__": 187 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4069,7 +4069,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "0acflmAzBJJJnZNiH6KGVJ", + "fileId": "5atVOIVpBMeJ5Cig5H6iYJ", "prefabRootNode": { "__id__": 1 }, @@ -4106,7 +4106,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "58C2e8K19DsoLpXZZnkYjW", + "fileId": "9fcZtkT09Pt76LKCwMoJdO", "prefabRootNode": { "__id__": 1 }, @@ -4132,7 +4132,7 @@ "__id__": 193 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4143,7 +4143,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "75xpGZkaVBUZ/rUbpT54Eh", + "fileId": "3aZezTl2FCs7LNim+9Mb01", "prefabRootNode": { "__id__": 1 }, @@ -4178,7 +4178,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "dbBz+801lPJbvZt2AhBzw3" + "fileId": "4ei8Qrb21AcJanGmMso3+C" }, { "__type__": "cc.PrefabInfo", @@ -4188,7 +4188,7 @@ "asset": { "__id__": 0 }, - "fileId": "2dLkKMezJKfrXKj2LAKtoF", + "fileId": "60Lm7oddNIuIOhvpbkLzIG", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4219,7 +4219,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "79cjtFrCRG1pYmD22RdXVS" + "fileId": "f1aKKz3GFDmqacAKNcWiG9" }, { "__type__": "cc.PrefabInfo", @@ -4229,7 +4229,7 @@ "asset": { "__id__": 0 }, - "fileId": "0bElP0nzpGzb+EnXyeJRoN", + "fileId": "e1gL01dnxA/I6iuq1Gtt8S", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4260,7 +4260,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "833nBX+PBHLbaZRmRDStHc" + "fileId": "f79HNxZrBMeL1qAJBmJPN0" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4285,7 +4285,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "69LVd64KxBZoTTYYWmohCb" + "fileId": "73rZ85RbFKZbX2L+SCtWC5" }, { "__type__": "cc.PrefabInfo", @@ -4295,7 +4295,7 @@ "asset": { "__id__": 0 }, - "fileId": "2073KaUKlPGJxZbn7uTVKD", + "fileId": "d5K0RzhfJDtYLbQxo8gjul", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4485,7 +4485,7 @@ "__id__": 210 }, "asset": { - "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", + "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4496,7 +4496,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "4b+b1Rn4xI/4zQLSRnau/z", + "fileId": "fcNjQUMv5A7Zqu1oU1X3kb", "prefabRootNode": { "__id__": 1 }, @@ -4522,7 +4522,7 @@ "__id__": 213 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "c2de34b1-99b2-49c4-a6ec-44eeb63b12cd", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4533,7 +4533,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "5cQ2XRR0dJzaZiYpZouhLD", + "fileId": "246qrIOcZOaouKYvF7/iU4", "prefabRootNode": { "__id__": 1 }, @@ -4559,7 +4559,7 @@ "__id__": 216 }, "asset": { - "__uuid__": "a0fd2fb6-af52-4b80-a9fc-93d543fa2acd", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4570,7 +4570,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "50hu/cq8RM1pLX+Uk/gfS2", + "fileId": "7bX0/UevNJGpS3FZSveM1u", "prefabRootNode": { "__id__": 1 }, @@ -4596,7 +4596,7 @@ "__id__": 219 }, "asset": { - "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", + "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4607,7 +4607,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "77ldDSXQtNHaOVmRqF9rb/", + "fileId": "d8a/wNR8ZEjJWJK4R4yeIm", "prefabRootNode": { "__id__": 1 }, @@ -4633,7 +4633,7 @@ "__id__": 222 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4644,7 +4644,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "36FdvKpS1AIbcdz3I6aW0f", + "fileId": "eaK8WTdiVFkL9gBZmWyeov", "prefabRootNode": { "__id__": 1 }, @@ -4679,7 +4679,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "03mR1KCJxHX55Gc9s0/hV7" + "fileId": "22q4tKg1xOuICz3Ur0R6ny" }, { "__type__": "cc.PrefabInfo", @@ -4689,7 +4689,7 @@ "asset": { "__id__": 0 }, - "fileId": "62tGwSA/xObbYJzvfPtGVC", + "fileId": "7dy1yFNcdLU5HhB896zcQ6", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4720,7 +4720,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "05WR26MuZLGLqqCXjUIf88" + "fileId": "e7XRTHl6tJb7776Nm7Pf4x" }, { "__type__": "cc.PrefabInfo", @@ -4730,7 +4730,7 @@ "asset": { "__id__": 0 }, - "fileId": "78SmPdF99Fn68YsjQyzRGJ", + "fileId": "97z/8FOJpP04YkJARo07zk", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4761,7 +4761,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "52mjLTjhZG0qQ/kp7zjwHZ" + "fileId": "2ea0R4UBJCU5xTP8LOl21U" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -4786,7 +4786,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "33L0vMdYdAjauTDoPKA1dk" + "fileId": "adQjckzPxM27948fA5ZCGM" }, { "__type__": "cc.PrefabInfo", @@ -4796,7 +4796,7 @@ "asset": { "__id__": 0 }, - "fileId": "5206m7rx9Pq4lZQ3jSO2RF", + "fileId": "a7EaOR8SlJNJbs3SMlvy9L", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4986,7 +4986,7 @@ "__id__": 239 }, "asset": { - "__uuid__": "a185ad99-a791-4309-9851-549c756647b9", + "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -4997,7 +4997,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "dfBcbUuzRJVL7i8NrBJFX5", + "fileId": "a9vTLPjONO65U4SWWgNZJA", "prefabRootNode": { "__id__": 1 }, @@ -5023,7 +5023,7 @@ "__id__": 242 }, "asset": { - "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", + "__uuid__": "e50482a2-447d-46ce-91f0-488953dda75c", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5034,7 +5034,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "c8TF22nTlBOq6u5OjgM30k", + "fileId": "84us9mFatAl5Gg8rXP58/h", "prefabRootNode": { "__id__": 1 }, @@ -5060,7 +5060,7 @@ "__id__": 245 }, "asset": { - "__uuid__": "79c428b2-5899-404c-8495-991b407ef71b", + "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5071,7 +5071,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "82dW9TE95H6pPGddYE60R+", + "fileId": "1f9iJbBhxAb7HLg30aTlv/", "prefabRootNode": { "__id__": 1 }, @@ -5097,7 +5097,7 @@ "__id__": 248 }, "asset": { - "__uuid__": "5347ef5a-5046-4c36-be8f-bb27dc475204", + "__uuid__": "f8999765-2b3b-4d22-8a12-dd5165927db7", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5108,7 +5108,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "0b51+M72tA0YgD3EcWr+tx", + "fileId": "93+SR1hdZEtL7IROXKE4Jn", "prefabRootNode": { "__id__": 1 }, @@ -5134,7 +5134,7 @@ "__id__": 251 }, "asset": { - "__uuid__": "09ec107b-880c-45b8-ad98-84592e637c0b", + "__uuid__": "2c62af7c-9b93-48ff-bd76-a2dfd799659e", "__expectedType__": "cc.Prefab" }, "fileId": "fchELCmEtHhb3lT1fagDGR", @@ -5145,7 +5145,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "0famOxe7tHH7woXiCSz7Br", + "fileId": "082egj0G1E2ZCqqqaMJN46", "prefabRootNode": { "__id__": 1 }, @@ -5180,7 +5180,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f0WbSduptLBq+EFsjSrc8v" + "fileId": "c5Dx8wdrdIV6iTTPExuoHY" }, { "__type__": "cc.PrefabInfo", @@ -5190,7 +5190,7 @@ "asset": { "__id__": 0 }, - "fileId": "82nvLz+19EgIWyDKqmlJV7", + "fileId": "3b0wgFzdlFPZE+AGie5iq+", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5221,7 +5221,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f4NceAW/BGUoR2Ze631Dap" + "fileId": "81Eh44QRtKGoDp+JBXQs65" }, { "__type__": "cc.PrefabInfo", @@ -5231,7 +5231,7 @@ "asset": { "__id__": 0 }, - "fileId": "5d0yc3h9tGKJDhhdMr3qsL", + "fileId": "b6WW+3oJhKHpU7LhqIFbRz", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5262,7 +5262,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "20byduOC9NlbbGSWKSwQhP" + "fileId": "38aU4dmaFDHLITjmbnbJHL" }, { "__type__": "45522uB1sdFu4FJAojtnha4", @@ -5287,7 +5287,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1fNKi0eSpMspFMHruso2jL" + "fileId": "5dbrUk5OtM0q/ukdrx4O6H" }, { "__type__": "cc.PrefabInfo", @@ -5297,7 +5297,7 @@ "asset": { "__id__": 0 }, - "fileId": "b0VD6nd0pG46XbSVA1WAzQ", + "fileId": "d57wU1xGxMHLnFFH4QxrF5", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -5322,7 +5322,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ddrNNc4dJA7otDOzhedIMq" + "fileId": "3aNat1iTNBBpU6qeTe2Hx1" }, { "__type__": "cc.UITransform", @@ -5350,7 +5350,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d6c4i9EdtFH4QBlTnCOg4e" + "fileId": "5fiSaaHgZEXKFvo+FvrV2d" }, { "__type__": "cc.Graphics", @@ -5396,7 +5396,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "decY8F7oVJhIZ0Pi0tLcbj" + "fileId": "88Qycl49VJMJ2BibnCHVWW" }, { "__type__": "cc.PrefabInfo", @@ -5406,7 +5406,7 @@ "asset": { "__id__": 0 }, - "fileId": "c8P/WxnfFOt4EgEsbgbW0x", + "fileId": "d42d4OUUhBHaz6qO7rKkQx", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/Game/scripts/SlotScene.ts b/assets/Game/scripts/SlotScene.ts index 8ebd3c0..748f934 100644 --- a/assets/Game/scripts/SlotScene.ts +++ b/assets/Game/scripts/SlotScene.ts @@ -115,6 +115,7 @@ export class SlotScene extends Component { async start() { await this.init(); // this.TotalWin.show(505000, 8) + // this.FreeSpinEnter.show(8) // this.BigWinUI.show(800000, WIN_TYPE.SUPER_MEGA_WIN, 10000) } diff --git a/assets/Game/scripts/game/History.ts b/assets/Game/scripts/game/History.ts index dabf6b7..2578ac7 100644 --- a/assets/Game/scripts/game/History.ts +++ b/assets/Game/scripts/game/History.ts @@ -1,5 +1,5 @@ import { _decorator, Button, Color, Component, EventHandler, EventMouse, instantiate, isValid, JsonAsset, Label, math, Node, Prefab, ScrollView, sp, tween, UITransform, Vec3 } from 'cc'; -import { getCsymbol, getHistory, getLanguage } from '../../../Loading/scripts/comm'; +import { getCsymbol, getHistory, getHistoryDetails, getLanguage } from '../../../Loading/scripts/comm'; import { fixNum, getTimezoneOffsetString, getTranslate, hideAllChildren, hideToBottom, isBrahmic, showAllChildren, updateLang } from './Tools'; const { ccclass, property } = _decorator; @@ -396,15 +396,18 @@ export class History extends Component { - clickItem(event: Event, roundId: string) { + async clickItem(event: Event, roundId: string) { console.log("clickItem, roundId = ", roundId) const history_detail = instantiate(this.history_detail) this.node_detail.addChild(history_detail) - + let data = await getHistoryDetails({ + GameId: "rp_11001", + Id: roundId + }) const comp = history_detail.getComponent("HistoryDetail") as any - comp.setDetailData(this.DataArr[roundId], getLanguage(),) + comp.setDetailData(data, getLanguage()) const self = this history_detail.position = new Vec3(1080, 0) diff --git a/assets/Game/scripts/game/HistoryDetail.ts b/assets/Game/scripts/game/HistoryDetail.ts index dc77d74..0b7779b 100644 --- a/assets/Game/scripts/game/HistoryDetail.ts +++ b/assets/Game/scripts/game/HistoryDetail.ts @@ -528,11 +528,11 @@ export class HistoryDetail extends Component { const currencySymbol = this.data.currencySymbol const currency = this.data.currency - let historyDetails = await getHistoryDetails({ - GameId: "rp_11001", - Id: this.roundId - }) - const scoreInfos = historyDetails.panDetails[0].ScoreInfos + // let historyDetails = await getHistoryDetails({ + // GameId: "rp_11001", + // Id: this.roundId + // }) + const scoreInfos = this.data.panDetails[0].ScoreInfos const btn_winning_list = this.pnl_title.getChildByName("txt_spin").getChildByName("btn_winning_list").getComponent(Button) const sp = this.pnl_title.getChildByName("txt_spin").getChildByName("sp") if (scoreInfos) { @@ -545,12 +545,12 @@ export class HistoryDetail extends Component { } - historyDetails.panDetails.forEach(async (pan, idx) => { + this.data.panDetails.forEach(async (pan, idx) => { const item = instantiate(this.item_detail); item.active = true this.loadOne(item, pan, idx) - if (idx == historyDetails.panDetails.length - 1) { + if (idx == this.data.panDetails.length - 1) { // console.log("已全部生成完") this.hideLoading() this.scrollControl.jumpToPage(0) diff --git a/assets/Game/scripts/game/TotalWin.ts b/assets/Game/scripts/game/TotalWin.ts index 9e141f6..25f1654 100644 --- a/assets/Game/scripts/game/TotalWin.ts +++ b/assets/Game/scripts/game/TotalWin.ts @@ -62,6 +62,7 @@ export class TotalWin extends Component { tween(this.totalWinSpine.node) .to(0.5, { scale: new Vec3(1, 1, 1) }) .call(() => { + this.btn.node.active = true; this.scheduleOnce(() => { this.onClose(); }, 5) diff --git a/assets/Loading/scripts/comm.ts b/assets/Loading/scripts/comm.ts index 93c7130..c753f47 100644 --- a/assets/Loading/scripts/comm.ts +++ b/assets/Loading/scripts/comm.ts @@ -7,7 +7,7 @@ import { PREVIEW } from "cc/env" const gameId = "rp_11001"; // let apiaddr = "https://rpgames-api.rpfafafahkdev.com"; let apiaddr = ""; -let token = "eyJQIjoxMDAwMDEsIkUiOjE3NjYyNDM0MDksIlMiOjEwMDQsIkQiOiJycF8xMTAwMSJ9.MZPQSQvUhbtud9hOAV0_Bm2UfOnWhsuHGVeGAlB82Ck"; +let token = "eyJQIjoxMDA5NDksIkUiOjE3NjYyNjAwMTYsIlMiOjk5OSwiRCI6InJwXzExMDAxIn0.sjpGtLzoQoGawjnRYJ5NAR0GqrzYDc0gpV3ruFlwUM0"; let language = "en" diff --git a/assets/Loading/textures/tip/CommonUI_01.png b/assets/Loading/textures/tip/CommonUI_01.png old mode 100644 new mode 100755 index 366b4a0..9db1c47 Binary files a/assets/Loading/textures/tip/CommonUI_01.png and b/assets/Loading/textures/tip/CommonUI_01.png differ