diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index 0ed56fe..85bd459 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -17,7 +17,7 @@ "__id__": 2 }, { - "__id__": 309 + "__id__": 310 } ], "_active": false, @@ -81,23 +81,20 @@ "__id__": 7 }, { - "__id__": 269 + "__id__": 270 }, { - "__id__": 273 + "__id__": 274 }, { - "__id__": 298 + "__id__": 299 }, { - "__id__": 304 + "__id__": 305 } ], "_active": true, "_components": [ - { - "__id__": 305 - }, { "__id__": 306 }, @@ -106,6 +103,9 @@ }, { "__id__": 308 + }, + { + "__id__": 309 } ], "_prefab": null, @@ -363,16 +363,19 @@ "__id__": 11 }, { - "__id__": 261 + "__id__": 248 }, { - "__id__": 182 + "__id__": 255 + }, + { + "__id__": 169 } ], "_active": true, "_components": [ { - "__id__": 268 + "__id__": 269 } ], "_prefab": null, @@ -562,25 +565,25 @@ "__id__": 15 }, { - "__id__": 72 + "__id__": 59 }, { - "__id__": 230 + "__id__": 217 }, { - "__id__": 100 + "__id__": 87 }, { - "__id__": 255 + "__id__": 242 }, { - "__id__": 166 + "__id__": 153 } ], "_active": true, "_components": [ { - "__id__": 260 + "__id__": 247 } ], "_prefab": null, @@ -800,19 +803,16 @@ "__id__": 44 }, { - "__id__": 57 + "__id__": 49 }, { - "__id__": 62 - }, - { - "__id__": 66 + "__id__": 53 } ], "_active": true, "_components": [ { - "__id__": 71 + "__id__": 58 } ], "_prefab": null, @@ -839,7 +839,7 @@ "ctor": "Float64Array", "array": [ 0, - 730, + 760, 0, 0, 0, @@ -2282,659 +2282,6 @@ "_atlas": null, "_id": "3didFBlzBCg4IWn5o4cc5D" }, - { - "__type__": "cc.Node", - "_name": "shop", - "_objFlags": 0, - "_parent": { - "__id__": 15 - }, - "_children": [ - { - "__id__": 45 - }, - { - "__id__": 47 - }, - { - "__id__": 49 - }, - { - "__id__": 54 - } - ], - "_active": true, - "_components": [ - { - "__id__": 55 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 300, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -364.359, - -67.741, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "ed8QHZwEpB/7mQ3jJK75n6" - }, - { - "__type__": "cc.Node", - "_name": "ditu00", - "_objFlags": 0, - "_parent": { - "__id__": 44 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 46 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 238, - "height": 64 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -2.124, - 4.568, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "a0NhyFR6JMYrrafDAcT+mG" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 45 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "6f89728c-4545-4929-86e5-be5e58463060" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "87a22385-255f-4b25-8aef-a30045d22be4" - }, - "_id": "baGP59Fc9Ki6dTjlXk/XAp" - }, - { - "__type__": "cc.Node", - "_name": "coins", - "_objFlags": 0, - "_parent": { - "__id__": 44 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 48 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 84, - "height": 95 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -114.967, - 6.074, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1.2 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "a8JH7FzwlLgLoubW/zwwzN" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 47 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "d22678f9-a73b-4c94-af07-62a134fd2d30" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "d5Ga1SVtFCHpW+F/d+M2Dx" - }, - { - "__type__": "cc.Node", - "_name": "add", - "_objFlags": 0, - "_parent": { - "__id__": 44 - }, - "_children": [ - { - "__id__": 50 - } - ], - "_active": true, - "_components": [ - { - "__id__": 52 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 220, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -1.283, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "b7OMa7UX1GApBuutHMzV4q" - }, - { - "__type__": "cc.Node", - "_name": "add", - "_objFlags": 0, - "_parent": { - "__id__": 49 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 51 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 38, - "height": 42 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -72.756, - -26.24, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "f1isnnRLZEfodXxw30geH/" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 50 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "ea27cfca-1cb3-4df0-92d9-5c62bca5d634" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "87a22385-255f-4b25-8aef-a30045d22be4" - }, - "_id": "b15b5gJJRFxpH/6bNeH1b0" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 49 - }, - "_enabled": true, - "_normalMaterial": null, - "_grayMaterial": null, - "duration": 0.1, - "zoomScale": 1.2, - "clickEvents": [ - { - "__id__": 53 - } - ], - "_N$interactable": true, - "_N$enableAutoGrayEffect": false, - "_N$transition": 0, - "transition": 0, - "_N$normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_N$hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_N$normalSprite": null, - "_N$pressedSprite": null, - "pressedSprite": null, - "_N$hoverSprite": null, - "hoverSprite": null, - "_N$disabledSprite": null, - "_N$target": { - "__id__": 49 - }, - "_id": "5cndOFVONOdaMv+YrfkWsT" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 2 - }, - "component": "", - "_componentId": "80998T1AYNNRZdRxsVvXR65", - "handler": "openShop", - "customEventData": "" - }, - { - "__type__": "cc.Node", - "_name": "coin", - "_objFlags": 0, - "_parent": { - "__id__": 44 - }, - "_children": [], - "_active": true, - "_components": [], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 0, - "height": 0 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 40, - 6.041, - 0, - 0, - 0, - 0, - 1, - 1.1, - 1.1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "20iRJz5vNKjbgjTJR3p0SW" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 44 - }, - "_enabled": true, - "_normalMaterial": null, - "_grayMaterial": null, - "duration": 0.1, - "zoomScale": 1.1, - "clickEvents": [ - { - "__id__": 56 - } - ], - "_N$interactable": true, - "_N$enableAutoGrayEffect": false, - "_N$transition": 3, - "transition": 3, - "_N$normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_N$hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_N$normalSprite": null, - "_N$pressedSprite": null, - "pressedSprite": null, - "_N$hoverSprite": null, - "hoverSprite": null, - "_N$disabledSprite": null, - "_N$target": { - "__id__": 44 - }, - "_id": "ca0xU7MF5KGqNrW5X0zL1O" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 2 - }, - "component": "", - "_componentId": "80998T1AYNNRZdRxsVvXR65", - "handler": "openShop", - "customEventData": "" - }, { "__type__": "cc.Node", "_name": "returnBtn", @@ -2944,13 +2291,13 @@ }, "_children": [ { - "__id__": 58 + "__id__": 45 } ], "_active": false, "_components": [ { - "__id__": 60 + "__id__": 47 } ], "_prefab": null, @@ -3006,13 +2353,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 57 + "__id__": 44 }, "_children": [], "_active": true, "_components": [ { - "__id__": 59 + "__id__": 46 } ], "_prefab": null, @@ -3068,7 +2415,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 58 + "__id__": 45 }, "_enabled": true, "_materials": [ @@ -3102,7 +2449,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 57 + "__id__": 44 }, "_enabled": true, "_normalMaterial": null, @@ -3111,7 +2458,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 61 + "__id__": 48 } ], "_N$interactable": true, @@ -3167,7 +2514,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 57 + "__id__": 44 }, "_id": "34Z6b/IgpOtKrGQXG1ECg6" }, @@ -3192,10 +2539,10 @@ "_active": false, "_components": [ { - "__id__": 63 + "__id__": 50 }, { - "__id__": 64 + "__id__": 51 } ], "_prefab": null, @@ -3251,7 +2598,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 62 + "__id__": 49 }, "_enabled": true, "_materials": [ @@ -3283,7 +2630,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 62 + "__id__": 49 }, "_enabled": true, "_normalMaterial": null, @@ -3292,7 +2639,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 65 + "__id__": 52 } ], "_N$interactable": true, @@ -3348,7 +2695,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 62 + "__id__": 49 }, "_id": "5b3tG75G9DPpG0MZAvcDnY" }, @@ -3371,7 +2718,7 @@ }, "_children": [ { - "__id__": 67 + "__id__": 54 } ], "_active": true, @@ -3429,16 +2776,16 @@ "_name": "GameplayInfoButton", "_objFlags": 0, "_parent": { - "__id__": 66 + "__id__": 53 }, "_children": [], "_active": true, "_components": [ { - "__id__": 68 + "__id__": 55 }, { - "__id__": 69 + "__id__": 56 } ], "_prefab": null, @@ -3494,7 +2841,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 67 + "__id__": 54 }, "_enabled": true, "_materials": [ @@ -3526,7 +2873,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 67 + "__id__": 54 }, "_enabled": true, "_normalMaterial": null, @@ -3535,7 +2882,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 70 + "__id__": 57 } ], "_N$interactable": true, @@ -3591,7 +2938,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 67 + "__id__": 54 }, "_id": "4y6hgv/WvY4E/88bmCerjg" }, @@ -3618,7 +2965,7 @@ "_alignFlags": 1, "_left": 0, "_right": 0, - "_top": 230, + "_top": 200, "_bottom": 0, "_verticalCenter": 0, "_horizontalCenter": 0, @@ -3641,52 +2988,52 @@ }, "_children": [ { - "__id__": 73 + "__id__": 60 }, { - "__id__": 75 + "__id__": 62 }, { - "__id__": 77 + "__id__": 64 }, { - "__id__": 80 + "__id__": 67 }, { - "__id__": 116 + "__id__": 103 }, { - "__id__": 135 + "__id__": 122 }, { - "__id__": 213 + "__id__": 200 }, { - "__id__": 156 - }, - { - "__id__": 219 - }, - { - "__id__": 209 + "__id__": 143 }, { "__id__": 206 }, { - "__id__": 203 + "__id__": 196 }, { - "__id__": 223 + "__id__": 193 }, { - "__id__": 225 + "__id__": 190 + }, + { + "__id__": 210 + }, + { + "__id__": 212 } ], "_active": true, "_components": [ { - "__id__": 229 + "__id__": 216 } ], "_prefab": null, @@ -3742,13 +3089,13 @@ "_name": "floor", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [], "_active": true, "_components": [ { - "__id__": 74 + "__id__": 61 } ], "_prefab": null, @@ -3804,7 +3151,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 73 + "__id__": 60 }, "_enabled": true, "_materials": [ @@ -3836,13 +3183,13 @@ "_name": "version", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 63 } ], "_prefab": null, @@ -3898,7 +3245,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 62 }, "_enabled": true, "_materials": [ @@ -3931,16 +3278,16 @@ "_name": "rippleShrink", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [], "_active": true, "_components": [ { - "__id__": 78 + "__id__": 65 }, { - "__id__": 79 + "__id__": 66 } ], "_prefab": null, @@ -3996,7 +3343,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 77 + "__id__": 64 }, "_enabled": true, "_materials": [ @@ -4028,11 +3375,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 77 + "__id__": 64 }, "_enabled": true, "targetSprite": { - "__id__": 78 + "__id__": 65 }, "_id": "daDAcxz0pKR41QD4CmHiJa" }, @@ -4041,32 +3388,32 @@ "_name": "timeBtn", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [ { - "__id__": 81 + "__id__": 68 }, { - "__id__": 83 + "__id__": 70 }, { - "__id__": 89 + "__id__": 76 }, { - "__id__": 91 + "__id__": 78 } ], "_active": true, "_components": [ { - "__id__": 97 + "__id__": 84 }, { - "__id__": 98 + "__id__": 85 }, { - "__id__": 212 + "__id__": 199 } ], "_prefab": null, @@ -4122,13 +3469,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 80 + "__id__": 67 }, "_children": [], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 69 } ], "_prefab": null, @@ -4184,7 +3531,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 81 + "__id__": 68 }, "_enabled": true, "_materials": [ @@ -4218,17 +3565,17 @@ "_name": "mul10", "_objFlags": 0, "_parent": { - "__id__": 80 + "__id__": 67 }, "_children": [ { - "__id__": 84 + "__id__": 71 }, { - "__id__": 86 + "__id__": 73 }, { - "__id__": 88 + "__id__": 75 } ], "_active": true, @@ -4286,13 +3633,13 @@ "_name": "mul10", "_objFlags": 0, "_parent": { - "__id__": 83 + "__id__": 70 }, "_children": [], "_active": false, "_components": [ { - "__id__": 85 + "__id__": 72 } ], "_prefab": null, @@ -4348,7 +3695,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 84 + "__id__": 71 }, "_enabled": true, "_materials": [ @@ -4382,13 +3729,13 @@ "_name": "didaoju", "_objFlags": 0, "_parent": { - "__id__": 83 + "__id__": 70 }, "_children": [], "_active": false, "_components": [ { - "__id__": 87 + "__id__": 74 } ], "_prefab": null, @@ -4444,7 +3791,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 86 + "__id__": 73 }, "_enabled": true, "_materials": [ @@ -4476,7 +3823,7 @@ "_name": "New Node", "_objFlags": 0, "_parent": { - "__id__": 83 + "__id__": 70 }, "_children": [], "_active": false, @@ -4534,13 +3881,13 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 80 + "__id__": 67 }, "_children": [], "_active": false, "_components": [ { - "__id__": 90 + "__id__": 77 } ], "_prefab": null, @@ -4596,7 +3943,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 89 + "__id__": 76 }, "_enabled": true, "_materials": [ @@ -4629,20 +3976,20 @@ "_name": "lock", "_objFlags": 0, "_parent": { - "__id__": 80 + "__id__": 67 }, "_children": [ { - "__id__": 92 + "__id__": 79 }, { - "__id__": 94 + "__id__": 81 } ], "_active": false, "_components": [ { - "__id__": 96 + "__id__": 83 } ], "_prefab": null, @@ -4698,13 +4045,13 @@ "_name": "coin_2", "_objFlags": 0, "_parent": { - "__id__": 91 + "__id__": 78 }, "_children": [], "_active": true, "_components": [ { - "__id__": 93 + "__id__": 80 } ], "_prefab": null, @@ -4760,7 +4107,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 92 + "__id__": 79 }, "_enabled": true, "_materials": [ @@ -4794,13 +4141,13 @@ "_name": "mul8", "_objFlags": 0, "_parent": { - "__id__": 91 + "__id__": 78 }, "_children": [], "_active": true, "_components": [ { - "__id__": 95 + "__id__": 82 } ], "_prefab": null, @@ -4856,7 +4203,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 94 + "__id__": 81 }, "_enabled": true, "_materials": [ @@ -4890,7 +4237,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 91 + "__id__": 78 }, "_enabled": true, "_materials": [ @@ -4924,7 +4271,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 80 + "__id__": 67 }, "_enabled": true, "_materials": [ @@ -4958,7 +4305,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 80 + "__id__": 67 }, "_enabled": true, "_normalMaterial": null, @@ -4967,7 +4314,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 99 + "__id__": 86 } ], "_N$interactable": true, @@ -5023,14 +4370,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 80 + "__id__": 67 }, "_id": "a5N58fd3JDfatNn1yJULjP" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 100 + "__id__": 87 }, "component": "", "_componentId": "2234assp7RIvpDgrnqljp2R", @@ -5046,28 +4393,28 @@ }, "_children": [ { - "__id__": 101 + "__id__": 88 }, { - "__id__": 102 + "__id__": 89 }, { - "__id__": 103 + "__id__": 90 }, { - "__id__": 104 + "__id__": 91 }, { - "__id__": 107 + "__id__": 94 }, { - "__id__": 112 + "__id__": 99 } ], "_active": true, "_components": [ { - "__id__": 114 + "__id__": 101 } ], "_prefab": null, @@ -5123,7 +4470,7 @@ "_name": "mapBlock", "_objFlags": 0, "_parent": { - "__id__": 100 + "__id__": 87 }, "_children": [], "_active": true, @@ -5181,7 +4528,7 @@ "_name": "Wall", "_objFlags": 0, "_parent": { - "__id__": 100 + "__id__": 87 }, "_children": [], "_active": true, @@ -5239,7 +4586,7 @@ "_name": "Adhesive", "_objFlags": 0, "_parent": { - "__id__": 100 + "__id__": 87 }, "_children": [], "_active": true, @@ -5297,16 +4644,16 @@ "_name": "guide", "_objFlags": 0, "_parent": { - "__id__": 100 + "__id__": 87 }, "_children": [], "_active": false, "_components": [ { - "__id__": 105 + "__id__": 92 }, { - "__id__": 106 + "__id__": 93 } ], "_prefab": null, @@ -5362,7 +4709,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 104 + "__id__": 91 }, "_enabled": true, "_materials": [ @@ -5394,7 +4741,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 104 + "__id__": 91 }, "_enabled": true, "_defaultClip": { @@ -5413,19 +4760,19 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 100 + "__id__": 87 }, "_children": [], "_active": false, "_components": [ { - "__id__": 108 + "__id__": 95 }, { - "__id__": 109 + "__id__": 96 }, { - "__id__": 111 + "__id__": 98 } ], "_prefab": null, @@ -5481,7 +4828,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 107 + "__id__": 94 }, "_enabled": true, "_materials": [ @@ -5515,7 +4862,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 107 + "__id__": 94 }, "_enabled": true, "_normalMaterial": null, @@ -5524,7 +4871,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 110 + "__id__": 97 } ], "_N$interactable": true, @@ -5580,14 +4927,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 107 + "__id__": 94 }, "_id": "00FTYmsfBFJZi0WdpVBbZJ" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 100 + "__id__": 87 }, "component": "", "_componentId": "2234assp7RIvpDgrnqljp2R", @@ -5599,7 +4946,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 107 + "__id__": 94 }, "_enabled": true, "alignMode": 1, @@ -5626,13 +4973,13 @@ "_name": "chuiziyanwu", "_objFlags": 0, "_parent": { - "__id__": 100 + "__id__": 87 }, "_children": [], "_active": false, "_components": [ { - "__id__": 113 + "__id__": 100 } ], "_prefab": null, @@ -5688,7 +5035,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 112 + "__id__": 99 }, "_enabled": true, "_materials": [ @@ -5730,7 +5077,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 100 + "__id__": 87 }, "_enabled": true, "fontUI": { @@ -5837,51 +5184,51 @@ "__uuid__": "942f9428-8f09-459b-b880-ebbc3691b604" }, "timeBtn": { - "__id__": 98 + "__id__": 85 }, "destroyBtn": { - "__id__": 115 + "__id__": 102 }, "magicBtn": { - "__id__": 134 + "__id__": 121 }, "winStreakBtn": { - "__id__": 155 + "__id__": 142 }, "magics": { - "__id__": 166 + "__id__": 153 }, "mask": { "__id__": 5 }, "guideItem": { - "__id__": 182 + "__id__": 169 }, "guideMaskPrefab": { "__uuid__": "62391d59-5d78-42be-917a-51096e036cb4" }, "itemLock": [ { - "__id__": 127 + "__id__": 114 }, { - "__id__": 91 + "__id__": 78 }, { - "__id__": 146 + "__id__": 133 } ], "iceLabel": null, "hammerLabel": null, "magicLabel": null, "iceNode": { - "__id__": 83 + "__id__": 70 }, "hammerNode": { - "__id__": 121 + "__id__": 108 }, "magicNode": { - "__id__": 138 + "__id__": 125 }, "icetimeNode": [ { @@ -5895,19 +5242,19 @@ } ], "magicMask": { - "__id__": 203 + "__id__": 190 }, "hammerMask": { - "__id__": 206 + "__id__": 193 }, "freezeMask": { - "__id__": 209 + "__id__": 196 }, "guideNode": { - "__id__": 104 + "__id__": 91 }, "hammerAni": { - "__id__": 112 + "__id__": 99 }, "coinPop": null, "gameOverNode": null, @@ -5923,7 +5270,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 116 + "__id__": 103 }, "_enabled": true, "_normalMaterial": null, @@ -5932,7 +5279,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 133 + "__id__": 120 } ], "_N$interactable": true, @@ -5988,7 +5335,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 116 + "__id__": 103 }, "_id": "37kLzoX/5ETIkOp2zQsq9p" }, @@ -5997,32 +5344,32 @@ "_name": "destroyBtn", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [ { - "__id__": 117 + "__id__": 104 }, { - "__id__": 119 + "__id__": 106 }, { - "__id__": 121 + "__id__": 108 }, { - "__id__": 127 + "__id__": 114 } ], "_active": true, "_components": [ { - "__id__": 131 + "__id__": 118 }, { - "__id__": 115 + "__id__": 102 }, { - "__id__": 132 + "__id__": 119 } ], "_prefab": null, @@ -6078,13 +5425,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 116 + "__id__": 103 }, "_children": [], "_active": true, "_components": [ { - "__id__": 118 + "__id__": 105 } ], "_prefab": null, @@ -6140,7 +5487,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 117 + "__id__": 104 }, "_enabled": true, "_materials": [ @@ -6174,13 +5521,13 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 116 + "__id__": 103 }, "_children": [], "_active": false, "_components": [ { - "__id__": 120 + "__id__": 107 } ], "_prefab": null, @@ -6236,7 +5583,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 119 + "__id__": 106 }, "_enabled": true, "_materials": [ @@ -6269,17 +5616,17 @@ "_name": "mul10", "_objFlags": 0, "_parent": { - "__id__": 116 + "__id__": 103 }, "_children": [ { - "__id__": 122 + "__id__": 109 }, { - "__id__": 124 + "__id__": 111 }, { - "__id__": 126 + "__id__": 113 } ], "_active": true, @@ -6337,13 +5684,13 @@ "_name": "mul10", "_objFlags": 0, "_parent": { - "__id__": 121 + "__id__": 108 }, "_children": [], "_active": false, "_components": [ { - "__id__": 123 + "__id__": 110 } ], "_prefab": null, @@ -6399,7 +5746,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 122 + "__id__": 109 }, "_enabled": true, "_materials": [ @@ -6433,13 +5780,13 @@ "_name": "didaoju", "_objFlags": 0, "_parent": { - "__id__": 121 + "__id__": 108 }, "_children": [], "_active": false, "_components": [ { - "__id__": 125 + "__id__": 112 } ], "_prefab": null, @@ -6495,7 +5842,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 124 + "__id__": 111 }, "_enabled": true, "_materials": [ @@ -6527,7 +5874,7 @@ "_name": "New Node", "_objFlags": 0, "_parent": { - "__id__": 121 + "__id__": 108 }, "_children": [], "_active": false, @@ -6585,17 +5932,17 @@ "_name": "lock", "_objFlags": 0, "_parent": { - "__id__": 116 + "__id__": 103 }, "_children": [ { - "__id__": 128 + "__id__": 115 } ], "_active": false, "_components": [ { - "__id__": 130 + "__id__": 117 } ], "_prefab": null, @@ -6651,13 +5998,13 @@ "_name": "tili_8", "_objFlags": 0, "_parent": { - "__id__": 127 + "__id__": 114 }, "_children": [], "_active": true, "_components": [ { - "__id__": 129 + "__id__": 116 } ], "_prefab": null, @@ -6713,7 +6060,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 128 + "__id__": 115 }, "_enabled": true, "_materials": [ @@ -6747,7 +6094,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 127 + "__id__": 114 }, "_enabled": true, "_materials": [ @@ -6781,7 +6128,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 116 + "__id__": 103 }, "_enabled": true, "_materials": [ @@ -6815,7 +6162,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 116 + "__id__": 103 }, "_enabled": true, "_id": "dekCrxpChCv7UV5uQ+seyc" @@ -6823,7 +6170,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 100 + "__id__": 87 }, "component": "", "_componentId": "2234assp7RIvpDgrnqljp2R", @@ -6835,7 +6182,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 135 + "__id__": 122 }, "_enabled": true, "_normalMaterial": null, @@ -6844,7 +6191,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 154 + "__id__": 141 } ], "_N$interactable": true, @@ -6900,7 +6247,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 135 + "__id__": 122 }, "_id": "13iXPcjuVGtZpauFnVUGQE" }, @@ -6909,32 +6256,32 @@ "_name": "magicBtn", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [ { - "__id__": 136 + "__id__": 123 }, { - "__id__": 138 + "__id__": 125 }, { - "__id__": 144 + "__id__": 131 }, { - "__id__": 146 + "__id__": 133 } ], "_active": true, "_components": [ { - "__id__": 152 + "__id__": 139 }, { - "__id__": 134 + "__id__": 121 }, { - "__id__": 153 + "__id__": 140 } ], "_prefab": null, @@ -6990,13 +6337,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 135 + "__id__": 122 }, "_children": [], "_active": true, "_components": [ { - "__id__": 137 + "__id__": 124 } ], "_prefab": null, @@ -7052,7 +6399,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 136 + "__id__": 123 }, "_enabled": true, "_materials": [ @@ -7086,17 +6433,17 @@ "_name": "mul10", "_objFlags": 0, "_parent": { - "__id__": 135 + "__id__": 122 }, "_children": [ { - "__id__": 139 + "__id__": 126 }, { - "__id__": 141 + "__id__": 128 }, { - "__id__": 143 + "__id__": 130 } ], "_active": true, @@ -7154,13 +6501,13 @@ "_name": "mul10", "_objFlags": 0, "_parent": { - "__id__": 138 + "__id__": 125 }, "_children": [], "_active": false, "_components": [ { - "__id__": 140 + "__id__": 127 } ], "_prefab": null, @@ -7216,7 +6563,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 139 + "__id__": 126 }, "_enabled": true, "_materials": [ @@ -7250,13 +6597,13 @@ "_name": "didaoju", "_objFlags": 0, "_parent": { - "__id__": 138 + "__id__": 125 }, "_children": [], "_active": false, "_components": [ { - "__id__": 142 + "__id__": 129 } ], "_prefab": null, @@ -7312,7 +6659,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 141 + "__id__": 128 }, "_enabled": true, "_materials": [ @@ -7344,7 +6691,7 @@ "_name": "New Node", "_objFlags": 0, "_parent": { - "__id__": 138 + "__id__": 125 }, "_children": [], "_active": false, @@ -7402,13 +6749,13 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 135 + "__id__": 122 }, "_children": [], "_active": false, "_components": [ { - "__id__": 145 + "__id__": 132 } ], "_prefab": null, @@ -7464,7 +6811,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 144 + "__id__": 131 }, "_enabled": true, "_materials": [ @@ -7497,20 +6844,20 @@ "_name": "lock", "_objFlags": 0, "_parent": { - "__id__": 135 + "__id__": 122 }, "_children": [ { - "__id__": 147 + "__id__": 134 }, { - "__id__": 149 + "__id__": 136 } ], "_active": true, "_components": [ { - "__id__": 151 + "__id__": 138 } ], "_prefab": null, @@ -7566,13 +6913,13 @@ "_name": "button_4", "_objFlags": 0, "_parent": { - "__id__": 146 + "__id__": 133 }, "_children": [], "_active": true, "_components": [ { - "__id__": 148 + "__id__": 135 } ], "_prefab": null, @@ -7628,7 +6975,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 147 + "__id__": 134 }, "_enabled": true, "_materials": [ @@ -7662,13 +7009,13 @@ "_name": "coin_6", "_objFlags": 0, "_parent": { - "__id__": 146 + "__id__": 133 }, "_children": [], "_active": true, "_components": [ { - "__id__": 150 + "__id__": 137 } ], "_prefab": null, @@ -7724,7 +7071,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 149 + "__id__": 136 }, "_enabled": true, "_materials": [ @@ -7758,7 +7105,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 146 + "__id__": 133 }, "_enabled": true, "_materials": [ @@ -7792,7 +7139,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 135 + "__id__": 122 }, "_enabled": true, "_materials": [ @@ -7826,7 +7173,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 135 + "__id__": 122 }, "_enabled": true, "_id": "d3aD0owzFH74KOQ39ei+jJ" @@ -7834,7 +7181,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 100 + "__id__": 87 }, "component": "", "_componentId": "2234assp7RIvpDgrnqljp2R", @@ -7846,7 +7193,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 156 + "__id__": 143 }, "_enabled": true, "_normalMaterial": null, @@ -7855,7 +7202,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 165 + "__id__": 152 } ], "_N$interactable": true, @@ -7911,7 +7258,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 156 + "__id__": 143 }, "_id": "e84jtO6HVNNYNS+LVYc5Gi" }, @@ -7920,29 +7267,29 @@ "_name": "winStreakBtn", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [ { - "__id__": 157 + "__id__": 144 }, { - "__id__": 159 + "__id__": 146 }, { - "__id__": 161 + "__id__": 148 } ], "_active": false, "_components": [ { - "__id__": 163 + "__id__": 150 }, { - "__id__": 155 + "__id__": 142 }, { - "__id__": 164 + "__id__": 151 } ], "_prefab": null, @@ -7998,13 +7345,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 156 + "__id__": 143 }, "_children": [], "_active": true, "_components": [ { - "__id__": 158 + "__id__": 145 } ], "_prefab": null, @@ -8060,7 +7407,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 157 + "__id__": 144 }, "_enabled": true, "_materials": [ @@ -8094,13 +7441,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 156 + "__id__": 143 }, "_children": [], "_active": true, "_components": [ { - "__id__": 160 + "__id__": 147 } ], "_prefab": null, @@ -8156,7 +7503,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 159 + "__id__": 146 }, "_enabled": true, "_materials": [ @@ -8190,13 +7537,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 156 + "__id__": 143 }, "_children": [], "_active": true, "_components": [ { - "__id__": 162 + "__id__": 149 } ], "_prefab": null, @@ -8252,7 +7599,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 161 + "__id__": 148 }, "_enabled": true, "_materials": [ @@ -8284,7 +7631,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 156 + "__id__": 143 }, "_enabled": true, "_materials": [ @@ -8318,7 +7665,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 156 + "__id__": 143 }, "_enabled": true, "_id": "5bwikT9ZdGr6agHiYqa2Hb" @@ -8326,7 +7673,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 100 + "__id__": 87 }, "component": "", "_componentId": "2234assp7RIvpDgrnqljp2R", @@ -8342,13 +7689,13 @@ }, "_children": [ { - "__id__": 167 + "__id__": 154 } ], "_active": false, "_components": [ { - "__id__": 181 + "__id__": 168 } ], "_prefab": null, @@ -8404,26 +7751,26 @@ "_name": "tuowei1", "_objFlags": 0, "_parent": { - "__id__": 166 + "__id__": 153 }, "_children": [ { - "__id__": 168 + "__id__": 155 }, { - "__id__": 171 + "__id__": 158 }, { - "__id__": 174 + "__id__": 161 }, { - "__id__": 177 + "__id__": 164 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 180 + "__id__": 167 }, "_opacity": 255, "_color": { @@ -8477,17 +7824,17 @@ "_name": "bang", "_objFlags": 0, "_parent": { - "__id__": 167 + "__id__": 154 }, "_children": [], "_active": false, "_components": [ { - "__id__": 169 + "__id__": 156 } ], "_prefab": { - "__id__": 170 + "__id__": 157 }, "_opacity": 255, "_color": { @@ -8541,7 +7888,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 168 + "__id__": 155 }, "_enabled": true, "_materials": [ @@ -8569,7 +7916,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 167 + "__id__": 154 }, "asset": { "__uuid__": "ffebbf13-83a0-4923-a965-96f134e7b567" @@ -8582,17 +7929,17 @@ "_name": "tailing", "_objFlags": 0, "_parent": { - "__id__": 167 + "__id__": 154 }, "_children": [], "_active": true, "_components": [ { - "__id__": 172 + "__id__": 159 } ], "_prefab": { - "__id__": 173 + "__id__": 160 }, "_opacity": 255, "_color": { @@ -8646,7 +7993,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 171 + "__id__": 158 }, "_enabled": true, "_materials": [ @@ -8676,7 +8023,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 167 + "__id__": 154 }, "asset": { "__uuid__": "ffebbf13-83a0-4923-a965-96f134e7b567" @@ -8689,17 +8036,17 @@ "_name": "em_flash_particle", "_objFlags": 0, "_parent": { - "__id__": 167 + "__id__": 154 }, "_children": [], "_active": true, "_components": [ { - "__id__": 175 + "__id__": 162 } ], "_prefab": { - "__id__": 176 + "__id__": 163 }, "_opacity": 255, "_color": { @@ -8753,7 +8100,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 174 + "__id__": 161 }, "_enabled": true, "_materials": [ @@ -8852,7 +8199,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 167 + "__id__": 154 }, "asset": { "__uuid__": "ffebbf13-83a0-4923-a965-96f134e7b567" @@ -8865,17 +8212,17 @@ "_name": "em_flash_0001", "_objFlags": 0, "_parent": { - "__id__": 167 + "__id__": 154 }, "_children": [], "_active": true, "_components": [ { - "__id__": 178 + "__id__": 165 } ], "_prefab": { - "__id__": 179 + "__id__": 166 }, "_opacity": 255, "_color": { @@ -8929,7 +8276,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 177 + "__id__": 164 }, "_enabled": true, "_materials": [ @@ -9028,7 +8375,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 167 + "__id__": 154 }, "asset": { "__uuid__": "ffebbf13-83a0-4923-a965-96f134e7b567" @@ -9039,7 +8386,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 167 + "__id__": 154 }, "asset": { "__uuid__": "ffebbf13-83a0-4923-a965-96f134e7b567" @@ -9052,7 +8399,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 166 + "__id__": 153 }, "_enabled": true, "_materials": [ @@ -9098,31 +8445,31 @@ }, "_children": [ { - "__id__": 183 + "__id__": 170 }, { - "__id__": 187 + "__id__": 174 }, { - "__id__": 189 + "__id__": 176 }, { - "__id__": 191 + "__id__": 178 }, { - "__id__": 193 + "__id__": 180 }, { - "__id__": 195 + "__id__": 182 } ], "_active": false, "_components": [ { - "__id__": 201 + "__id__": 188 }, { - "__id__": 202 + "__id__": 189 } ], "_prefab": null, @@ -9178,19 +8525,19 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 182 + "__id__": 169 }, "_children": [], "_active": true, "_components": [ { - "__id__": 184 + "__id__": 171 }, { - "__id__": 185 + "__id__": 172 }, { - "__id__": 186 + "__id__": 173 } ], "_prefab": null, @@ -9246,7 +8593,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 183 + "__id__": 170 }, "_enabled": true, "_materials": [ @@ -9278,7 +8625,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 183 + "__id__": 170 }, "_enabled": true, "alignMode": 1, @@ -9305,7 +8652,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 183 + "__id__": 170 }, "_enabled": true, "_id": "95Vn8J8CdEAp/SGn35R5Xu" @@ -9315,13 +8662,13 @@ "_name": "daojuditu", "_objFlags": 0, "_parent": { - "__id__": 182 + "__id__": 169 }, "_children": [], "_active": true, "_components": [ { - "__id__": 188 + "__id__": 175 } ], "_prefab": null, @@ -9377,7 +8724,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 187 + "__id__": 174 }, "_enabled": true, "_materials": [ @@ -9409,13 +8756,13 @@ "_name": "gui_shizhong", "_objFlags": 0, "_parent": { - "__id__": 182 + "__id__": 169 }, "_children": [], "_active": true, "_components": [ { - "__id__": 190 + "__id__": 177 } ], "_prefab": null, @@ -9471,7 +8818,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 189 + "__id__": 176 }, "_enabled": true, "_materials": [ @@ -9505,13 +8852,13 @@ "_name": "txt_5t", "_objFlags": 0, "_parent": { - "__id__": 182 + "__id__": 169 }, "_children": [], "_active": true, "_components": [ { - "__id__": 192 + "__id__": 179 } ], "_prefab": null, @@ -9567,7 +8914,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 191 + "__id__": 178 }, "_enabled": true, "_materials": [ @@ -9601,13 +8948,13 @@ "_name": "txt_6t", "_objFlags": 0, "_parent": { - "__id__": 182 + "__id__": 169 }, "_children": [], "_active": true, "_components": [ { - "__id__": 194 + "__id__": 181 } ], "_prefab": null, @@ -9663,7 +9010,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 193 + "__id__": 180 }, "_enabled": true, "_materials": [ @@ -9697,20 +9044,20 @@ "_name": "btn_lq", "_objFlags": 0, "_parent": { - "__id__": 182 + "__id__": 169 }, "_children": [ { - "__id__": 196 + "__id__": 183 } ], "_active": true, "_components": [ { - "__id__": 198 + "__id__": 185 }, { - "__id__": 199 + "__id__": 186 } ], "_prefab": null, @@ -9766,13 +9113,13 @@ "_name": "btn_lq2", "_objFlags": 0, "_parent": { - "__id__": 195 + "__id__": 182 }, "_children": [], "_active": false, "_components": [ { - "__id__": 197 + "__id__": 184 } ], "_prefab": null, @@ -9828,7 +9175,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 196 + "__id__": 183 }, "_enabled": true, "_materials": [ @@ -9862,7 +9209,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 195 + "__id__": 182 }, "_enabled": true, "_materials": [ @@ -9894,7 +9241,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 195 + "__id__": 182 }, "_enabled": true, "_normalMaterial": null, @@ -9903,7 +9250,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 200 + "__id__": 187 } ], "_N$interactable": true, @@ -9959,14 +9306,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 195 + "__id__": 182 }, "_id": "92AlkG7CNBpJXAytVBuBwj" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 182 + "__id__": 169 }, "component": "", "_componentId": "54996zSr8pHNLOmmqnTRGXe", @@ -9978,7 +9325,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 182 + "__id__": 169 }, "_enabled": true, "alignMode": 1, @@ -10005,25 +9352,25 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 182 + "__id__": 169 }, "_enabled": true, "itemList": [ { - "__id__": 191 + "__id__": 178 }, { - "__id__": 189 + "__id__": 176 }, { - "__id__": 193 + "__id__": 180 }, { - "__id__": 187 + "__id__": 174 } ], "itemGuide": { - "__id__": 189 + "__id__": 176 }, "itemSpriteList": [ { @@ -10071,13 +9418,13 @@ ], "targetNode": [ { - "__id__": 116 + "__id__": 103 }, { - "__id__": 80 + "__id__": 67 }, { - "__id__": 135 + "__id__": 122 } ], "_id": "fbc3UiJP1FN69CmTLDgjh5" @@ -10087,16 +9434,16 @@ "_name": "magicMask", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [], "_active": false, "_components": [ { - "__id__": 204 + "__id__": 191 }, { - "__id__": 205 + "__id__": 192 } ], "_prefab": null, @@ -10152,7 +9499,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 203 + "__id__": 190 }, "_enabled": true, "_materials": [ @@ -10186,7 +9533,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 203 + "__id__": 190 }, "_enabled": true, "_id": "e8zuQH36BBZaL/1k13rbss" @@ -10196,16 +9543,16 @@ "_name": "hammerMask", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [], "_active": false, "_components": [ { - "__id__": 207 + "__id__": 194 }, { - "__id__": 208 + "__id__": 195 } ], "_prefab": null, @@ -10261,7 +9608,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 206 + "__id__": 193 }, "_enabled": true, "_materials": [ @@ -10295,7 +9642,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 206 + "__id__": 193 }, "_enabled": true, "_id": "38p//kTl1IxZ+3LfA8cdcJ" @@ -10305,16 +9652,16 @@ "_name": "freezeMask", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [], "_active": false, "_components": [ { - "__id__": 210 + "__id__": 197 }, { - "__id__": 211 + "__id__": 198 } ], "_prefab": null, @@ -10370,7 +9717,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 209 + "__id__": 196 }, "_enabled": true, "_materials": [ @@ -10404,7 +9751,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 209 + "__id__": 196 }, "_enabled": true, "_id": "63gNCerwZExo+YLuxgFmqU" @@ -10414,7 +9761,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 80 + "__id__": 67 }, "_enabled": true, "_id": "8dtEbp4qBFRZbexchpFtKp" @@ -10424,20 +9771,20 @@ "_name": "returnBtn", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [ { - "__id__": 214 + "__id__": 201 } ], "_active": true, "_components": [ { - "__id__": 216 + "__id__": 203 }, { - "__id__": 218 + "__id__": 205 } ], "_prefab": null, @@ -10493,13 +9840,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 213 + "__id__": 200 }, "_children": [], "_active": true, "_components": [ { - "__id__": 215 + "__id__": 202 } ], "_prefab": null, @@ -10555,7 +9902,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 214 + "__id__": 201 }, "_enabled": true, "_materials": [ @@ -10589,7 +9936,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 213 + "__id__": 200 }, "_enabled": true, "_normalMaterial": null, @@ -10598,7 +9945,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 217 + "__id__": 204 } ], "_N$interactable": true, @@ -10654,7 +10001,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 213 + "__id__": 200 }, "_id": "87c+8sV8FH+5mMTIXYBbll" }, @@ -10673,7 +10020,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 213 + "__id__": 200 }, "_enabled": true, "_id": "ae2rpYpEJBsK26v76aVmm/" @@ -10683,16 +10030,16 @@ "_name": "pauseBtn", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [], "_active": false, "_components": [ { - "__id__": 220 + "__id__": 207 }, { - "__id__": 221 + "__id__": 208 } ], "_prefab": null, @@ -10748,7 +10095,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 219 + "__id__": 206 }, "_enabled": true, "_materials": [ @@ -10778,7 +10125,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 219 + "__id__": 206 }, "_enabled": true, "_normalMaterial": null, @@ -10787,7 +10134,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 222 + "__id__": 209 } ], "_N$interactable": true, @@ -10843,14 +10190,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 219 + "__id__": 206 }, "_id": "3dlpZtk6BJQ40ey82SCcay" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 100 + "__id__": 87 }, "component": "", "_componentId": "2234assp7RIvpDgrnqljp2R", @@ -10862,13 +10209,13 @@ "_name": "rainbow", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [], "_active": true, "_components": [ { - "__id__": 224 + "__id__": 211 } ], "_prefab": null, @@ -10924,7 +10271,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 223 + "__id__": 210 }, "_enabled": true, "_materials": [ @@ -10956,16 +10303,16 @@ "_name": "rainbowBg", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 59 }, "_children": [], "_active": true, "_components": [ { - "__id__": 226 + "__id__": 213 }, { - "__id__": 227 + "__id__": 214 } ], "_prefab": null, @@ -11021,7 +10368,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 225 + "__id__": 212 }, "_enabled": true, "_materials": [ @@ -11053,7 +10400,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 225 + "__id__": 212 }, "_enabled": true, "_normalMaterial": null, @@ -11062,7 +10409,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 228 + "__id__": 215 } ], "_N$interactable": true, @@ -11118,14 +10465,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 225 + "__id__": 212 }, "_id": "0e1NLnQqVHkbPKcv5jdlSK" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 100 + "__id__": 87 }, "component": "", "_componentId": "2234assp7RIvpDgrnqljp2R", @@ -11137,7 +10484,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 72 + "__id__": 59 }, "_enabled": true, "alignMode": 1, @@ -11168,19 +10515,19 @@ }, "_children": [ { - "__id__": 231 + "__id__": 218 } ], "_active": false, "_components": [ { - "__id__": 252 + "__id__": 239 }, { - "__id__": 253 + "__id__": 240 }, { - "__id__": 254 + "__id__": 241 } ], "_prefab": null, @@ -11236,17 +10583,17 @@ "_name": "bottom", "_objFlags": 0, "_parent": { - "__id__": 230 + "__id__": 217 }, "_children": [ { - "__id__": 232 + "__id__": 219 } ], "_active": true, "_components": [ { - "__id__": 251 + "__id__": 238 } ], "_prefab": null, @@ -11302,32 +10649,32 @@ "_name": "destroyBtn", "_objFlags": 0, "_parent": { - "__id__": 231 + "__id__": 218 }, "_children": [ { - "__id__": 233 + "__id__": 220 + }, + { + "__id__": 222 + }, + { + "__id__": 224 + }, + { + "__id__": 230 + } + ], + "_active": true, + "_components": [ + { + "__id__": 234 }, { "__id__": 235 }, { "__id__": 237 - }, - { - "__id__": 243 - } - ], - "_active": true, - "_components": [ - { - "__id__": 247 - }, - { - "__id__": 248 - }, - { - "__id__": 250 } ], "_prefab": null, @@ -11383,13 +10730,13 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 232 + "__id__": 219 }, "_children": [], "_active": true, "_components": [ { - "__id__": 234 + "__id__": 221 } ], "_prefab": null, @@ -11445,7 +10792,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 233 + "__id__": 220 }, "_enabled": true, "_materials": [ @@ -11479,13 +10826,13 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 232 + "__id__": 219 }, "_children": [], "_active": false, "_components": [ { - "__id__": 236 + "__id__": 223 } ], "_prefab": null, @@ -11541,7 +10888,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 235 + "__id__": 222 }, "_enabled": true, "_materials": [ @@ -11574,17 +10921,17 @@ "_name": "mul10", "_objFlags": 0, "_parent": { - "__id__": 232 + "__id__": 219 }, "_children": [ { - "__id__": 238 + "__id__": 225 }, { - "__id__": 240 + "__id__": 227 }, { - "__id__": 242 + "__id__": 229 } ], "_active": true, @@ -11642,13 +10989,13 @@ "_name": "mul10", "_objFlags": 0, "_parent": { - "__id__": 237 + "__id__": 224 }, "_children": [], "_active": false, "_components": [ { - "__id__": 239 + "__id__": 226 } ], "_prefab": null, @@ -11704,7 +11051,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 238 + "__id__": 225 }, "_enabled": true, "_materials": [ @@ -11738,13 +11085,13 @@ "_name": "didaoju", "_objFlags": 0, "_parent": { - "__id__": 237 + "__id__": 224 }, "_children": [], "_active": false, "_components": [ { - "__id__": 241 + "__id__": 228 } ], "_prefab": null, @@ -11800,7 +11147,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 240 + "__id__": 227 }, "_enabled": true, "_materials": [ @@ -11834,7 +11181,7 @@ "_name": "New Node", "_objFlags": 0, "_parent": { - "__id__": 237 + "__id__": 224 }, "_children": [], "_active": false, @@ -11892,17 +11239,17 @@ "_name": "lock", "_objFlags": 0, "_parent": { - "__id__": 232 + "__id__": 219 }, "_children": [ { - "__id__": 244 + "__id__": 231 } ], "_active": false, "_components": [ { - "__id__": 246 + "__id__": 233 } ], "_prefab": null, @@ -11958,13 +11305,13 @@ "_name": "tili_8", "_objFlags": 0, "_parent": { - "__id__": 243 + "__id__": 230 }, "_children": [], "_active": true, "_components": [ { - "__id__": 245 + "__id__": 232 } ], "_prefab": null, @@ -12020,7 +11367,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 244 + "__id__": 231 }, "_enabled": true, "_materials": [ @@ -12054,7 +11401,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 243 + "__id__": 230 }, "_enabled": true, "_materials": [ @@ -12088,7 +11435,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 232 + "__id__": 219 }, "_enabled": true, "_materials": [ @@ -12122,7 +11469,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 232 + "__id__": 219 }, "_enabled": true, "_normalMaterial": null, @@ -12131,7 +11478,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 249 + "__id__": 236 } ], "_N$interactable": true, @@ -12187,14 +11534,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 232 + "__id__": 219 }, "_id": "150aiaeGdI/YFP1L2K0NPn" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 100 + "__id__": 87 }, "component": "", "_componentId": "2234assp7RIvpDgrnqljp2R", @@ -12206,7 +11553,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 232 + "__id__": 219 }, "_enabled": true, "_id": "71sUKAtHZCro/988B+N4cn" @@ -12216,7 +11563,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 231 + "__id__": 218 }, "_enabled": true, "alignMode": 1, @@ -12243,7 +11590,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 230 + "__id__": 217 }, "_enabled": true, "_materials": [ @@ -12275,7 +11622,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 230 + "__id__": 217 }, "_enabled": true, "alignMode": 1, @@ -12302,7 +11649,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 230 + "__id__": 217 }, "_enabled": true, "_id": "970euz4sFDGYqbBDcoY+nk" @@ -12316,16 +11663,16 @@ }, "_children": [ { - "__id__": 256 + "__id__": 243 } ], "_active": false, "_components": [ { - "__id__": 258 + "__id__": 245 }, { - "__id__": 259 + "__id__": 246 } ], "_prefab": null, @@ -12381,13 +11728,13 @@ "_name": "skeleton", "_objFlags": 0, "_parent": { - "__id__": 255 + "__id__": 242 }, "_children": [], "_active": true, "_components": [ { - "__id__": 257 + "__id__": 244 } ], "_prefab": null, @@ -12443,7 +11790,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 256 + "__id__": 243 }, "_enabled": true, "_materials": [ @@ -12485,7 +11832,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 255 + "__id__": 242 }, "_enabled": true, "_materials": [ @@ -12515,7 +11862,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 255 + "__id__": 242 }, "_enabled": true, "alignMode": 1, @@ -12573,16 +11920,16 @@ }, "_children": [ { - "__id__": 262 + "__id__": 249 }, { - "__id__": 264 + "__id__": 251 } ], "_active": false, "_components": [ { - "__id__": 267 + "__id__": 254 } ], "_prefab": null, @@ -12638,13 +11985,13 @@ "_name": "pass_rate_label", "_objFlags": 0, "_parent": { - "__id__": 261 + "__id__": 248 }, "_children": [], "_active": true, "_components": [ { - "__id__": 263 + "__id__": 250 } ], "_prefab": null, @@ -12700,7 +12047,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 262 + "__id__": 249 }, "_enabled": true, "_materials": [ @@ -12732,16 +12079,16 @@ "_name": "passRate", "_objFlags": 0, "_parent": { - "__id__": 261 + "__id__": 248 }, "_children": [], "_active": true, "_components": [ { - "__id__": 265 + "__id__": 252 }, { - "__id__": 266 + "__id__": 253 } ], "_prefab": null, @@ -12797,7 +12144,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 264 + "__id__": 251 }, "_enabled": true, "_materials": [ @@ -12830,7 +12177,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 264 + "__id__": 251 }, "_enabled": true, "_color": { @@ -12848,7 +12195,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 261 + "__id__": 248 }, "_enabled": false, "alignMode": 1, @@ -12870,6 +12217,689 @@ "_originalHeight": 0, "_id": "871KMerHRL7KXw3qiIxdDj" }, + { + "__type__": "cc.Node", + "_name": "shop", + "_objFlags": 0, + "_parent": { + "__id__": 7 + }, + "_children": [ + { + "__id__": 256 + }, + { + "__id__": 258 + }, + { + "__id__": 260 + }, + { + "__id__": 265 + } + ], + "_active": true, + "_components": [ + { + "__id__": 266 + }, + { + "__id__": 268 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 300, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -364.359, + 693, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "ed8QHZwEpB/7mQ3jJK75n6" + }, + { + "__type__": "cc.Node", + "_name": "ditu00", + "_objFlags": 0, + "_parent": { + "__id__": 255 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 257 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 238, + "height": 64 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -2.124, + 4.568, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "a0NhyFR6JMYrrafDAcT+mG" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 256 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "6f89728c-4545-4929-86e5-be5e58463060" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "87a22385-255f-4b25-8aef-a30045d22be4" + }, + "_id": "baGP59Fc9Ki6dTjlXk/XAp" + }, + { + "__type__": "cc.Node", + "_name": "coins", + "_objFlags": 0, + "_parent": { + "__id__": 255 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 259 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 84, + "height": 95 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -114.967, + 6.074, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1.2 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "a8JH7FzwlLgLoubW/zwwzN" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 258 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "d22678f9-a73b-4c94-af07-62a134fd2d30" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "d5Ga1SVtFCHpW+F/d+M2Dx" + }, + { + "__type__": "cc.Node", + "_name": "add", + "_objFlags": 0, + "_parent": { + "__id__": 255 + }, + "_children": [ + { + "__id__": 261 + } + ], + "_active": true, + "_components": [ + { + "__id__": 263 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 220, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -1.283, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "b7OMa7UX1GApBuutHMzV4q" + }, + { + "__type__": "cc.Node", + "_name": "add", + "_objFlags": 0, + "_parent": { + "__id__": 260 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 262 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 38, + "height": 42 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -72.756, + -26.24, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "f1isnnRLZEfodXxw30geH/" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 261 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "ea27cfca-1cb3-4df0-92d9-5c62bca5d634" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "87a22385-255f-4b25-8aef-a30045d22be4" + }, + "_id": "b15b5gJJRFxpH/6bNeH1b0" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 260 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.2, + "clickEvents": [ + { + "__id__": 264 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 0, + "transition": 0, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 260 + }, + "_id": "5cndOFVONOdaMv+YrfkWsT" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 2 + }, + "component": "", + "_componentId": "80998T1AYNNRZdRxsVvXR65", + "handler": "openShop", + "customEventData": "" + }, + { + "__type__": "cc.Node", + "_name": "coin", + "_objFlags": 0, + "_parent": { + "__id__": 255 + }, + "_children": [], + "_active": true, + "_components": [], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 40, + 6.041, + 0, + 0, + 0, + 0, + 1, + 0.9, + 0.9, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "20iRJz5vNKjbgjTJR3p0SW" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 255 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.1, + "clickEvents": [ + { + "__id__": 267 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 255 + }, + "_id": "ca0xU7MF5KGqNrW5X0zL1O" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 2 + }, + "component": "", + "_componentId": "80998T1AYNNRZdRxsVvXR65", + "handler": "openShop", + "customEventData": "" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 255 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 1, + "_left": 0, + "_right": 0, + "_top": 217, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_id": "515XPaU0JN3Ygrgcra/g/9" + }, { "__type__": "cc.Widget", "_name": "", @@ -12907,14 +12937,14 @@ "_children": [], "_active": false, "_components": [ - { - "__id__": 270 - }, { "__id__": 271 }, { "__id__": 272 + }, + { + "__id__": 273 } ], "_prefab": null, @@ -12970,7 +13000,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 269 + "__id__": 270 }, "_enabled": true, "_materials": [ @@ -12990,7 +13020,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 269 + "__id__": 270 }, "_enabled": true, "alignMode": 1, @@ -13017,7 +13047,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 269 + "__id__": 270 }, "_enabled": true, "_id": "d9e8Y//+dGO5Tm2vNoQbwO" @@ -13031,31 +13061,31 @@ }, "_children": [ { - "__id__": 274 + "__id__": 275 }, { - "__id__": 277 + "__id__": 278 }, { - "__id__": 279 + "__id__": 280 }, { - "__id__": 283 + "__id__": 284 }, { - "__id__": 287 + "__id__": 288 }, { - "__id__": 291 + "__id__": 292 }, { - "__id__": 295 + "__id__": 296 } ], "_active": false, "_components": [ { - "__id__": 297 + "__id__": 298 } ], "_prefab": null, @@ -13111,16 +13141,16 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 273 + "__id__": 274 }, "_children": [], "_active": true, "_components": [ { - "__id__": 275 + "__id__": 276 }, { - "__id__": 276 + "__id__": 277 } ], "_prefab": null, @@ -13176,7 +13206,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 274 + "__id__": 275 }, "_enabled": true, "_materials": [ @@ -13208,7 +13238,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 274 + "__id__": 275 }, "_enabled": true, "_id": "0fS5t0zP5AdI0CPkmzwBv/" @@ -13218,13 +13248,13 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 273 + "__id__": 274 }, "_children": [], "_active": true, "_components": [ { - "__id__": 278 + "__id__": 279 } ], "_prefab": null, @@ -13280,7 +13310,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 277 + "__id__": 278 }, "_enabled": true, "_materials": [ @@ -13313,17 +13343,17 @@ "_name": "block1", "_objFlags": 0, "_parent": { - "__id__": 273 + "__id__": 274 }, "_children": [ { - "__id__": 280 + "__id__": 281 } ], "_active": true, "_components": [ { - "__id__": 282 + "__id__": 283 } ], "_prefab": null, @@ -13379,13 +13409,13 @@ "_name": "light", "_objFlags": 0, "_parent": { - "__id__": 279 + "__id__": 280 }, "_children": [], "_active": true, "_components": [ { - "__id__": 281 + "__id__": 282 } ], "_prefab": null, @@ -13441,7 +13471,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 280 + "__id__": 281 }, "_enabled": true, "_materials": [ @@ -13473,7 +13503,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 279 + "__id__": 280 }, "_enabled": true, "_materials": [ @@ -13505,17 +13535,17 @@ "_name": "block2", "_objFlags": 0, "_parent": { - "__id__": 273 + "__id__": 274 }, "_children": [ { - "__id__": 284 + "__id__": 285 } ], "_active": true, "_components": [ { - "__id__": 286 + "__id__": 287 } ], "_prefab": null, @@ -13571,13 +13601,13 @@ "_name": "light", "_objFlags": 0, "_parent": { - "__id__": 283 + "__id__": 284 }, "_children": [], "_active": true, "_components": [ { - "__id__": 285 + "__id__": 286 } ], "_prefab": null, @@ -13633,7 +13663,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 284 + "__id__": 285 }, "_enabled": true, "_materials": [ @@ -13665,7 +13695,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 283 + "__id__": 284 }, "_enabled": true, "_materials": [ @@ -13697,17 +13727,17 @@ "_name": "block3", "_objFlags": 0, "_parent": { - "__id__": 273 + "__id__": 274 }, "_children": [ { - "__id__": 288 + "__id__": 289 } ], "_active": true, "_components": [ { - "__id__": 290 + "__id__": 291 } ], "_prefab": null, @@ -13763,13 +13793,13 @@ "_name": "light", "_objFlags": 0, "_parent": { - "__id__": 287 + "__id__": 288 }, "_children": [], "_active": true, "_components": [ { - "__id__": 289 + "__id__": 290 } ], "_prefab": null, @@ -13825,7 +13855,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 288 + "__id__": 289 }, "_enabled": true, "_materials": [ @@ -13857,7 +13887,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 287 + "__id__": 288 }, "_enabled": true, "_materials": [ @@ -13889,17 +13919,17 @@ "_name": "block4", "_objFlags": 0, "_parent": { - "__id__": 273 + "__id__": 274 }, "_children": [ { - "__id__": 292 + "__id__": 293 } ], "_active": true, "_components": [ { - "__id__": 294 + "__id__": 295 } ], "_prefab": null, @@ -13955,13 +13985,13 @@ "_name": "light", "_objFlags": 0, "_parent": { - "__id__": 291 + "__id__": 292 }, "_children": [], "_active": true, "_components": [ { - "__id__": 293 + "__id__": 294 } ], "_prefab": null, @@ -14017,7 +14047,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 292 + "__id__": 293 }, "_enabled": true, "_materials": [ @@ -14049,7 +14079,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 291 + "__id__": 292 }, "_enabled": true, "_materials": [ @@ -14081,13 +14111,13 @@ "_name": "cat", "_objFlags": 0, "_parent": { - "__id__": 273 + "__id__": 274 }, "_children": [], "_active": true, "_components": [ { - "__id__": 296 + "__id__": 297 } ], "_prefab": null, @@ -14143,7 +14173,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 295 + "__id__": 296 }, "_enabled": true, "_materials": [ @@ -14175,7 +14205,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 273 + "__id__": 274 }, "_enabled": true, "alignMode": 1, @@ -14206,16 +14236,16 @@ }, "_children": [ { - "__id__": 299 + "__id__": 300 } ], "_active": false, "_components": [ { - "__id__": 302 + "__id__": 303 }, { - "__id__": 303 + "__id__": 304 } ], "_prefab": null, @@ -14271,16 +14301,16 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 298 + "__id__": 299 }, "_children": [], "_active": true, "_components": [ { - "__id__": 300 + "__id__": 301 }, { - "__id__": 301 + "__id__": 302 } ], "_prefab": null, @@ -14336,7 +14366,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 299 + "__id__": 300 }, "_enabled": true, "_materials": [ @@ -14368,7 +14398,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 299 + "__id__": 300 }, "_enabled": true, "_id": "4fwjz1lnFLD45L1lqUY038" @@ -14378,7 +14408,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 298 + "__id__": 299 }, "_enabled": true, "_materials": [ @@ -14420,7 +14450,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 298 + "__id__": 299 }, "_enabled": false, "_id": "00qpMLeBFNhYRX9r3QZvyP" @@ -14538,16 +14568,16 @@ "label": null, "text": "hello", "freeze": { - "__id__": 80 + "__id__": 67 }, "hammer": { - "__id__": 116 + "__id__": 103 }, "magic_wand": { - "__id__": 135 + "__id__": 122 }, "pause": { - "__id__": 213 + "__id__": 200 }, "level": null, "timeCoin": null, @@ -14569,7 +14599,7 @@ }, "messageNode": null, "tipPanel": { - "__id__": 304 + "__id__": 305 }, "_id": "4cjBjPtcBO05zIQupw5luh" }, @@ -14594,7 +14624,7 @@ "_active": true, "_components": [ { - "__id__": 310 + "__id__": 311 } ], "_prefab": null, @@ -14650,7 +14680,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 309 + "__id__": 310 }, "_enabled": true, "_materials": [ diff --git a/assets/Scene/HomeScene.fire b/assets/Scene/HomeScene.fire index 524317a..0f1ec75 100644 --- a/assets/Scene/HomeScene.fire +++ b/assets/Scene/HomeScene.fire @@ -2898,8 +2898,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 139, - "height": 122 + "width": 292, + "height": 247 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2917,8 +2917,8 @@ 0, 0, 1, - 0.72, - 0.72, + 0.35, + 0.35, 1 ] }, @@ -2954,7 +2954,7 @@ "__uuid__": "419e6dd8-8ab5-4910-bf94-b82afe18191b" }, "_type": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillType": 0, "_fillCenter": { "__type__": "cc.Vec2", @@ -26238,9 +26238,9 @@ "vibrate": { "__id__": 580 }, - "exit": null, "win": null, "win2": null, + "giveUpFrames": [], "_id": "a9bjcHbyRE1bK9nCTiACma" }, { diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index a5aae85..db865e9 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -1167,7 +1167,8 @@ export default class MapConroler extends cc.Component { // this.node.getChildByName("Wall").zIndex = 10; this.timeLabel = this.node.parent.getChildByName("Top").getChildByName("time"); this.levelLabel = this.node.parent.getChildByName("Top").getChildByName("level"); - this.coin = this.node.parent.getChildByName("Top").getChildByName("shop").getChildByName("coin"); + const shop = this.SceneManager.ensureGameShop(); + this.coin = shop && shop.getChildByName("coin"); this.timeNumber = cc.fx.GameConfig.LEVEL_INFO[0].time; // console.log("当前关卡时间", this.timeNumber); @@ -6968,12 +6969,18 @@ export default class MapConroler extends cc.Component { // topNode.scale = gmScale; if (topNode) { if (gmScale == 0.7) { + const shop = this.SceneManager.ensureGameShop(); // 修改Widget的top属性 const widget = topNode.getComponent(cc.Widget); if (widget) { widget.top -= 80; // 减去偏移量使节点向上移动 widget.updateAlignment(); // 强制更新对齐 } + const shopWidget = shop && shop.getComponent(cc.Widget); + if (shopWidget) { + shopWidget.top -= 80; + shopWidget.updateAlignment(); + } this.node.y = this.node.y + 40; } else { diff --git a/assets/Script/SceneManager.ts b/assets/Script/SceneManager.ts index 656f6b4..81cb101 100644 --- a/assets/Script/SceneManager.ts +++ b/assets/Script/SceneManager.ts @@ -85,6 +85,32 @@ export default class SceneManager extends cc.Component { return loading; } + ensureGameShop(): cc.Node { + const game = this.node && this.node.getChildByName("Game"); + if (!game) return null; + let shop = game.getChildByName("shop"); + // 编辑器仍使用旧场景时,同步迁移顶部入口,避免新脚本与旧层级不一致。 + if (!shop) { + const top = cc.find("GameNode/Top", game); + shop = top && top.getChildByName("shop"); + if (!shop) return null; + const topWidget = top.getComponent(cc.Widget); + if (topWidget) topWidget.updateAlignment(); + const position = game.convertToNodeSpaceAR(shop.convertToWorldSpaceAR(cc.v2(0, 0))); + shop.parent = game; + shop.setPosition(position); + } + if (!shop.getComponent(cc.Widget)) { + const widget = shop.addComponent(cc.Widget); + widget.isAlignTop = true; + widget.top = game.height * (1 - game.anchorY) - shop.y + - shop.height * (1 - shop.anchorY) * shop.scaleY; + widget.alignMode = cc.Widget.AlignMode.ON_WINDOW_RESIZE; + } + shop.zIndex = cc.macro.MAX_ZINDEX - 1; + return shop; + } + /** 动态弹窗加载期间使用;层级高于业务弹窗,低于 Loading 和失败重试层。 */ private ensureDynamicPopupIntercept(): cc.Node { if (!this.node || !cc.isValid(this.node)) return null; @@ -853,6 +879,7 @@ export default class SceneManager extends cc.Component { this.popupBundleWarmupStarted = false; this.refreshGameplayInfo(); this.ensureLoadingOnTop(); + if (!this.ensureGameShop()) cc.error("GameScene 缺少顶部商店入口 Game/shop"); const intercept = this.ensureDynamicPopupIntercept(); if (intercept) intercept.active = false; this.winLevelName = this.resolveWinLevelName(); @@ -974,10 +1001,7 @@ export default class SceneManager extends cc.Component { if (!this.node || !cc.isValid(this.node)) { return null; } - const game = this.node.getChildByName("Game"); - const gameNode = game && game.getChildByName("GameNode"); - const top = gameNode && (gameNode.getChildByName("top") || gameNode.getChildByName("Top")); - const shop = top && top.getChildByName("shop"); + const shop = this.ensureGameShop(); return shop && shop.getChildByName("coins"); } //更新关卡获得金币 @@ -1023,7 +1047,7 @@ export default class SceneManager extends cc.Component { } const targetNode = this.getWinCoinFlyTarget(); if (!targetNode || !cc.isValid(targetNode)) { - console.warn("playWinCoinFly skip: target GameNode/top/shop/coins missing"); + console.warn("playWinCoinFly skip: target Game/shop/coins missing"); this.updateGameCoinDisplay(); return; } diff --git a/assets/Script/module/Config/GameConfig.ts b/assets/Script/module/Config/GameConfig.ts index c9c6657..9fede95 100644 --- a/assets/Script/module/Config/GameConfig.ts +++ b/assets/Script/module/Config/GameConfig.ts @@ -736,7 +736,7 @@ export class GameConfig { vibrateOpen: true, //震动 coinnum: 0, //每局的金币数 paid_user: false, //是否是付费用户 - version: "1.0.62", //版本号 + version: "1.0.64", //版本号 shushu_DistinctId: "", //数数访客ID shushu_AccountId: "", //数数账号ID uid: "", //用户和后端唯一id diff --git a/assets/action_bundle/prefab/dailyQuests.prefab b/assets/action_bundle/prefab/dailyQuests.prefab index 64a80a4..e11d209 100644 --- a/assets/action_bundle/prefab/dailyQuests.prefab +++ b/assets/action_bundle/prefab/dailyQuests.prefab @@ -4524,8 +4524,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 82, - "height": 72 + "width": 292, + "height": 247 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4543,8 +4543,8 @@ 0, 0, 1, - 1.1, - 1.1, + 0.3, + 0.3, 1 ] }, @@ -4577,7 +4577,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "48dbc128-13f7-471a-a97f-da8a0de98e2e" + "__uuid__": "419e6dd8-8ab5-4910-bf94-b82afe18191b" }, "_type": 0, "_sizeMode": 1, @@ -4590,9 +4590,7 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "2e466cd1-95aa-4e3c-bb69-759c50404dd1" - }, + "_atlas": null, "_id": "" }, { diff --git a/assets/action_bundle/prefab/newbieGift.prefab b/assets/action_bundle/prefab/newbieGift.prefab index 540c51d..a37c510 100644 --- a/assets/action_bundle/prefab/newbieGift.prefab +++ b/assets/action_bundle/prefab/newbieGift.prefab @@ -3654,8 +3654,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 139, - "height": 122 + "width": 292, + "height": 247 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3673,8 +3673,8 @@ 0, 0, 1, - 1.2, - 1.2, + 0.6, + 0.6, 1 ] }, @@ -3780,8 +3780,8 @@ 0, 0, 1, - 1, - 1, + 0.9, + 0.9, 1 ] }, @@ -3882,15 +3882,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -14.248, + -18.514, -56.041, 0, 0, 0, 0, 1, - 1, - 1, + 0.9, + 0.9, 1 ] }, @@ -3991,7 +3991,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 59.038, + 52.876, -56.041, 0, 0, diff --git a/assets/lose/script/LosePanel.ts b/assets/lose/script/LosePanel.ts index 1933706..7494426 100644 --- a/assets/lose/script/LosePanel.ts +++ b/assets/lose/script/LosePanel.ts @@ -31,7 +31,7 @@ export default class LosePanel extends cc.Component { const affordable = cc.fx.GameConfig.GM_INFO.coin >= this.reviveCost; if (affordable === this.reviveAffordable) return; this.reviveAffordable = affordable; - const color = affordable ? cc.color(255, 215, 0) : cc.color(255, 64, 64); + const color = affordable ? cc.Color.WHITE : cc.color(255, 64, 64); this.reviveCoin.children.forEach(digit => digit.color = color); } diff --git a/assets/lose/texture/title_hammer.png.meta b/assets/lose/texture/title_hammer.png.meta index 9e6be57..5c64615 100644 --- a/assets/lose/texture/title_hammer.png.meta +++ b/assets/lose/texture/title_hammer.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 441, - "height": 76, + "width": 383, + "height": 65, "platformSettings": {}, "subMetas": { "title_hammer": { diff --git a/assets/pause/texture.meta b/assets/pause/texture.meta deleted file mode 100644 index 0cfecc3..0000000 --- a/assets/pause/texture.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.3", - "uuid": "7a3a4a1a-e1d9-45af-bbbe-309e82708822", - "importer": "folder", - "isBundle": false, - "bundleName": "", - "priority": 1, - "compressionType": {}, - "optimizeHotUpdate": {}, - "inlineSpriteFrames": {}, - "isRemoteBundle": {}, - "subMetas": {} -} \ No newline at end of file diff --git a/assets/pause/title_hammer.png.meta b/assets/pause/title_hammer.png.meta index 17633bf..096eda6 100644 --- a/assets/pause/title_hammer.png.meta +++ b/assets/pause/title_hammer.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 383, - "height": 65, + "width": 441, + "height": 76, "platformSettings": {}, "subMetas": { "title_hammer": { diff --git a/assets/res/public/skyLine.png.meta b/assets/res/public/skyLine.png.meta index e09a741..7c381b6 100644 --- a/assets/res/public/skyLine.png.meta +++ b/assets/res/public/skyLine.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 139, - "height": 123, + "width": 292, + "height": 247, "platformSettings": {}, "subMetas": { "skyLine": { diff --git a/assets/shop/prefab/shop.prefab b/assets/shop/prefab/shop.prefab index 039dd2c..3df41dc 100644 --- a/assets/shop/prefab/shop.prefab +++ b/assets/shop/prefab/shop.prefab @@ -19269,8 +19269,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 139, - "height": 122 + "width": 292, + "height": 247 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -19281,15 +19281,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -109.091, + -96.229, 0.027, 0, 0, 0, 0, 1, - 0.72, - 0.72, + 0.35, + 0.35, 1 ] }, diff --git a/server/laf-cloud/functions/login.ts b/server/laf-cloud/functions/login.ts index e7e7a77..1802361 100644 --- a/server/laf-cloud/functions/login.ts +++ b/server/laf-cloud/functions/login.ts @@ -34,10 +34,10 @@ export default async function (ctx: FunctionContext) { const from = body.from; const supportsWucaiMigration = Number(body.wucai_capability) >= 1; let dbname = "users"; - const gameName = body.gameName; - if (gameName == "iaa") { - dbname = "usersAd"; - } + // const gameName = body.gameName; + // if (gameName == "iaa") { + // dbname = "usersAd"; + // } if (from === "wucai" && dbname !== "users") { return wucaiLoginFail("WUCAI_UNSUPPORTED_GAME", "五彩账号迁移仅支持主用户库"); } @@ -96,6 +96,7 @@ export default async function (ctx: FunctionContext) { userPowerTime: migratedUser?.userPowerTime ?? 0, monthCardReward: migratedUser?.monthCardReward ?? 0, monthCardTime: migratedUser?.monthCardTime ?? 0, + miniProgramWelfare: { favorite: false, desktop: false }, rebornGiftCount: 0, rebornGiftTime: 0, useravatar: Math.floor(Math.random() * 4) + "", @@ -303,6 +304,11 @@ export default async function (ctx: FunctionContext) { userData.shareLv = []; } userData.careerAmount = userData.careerAmount || 0; + // 老用户缺少字段或某一项时按未领取返回,不写回整对象,避免覆盖并发领取。 + userData.miniProgramWelfare = { + favorite: userData.miniProgramWelfare?.favorite === true, + desktop: userData.miniProgramWelfare?.desktop === true, + }; if (dbname === "users") { userData.abTests = abTests; } @@ -379,29 +385,6 @@ const getClientIp = (req) => { ); }; -const propName = { - "金币包1": "gold_1", - "金币包2": "gold_2", - "金币包3": "gold_3", - "金币包4": "gold_4", - "金币包5": "gold_5", - "金币包6": "gold_6", - "无限体力组合包1": "unlimited_health_bundle_1", - "无限体力组合包2": "unlimited_health_bundle_2", - "无限体力组合包3": "unlimited_health_bundle_3", - "局内购买冻结": "freeze_in_game", - "局内购买锤子": "hammer_in_game", - "局内购买魔棒": "wand_in_gamerefill", - "补满体力": "health", - "宝藏1": "jungle_treasure_1", - "宝藏2": "jungle_treasure_2", - "宝藏3": "jungle_treasure_3", - "宝藏4": "jungle_treasure_4", - "宝藏5": "jungle_treasure_5", - "宝藏6": "jungle_treasure_6", - "宝藏7": "jungle_treasure_7", - "宝藏8": "jungle_treasure_8" -}; async function getWXOpenId(code, dbname) { let appid = process.env.WX_MINIGAME_APP_ID; @@ -589,7 +572,7 @@ async function sign(outTradeNo, nonceStr, timestamp) { // 更新签名内容 sign.update(data); // 获取存储桶 - const bucket = cloud.storage.bucket('j3k323ol-colorblock-oss'); + const bucket = cloud.storage.bucket(process.env.WX_PAY_PRIVATE_KEY_BUCKET); // 获取文件列表 const res = await bucket.readFile('apiclient_key.pem'); const privateKeyPem = await res.Body.transformToString(); diff --git a/server/laf-cloud/functions/signInActivityInfo.ts b/server/laf-cloud/functions/signInActivityInfo.ts index ea0364e..f4abd43 100644 --- a/server/laf-cloud/functions/signInActivityInfo.ts +++ b/server/laf-cloud/functions/signInActivityInfo.ts @@ -9,7 +9,6 @@ import { getSignInClaims, getSignInConfig, getUserSignInLevel, - getUserSignInTriggerLevel, normalizeSignInState, } from "@/SignInActivity"; @@ -40,8 +39,7 @@ export default async function (ctx: FunctionContext) { if (!config) { return { code: 0, data: null, msg: "签到活动配置不存在或配置无效" }; } - const triggerLevel = getUserSignInTriggerLevel(user, config); - const triggerReached = getUserSignInLevel(user) >= triggerLevel; + const triggerReached = getUserSignInLevel(user) >= Number(config.triggerLevel); if (!state && !triggerReached) { return { code: 1, data: false, msg: "未达到签到活动开启关卡" }; } @@ -80,7 +78,7 @@ export default async function (ctx: FunctionContext) { serverNow: now, activityId: config.activityId, status, - triggerLevel, + triggerLevel: Number(config.triggerLevel), triggerReached, startAt: state.startAt, endAt: state.endAt, diff --git a/server/laf-cloud/functions/wx/KeFuInfo.ts b/server/laf-cloud/functions/wx/KeFuInfo.ts index 5896029..baa6d9c 100644 --- a/server/laf-cloud/functions/wx/KeFuInfo.ts +++ b/server/laf-cloud/functions/wx/KeFuInfo.ts @@ -68,7 +68,7 @@ async function sign(nonceStr, timestamp, body) { // 更新签名内容 sign.update(data); // 获取存储桶 - const bucket = cloud.storage.bucket('j3k323ol-colorblock-oss'); + const bucket = cloud.storage.bucket(process.env.WX_PAY_PRIVATE_KEY_BUCKET); // 获取文件列表 const res = await bucket.readFile('apiclient_key.pem'); const privateKeyPem = await res.Body.transformToString(); @@ -88,7 +88,7 @@ async function frontsign(data) { // 更新签名内容 sign.update(data); // 获取存储桶 - const bucket = cloud.storage.bucket('j3k323ol-colorblock-oss'); + const bucket = cloud.storage.bucket(process.env.WX_PAY_PRIVATE_KEY_BUCKET); // 获取文件列表 const res = await bucket.readFile('apiclient_key.pem'); const privateKeyPem = await res.Body.transformToString(); diff --git a/server/laf-cloud/functions/wx/getOrderReward.ts b/server/laf-cloud/functions/wx/getOrderReward.ts index 106acc8..ead204f 100644 --- a/server/laf-cloud/functions/wx/getOrderReward.ts +++ b/server/laf-cloud/functions/wx/getOrderReward.ts @@ -10,6 +10,11 @@ export default async function (ctx: FunctionContext) { if (!order.data) { return { code: 0, data: null, msg: "未获取到充值订单" }; } + // 月卡由 monthlyCard 在成功加时后完成订单,避免两次请求之间断线导致无法补发。 + if (isUpgradeOrder(order.data)) return { code: 0, msg: '请在新版战令中完成发放' }; + if (order.data.itemid !== "month_Card") { + await db.collection("order").where({ outTradeNo: outTradeNo }).update({ state: 2, getTime: new Date(Date.now() + 8 * 3600000) }); + } if (/^reborn_Gift(?:_[2-5])?$/.test(order.data.itemid)) { const user = await db.collection("users").where({ _id: ctx.body.uid }).getOne(); if (!user.data || user.data.openid !== order.data.openid) { @@ -19,10 +24,5 @@ export default async function (ctx: FunctionContext) { return { code: 0, data: null, msg: "充值尚未成功" }; } } - // 月卡由 monthlyCard 在成功加时后完成订单,避免两次请求之间断线导致无法补发。 - if (isUpgradeOrder(order.data)) return { code: 0, msg: '请在新版战令中完成发放' }; - if (order.data.itemid !== "month_Card") { - await db.collection("order").where({ outTradeNo: outTradeNo }).update({ state: 2, getTime: new Date(Date.now() + 8 * 3600000) }); - } return { code: 1, data: "ok", msg: "成功" }; } diff --git a/tools/test-game-shop.cjs b/tools/test-game-shop.cjs new file mode 100644 index 0000000..5d5b758 --- /dev/null +++ b/tools/test-game-shop.cjs @@ -0,0 +1,98 @@ +const test = require('node:test'); +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const { loadMembers } = require('./new-player-ab-test-support.cjs'); + +function fixture(legacy = false) { + const data = JSON.parse(fs.readFileSync('assets/Scene/GameScene.fire', 'utf8')); + class Widget { + static AlignMode = { ON_WINDOW_RESIZE: 1 }; + updateAlignment() { + const node = this.node; + node.y = node.parent.height * (1 - node.parent.anchorY) - this.top + - node.height * (1 - node.anchorY) * node.scaleY; + } + } + const nodes = data.map(n => n.__type__ === 'cc.Node' ? { + name: n._name, children: [], components: [], + x: n._trs.array[0], y: n._trs.array[1], scaleY: n._trs.array[8], + height: n._contentSize.height, anchorY: n._anchorPoint.y, + get parent() { return this._parent; }, + set parent(value) { + if (this._parent) this._parent.children = this._parent.children.filter(n => n !== this); + this._parent = value; + value.children.push(this); + }, + getChildByName(name) { return this.children.find(n => n.name === name) || null; }, + getComponent(type) { return this.components.find(c => c instanceof type) || null; }, + addComponent(type) { const c = new type(); c.node = this; this.components.push(c); return c; }, + setPosition(p) { this.x = p.x; this.y = p.y; }, + convertToWorldSpaceAR(p) { + const result = { x: p.x + this.x, y: p.y + this.y }; + return this.parent ? this.parent.convertToWorldSpaceAR(result) : result; + }, + convertToNodeSpaceAR(p) { + const origin = this.convertToWorldSpaceAR({ x: 0, y: 0 }); + return { x: p.x - origin.x, y: p.y - origin.y }; + }, + } : null); + nodes.forEach((node, i) => { + if (!node) return; + if (nodes[data[i]._parent?.__id__]) node.parent = nodes[data[i]._parent.__id__]; + for (const ref of data[i]._components) { + const c = data[ref.__id__]; + if (c.__type__ === 'cc.Widget') Object.assign(node.addComponent(Widget), { top: c._top }); + } + }); + const canvas = nodes.find(n => n?.name === 'Canvas'); + const game = canvas.getChildByName('Game'); + const gameNode = game.getChildByName('GameNode'); + const top = gameNode.getChildByName('Top'); + const shop = game.getChildByName('shop'); + top.getComponent(Widget).updateAlignment(); + if (legacy) { + shop.parent = top; + shop.y = -67.741; + shop.components = []; + } else if (shop.getComponent(Widget)) shop.getComponent(Widget).updateAlignment(); + const cc = { + Widget, macro: { MAX_ZINDEX: 32767 }, isValid: node => !!node, + v2: (x, y) => ({ x, y }), + find: (path, root) => path.split('/').reduce((node, name) => node && node.getChildByName(name), root), + }; + const Manager = loadMembers('assets/Script/SceneManager.ts', ['ensureGameShop', 'getWinCoinFlyTarget'], { cc }); + return { manager: Object.assign(new Manager(), { node: canvas }), game, top, shop, Widget }; +} + +for (const legacy of [false, true]) { + test(`${legacy ? 'old' : 'new'} scene keeps Shop above Lose with valid coin children and unchanged position`, () => { + for (const height of [1280, 1920, 2400]) { + const { manager, game, shop, top, Widget } = fixture(legacy); + const before = shop.convertToWorldSpaceAR({ x: 0, y: 0 }); + assert.equal(manager.ensureGameShop(), shop); + assert.equal(shop.parent, game); + assert.equal(top.getChildByName('shop'), null); + assert.equal(shop.zIndex, 32766); + shop.getComponent(Widget).updateAlignment(); + assert.deepEqual(shop.convertToWorldSpaceAR({ x: 0, y: 0 }), before); + assert.ok(shop.getChildByName('coin')); + assert.equal(manager.getWinCoinFlyTarget(), shop.getChildByName('coins')); + assert.equal(manager.ensureGameShop(), shop); + assert.equal(shop.components.filter(c => c instanceof Widget).length, 1); + assert.equal(game.children.filter(n => n === shop).length, 1); + game.height = height; + shop.getComponent(Widget).updateAlignment(); + assert.ok(Math.abs(shop.y - (height / 2 - 297.741)) < 1e-9); + } + }); +} + +test('missing Shop returns null instead of throwing while setting zIndex or resolving coins', () => { + const { manager, game, shop } = fixture(); + game.children = game.children.filter(n => n !== shop); + assert.equal(manager.ensureGameShop(), null); + assert.equal(manager.getWinCoinFlyTarget(), null); + manager.node = null; + assert.equal(manager.ensureGameShop(), null); + assert.equal(manager.getWinCoinFlyTarget(), null); +});