Commit 8ab90928 authored by 李维's avatar 李维

Bug fix

parent c68428e2
...@@ -1010,8 +1010,8 @@ ...@@ -1010,8 +1010,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
111.948, 116.113,
205.072, 198.131,
0, 0,
0, 0,
0, 0,
...@@ -1117,8 +1117,8 @@ ...@@ -1117,8 +1117,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
28.802, 30.909,
236.213, 237.422,
0, 0,
0, 0,
0, 0,
...@@ -1224,8 +1224,8 @@ ...@@ -1224,8 +1224,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-58.864, -66.36,
227.635, 222.033,
0, 0,
0, 0,
0, 0,
...@@ -1331,8 +1331,8 @@ ...@@ -1331,8 +1331,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-131.298, -132.904,
169.739, 165.03,
0, 0,
0, 0,
0, 0,
...@@ -1438,8 +1438,8 @@ ...@@ -1438,8 +1438,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-169.21, -167.43,
89.51, 84.561,
0, 0,
0, 0,
0, 0,
...@@ -1545,8 +1545,8 @@ ...@@ -1545,8 +1545,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-183.75, -178.276,
3.766, -5.607,
0, 0,
0, 0,
0, 0,
...@@ -1652,8 +1652,8 @@ ...@@ -1652,8 +1652,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-166.062, -156.394,
-91.077, -89.839,
0, 0,
0, 0,
0, 0,
...@@ -1759,8 +1759,8 @@ ...@@ -1759,8 +1759,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-110.847, -117.589,
-175.047, -168.304,
0, 0,
0, 0,
0, 0,
...@@ -1866,8 +1866,8 @@ ...@@ -1866,8 +1866,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-33.521, -41.949,
-218.434, -215.905,
0, 0,
0, 0,
0, 0,
...@@ -1973,8 +1973,8 @@ ...@@ -1973,8 +1973,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
51.548, 53.234,
-217.514, -218.357,
0, 0,
0, 0,
0, 0,
......
...@@ -459,8 +459,8 @@ ...@@ -459,8 +459,8 @@
"_strokeColor": { "_strokeColor": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
"g": 105, "g": 208,
"b": 158, "b": 47,
"a": 255 "a": 255
}, },
"_lineJoin": 1, "_lineJoin": 1,
...@@ -468,8 +468,8 @@ ...@@ -468,8 +468,8 @@
"_fillColor": { "_fillColor": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
"g": 105, "g": 208,
"b": 158, "b": 47,
"a": 255 "a": 255
}, },
"_miterLimit": 60, "_miterLimit": 60,
......
...@@ -27,17 +27,17 @@ ...@@ -27,17 +27,17 @@
"__id__": 20 "__id__": 20
}, },
{ {
"__id__": 91 "__id__": 94
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 104
} }
], ],
"_prefab": { "_prefab": {
"__id__": 102 "__id__": 105
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -810,12 +810,15 @@ ...@@ -810,12 +810,15 @@
}, },
{ {
"__id__": 87 "__id__": 87
},
{
"__id__": 90
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 90 "__id__": 93
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3043,8 +3046,8 @@ ...@@ -3043,8 +3046,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
59.104, 54.822,
-118.396, -115.541,
0, 0,
0, 0,
0, 0,
...@@ -3150,8 +3153,8 @@ ...@@ -3150,8 +3153,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
140.483, 101.922,
-207.054, -166.924,
0, 0,
0, 0,
0, 0,
...@@ -3215,7 +3218,7 @@ ...@@ -3215,7 +3218,7 @@
"asset": { "asset": {
"__uuid__": "b4c5d143-107d-475f-b4ad-5a33353cf432" "__uuid__": "b4c5d143-107d-475f-b4ad-5a33353cf432"
}, },
"fileId": "c7V/Z6N0dMg7oeIBEPHi/J", "fileId": "83hiS0wNtG0p9ifFrILLbR",
"sync": false "sync": false
}, },
{ {
...@@ -3253,6 +3256,113 @@ ...@@ -3253,6 +3256,113 @@
"x": 0.5, "x": 0.5,
"y": 0.5 "y": 0.5
}, },
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
146.906,
-212.049,
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": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "b4c5d143-107d-475f-b4ad-5a33353cf432"
},
"fileId": "c7V/Z6N0dMg7oeIBEPHi/J",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "NodePos_1_4",
"_objFlags": 0,
"_parent": {
"__id__": 20
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 91
}
],
"_prefab": {
"__id__": 92
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": { "_trs": {
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
...@@ -3287,7 +3397,7 @@ ...@@ -3287,7 +3397,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 87 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3345,17 +3455,17 @@ ...@@ -3345,17 +3455,17 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 92 "__id__": 95
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 102
} }
], ],
"_prefab": { "_prefab": {
"__id__": 100 "__id__": 103
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3409,24 +3519,24 @@ ...@@ -3409,24 +3519,24 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 91 "__id__": 94
}, },
"_children": [ "_children": [
{ {
"__id__": 93 "__id__": 96
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 99
}, },
{ {
"__id__": 97 "__id__": 100
} }
], ],
"_prefab": { "_prefab": {
"__id__": 98 "__id__": 101
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3480,17 +3590,17 @@ ...@@ -3480,17 +3590,17 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 92 "__id__": 95
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 94 "__id__": 97
} }
], ],
"_prefab": { "_prefab": {
"__id__": 95 "__id__": 98
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3544,7 +3654,7 @@ ...@@ -3544,7 +3654,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3589,7 +3699,7 @@ ...@@ -3589,7 +3699,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 95
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3621,7 +3731,7 @@ ...@@ -3621,7 +3731,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 95
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -3659,7 +3769,7 @@ ...@@ -3659,7 +3769,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 91 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3732,7 +3842,7 @@ ...@@ -3732,7 +3842,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 92 "__id__": 95
}, },
"_id": "" "_id": ""
}, },
......
...@@ -1627,8 +1627,8 @@ ...@@ -1627,8 +1627,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
45.486, 47.486,
-231.864, -233.864,
0, 0,
0, 0,
0, 0,
...@@ -1734,8 +1734,8 @@ ...@@ -1734,8 +1734,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
114.461, 118.461,
-181.283, -183.283,
0, 0,
0, 0,
0, 0,
...@@ -1841,7 +1841,7 @@ ...@@ -1841,7 +1841,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
151.248, 154.248,
-119.206, -119.206,
0, 0,
0, 0,
...@@ -1948,7 +1948,7 @@ ...@@ -1948,7 +1948,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
153.607, 156.607,
-55, -55,
0, 0,
0, 0,
...@@ -2055,7 +2055,7 @@ ...@@ -2055,7 +2055,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
153.607, 156.607,
22, 22,
0, 0,
0, 0,
...@@ -2162,7 +2162,7 @@ ...@@ -2162,7 +2162,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
153.607, 155.607,
100, 100,
0, 0,
0, 0,
...@@ -2269,7 +2269,7 @@ ...@@ -2269,7 +2269,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
153.607, 155.607,
177, 177,
0, 0,
0, 0,
...@@ -2376,7 +2376,7 @@ ...@@ -2376,7 +2376,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
153.607, 155.607,
255, 255,
0, 0,
0, 0,
......
...@@ -894,8 +894,8 @@ ...@@ -894,8 +894,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-177.707, -175.707,
258.554, 260.554,
0, 0,
0, 0,
0, 0,
...@@ -1001,8 +1001,8 @@ ...@@ -1001,8 +1001,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-147.843, -146.843,
207.733, 209.733,
0, 0,
0, 0,
0, 0,
...@@ -1108,8 +1108,8 @@ ...@@ -1108,8 +1108,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-113.144, -111.144,
155.508, 157.508,
0, 0,
0, 0,
0, 0,
...@@ -1215,8 +1215,8 @@ ...@@ -1215,8 +1215,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-76.866, -74.866,
103.214, 105.214,
0, 0,
0, 0,
0, 0,
...@@ -1322,8 +1322,8 @@ ...@@ -1322,8 +1322,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-38.145, -36.145,
49.464, 51.464,
0, 0,
0, 0,
0, 0,
...@@ -1429,8 +1429,8 @@ ...@@ -1429,8 +1429,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
6.974, 8.974,
-10.615, -8.615,
0, 0,
0, 0,
0, 0,
...@@ -1536,8 +1536,8 @@ ...@@ -1536,8 +1536,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
49.022, 51.022,
-70.852, -68.852,
0, 0,
0, 0,
0, 0,
...@@ -1643,8 +1643,8 @@ ...@@ -1643,8 +1643,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
93.187, 95.187,
-129.856, -127.856,
0, 0,
0, 0,
0, 0,
...@@ -1750,8 +1750,8 @@ ...@@ -1750,8 +1750,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
133.489, 135.489,
-188.281, -186.281,
0, 0,
0, 0,
0, 0,
...@@ -1857,8 +1857,8 @@ ...@@ -1857,8 +1857,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
180.931, 182.931,
-251.003, -249.003,
0, 0,
0, 0,
0, 0,
...@@ -1964,8 +1964,8 @@ ...@@ -1964,8 +1964,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
180.924, 178.924,
254.99, 256.99,
0, 0,
0, 0,
0, 0,
...@@ -2071,8 +2071,8 @@ ...@@ -2071,8 +2071,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
142.561, 140.561,
200.54, 202.54,
0, 0,
0, 0,
0, 0,
...@@ -2178,8 +2178,8 @@ ...@@ -2178,8 +2178,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
105.436, 103.436,
148.565, 150.565,
0, 0,
0, 0,
0, 0,
...@@ -2285,8 +2285,8 @@ ...@@ -2285,8 +2285,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
66.455, 64.455,
94.114, 96.114,
0, 0,
0, 0,
0, 0,
...@@ -2392,8 +2392,8 @@ ...@@ -2392,8 +2392,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
29.262, 27.262,
41.941, 43.941,
0, 0,
0, 0,
0, 0,
...@@ -2499,8 +2499,8 @@ ...@@ -2499,8 +2499,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-18.153, -21.153,
-28.775, -26.775,
0, 0,
0, 0,
0, 0,
...@@ -2606,8 +2606,8 @@ ...@@ -2606,8 +2606,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-60.06, -62.06,
-85.393, -83.393,
0, 0,
0, 0,
0, 0,
...@@ -2713,8 +2713,8 @@ ...@@ -2713,8 +2713,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-100.348, -102.348,
-142.602, -140.602,
0, 0,
0, 0,
0, 0,
...@@ -2820,8 +2820,8 @@ ...@@ -2820,8 +2820,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-139.506, -141.506,
-196.13, -194.13,
0, 0,
0, 0,
0, 0,
...@@ -2927,8 +2927,8 @@ ...@@ -2927,8 +2927,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-183.028, -185.028,
-251.229, -249.229,
0, 0,
0, 0,
0, 0,
......
...@@ -891,8 +891,8 @@ ...@@ -891,8 +891,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
147.753, 138.5,
-48.682, -45.084,
0, 0,
0, 0,
0, 0,
...@@ -998,8 +998,8 @@ ...@@ -998,8 +998,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
92.059, 89.489,
32.601, 34.657,
0, 0,
0, 0,
0, 0,
...@@ -1747,8 +1747,8 @@ ...@@ -1747,8 +1747,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
95.059, 89.621,
-200.399, -192.544,
0, 0,
0, 0,
0, 0,
...@@ -1854,8 +1854,8 @@ ...@@ -1854,8 +1854,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
138.756, 138.152,
-131.901, -124.046,
0, 0,
0, 0,
0, 0,
......
...@@ -351,8 +351,8 @@ ...@@ -351,8 +351,8 @@
"_strokeColor": { "_strokeColor": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
"g": 105, "g": 208,
"b": 158, "b": 47,
"a": 255 "a": 255
}, },
"_lineJoin": 1, "_lineJoin": 1,
...@@ -360,8 +360,8 @@ ...@@ -360,8 +360,8 @@
"_fillColor": { "_fillColor": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
"g": 105, "g": 208,
"b": 158, "b": 47,
"a": 255 "a": 255
}, },
"_miterLimit": 60, "_miterLimit": 60,
...@@ -459,8 +459,8 @@ ...@@ -459,8 +459,8 @@
"_strokeColor": { "_strokeColor": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
"g": 105, "g": 208,
"b": 158, "b": 47,
"a": 255 "a": 255
}, },
"_lineJoin": 1, "_lineJoin": 1,
...@@ -468,8 +468,8 @@ ...@@ -468,8 +468,8 @@
"_fillColor": { "_fillColor": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
"g": 105, "g": 208,
"b": 158, "b": 47,
"a": 255 "a": 255
}, },
"_miterLimit": 60, "_miterLimit": 60,
......
...@@ -27,17 +27,17 @@ ...@@ -27,17 +27,17 @@
"__id__": 20 "__id__": 20
}, },
{ {
"__id__": 76 "__id__": 82
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 86 "__id__": 92
} }
], ],
"_prefab": { "_prefab": {
"__id__": 87 "__id__": 93
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -795,12 +795,18 @@ ...@@ -795,12 +795,18 @@
}, },
{ {
"__id__": 72 "__id__": 72
},
{
"__id__": 75
},
{
"__id__": 78
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 75 "__id__": 81
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2280,7 +2286,7 @@ ...@@ -2280,7 +2286,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
133.636, 133.636,
-82.175, 59.128,
0, 0,
0, 0,
0, 0,
...@@ -2344,7 +2350,7 @@ ...@@ -2344,7 +2350,7 @@
"asset": { "asset": {
"__uuid__": "9644221a-9645-4781-8600-367aaa502669" "__uuid__": "9644221a-9645-4781-8600-367aaa502669"
}, },
"fileId": "feLdszMPhF/Ys3NOlKBy2G", "fileId": "1eZQJrUkhNTbOrAPs6YH/N",
"sync": false "sync": false
}, },
{ {
...@@ -2386,8 +2392,8 @@ ...@@ -2386,8 +2392,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
107.918, 133.636,
-163.157, -7.875,
0, 0,
0, 0,
0, 0,
...@@ -2451,7 +2457,7 @@ ...@@ -2451,7 +2457,7 @@
"asset": { "asset": {
"__uuid__": "9644221a-9645-4781-8600-367aaa502669" "__uuid__": "9644221a-9645-4781-8600-367aaa502669"
}, },
"fileId": "fcGnK5Z6FJVqy2Cjwm1XNq", "fileId": "45yWw5yZxM8IsID1aCapho",
"sync": false "sync": false
}, },
{ {
...@@ -2493,8 +2499,8 @@ ...@@ -2493,8 +2499,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
32.881, 133.636,
-212.333, -82.175,
0, 0,
0, 0,
0, 0,
...@@ -2558,7 +2564,7 @@ ...@@ -2558,7 +2564,7 @@
"asset": { "asset": {
"__uuid__": "9644221a-9645-4781-8600-367aaa502669" "__uuid__": "9644221a-9645-4781-8600-367aaa502669"
}, },
"fileId": "d8L1Q58zlEta9PtSMqbteB", "fileId": "feLdszMPhF/Ys3NOlKBy2G",
"sync": false "sync": false
}, },
{ {
...@@ -2600,8 +2606,8 @@ ...@@ -2600,8 +2606,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-55.696, 107.918,
-200.828, -163.157,
0, 0,
0, 0,
0, 0,
...@@ -2665,7 +2671,7 @@ ...@@ -2665,7 +2671,7 @@
"asset": { "asset": {
"__uuid__": "9644221a-9645-4781-8600-367aaa502669" "__uuid__": "9644221a-9645-4781-8600-367aaa502669"
}, },
"fileId": "37XerqxctFW77a/pedFMMc", "fileId": "fcGnK5Z6FJVqy2Cjwm1XNq",
"sync": false "sync": false
}, },
{ {
...@@ -2703,6 +2709,220 @@ ...@@ -2703,6 +2709,220 @@
"x": 0.5, "x": 0.5,
"y": 0.5 "y": 0.5
}, },
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
32.881,
-212.333,
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": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "9644221a-9645-4781-8600-367aaa502669"
},
"fileId": "d8L1Q58zlEta9PtSMqbteB",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "NodePos_1_7",
"_objFlags": 0,
"_parent": {
"__id__": 20
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 76
}
],
"_prefab": {
"__id__": 77
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-55.696,
-200.828,
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": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "9644221a-9645-4781-8600-367aaa502669"
},
"fileId": "37XerqxctFW77a/pedFMMc",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "NodePos_1_8",
"_objFlags": 0,
"_parent": {
"__id__": 20
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 79
}
],
"_prefab": {
"__id__": 80
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": { "_trs": {
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
...@@ -2737,7 +2957,7 @@ ...@@ -2737,7 +2957,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 72 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2795,17 +3015,17 @@ ...@@ -2795,17 +3015,17 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 77 "__id__": 83
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 90
} }
], ],
"_prefab": { "_prefab": {
"__id__": 85 "__id__": 91
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2859,24 +3079,24 @@ ...@@ -2859,24 +3079,24 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 76 "__id__": 82
}, },
"_children": [ "_children": [
{ {
"__id__": 78 "__id__": 84
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 81 "__id__": 87
}, },
{ {
"__id__": 82 "__id__": 88
} }
], ],
"_prefab": { "_prefab": {
"__id__": 83 "__id__": 89
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2930,17 +3150,17 @@ ...@@ -2930,17 +3150,17 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 77 "__id__": 83
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 85
} }
], ],
"_prefab": { "_prefab": {
"__id__": 80 "__id__": 86
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2994,7 +3214,7 @@ ...@@ -2994,7 +3214,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 84
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3039,7 +3259,7 @@ ...@@ -3039,7 +3259,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3071,7 +3291,7 @@ ...@@ -3071,7 +3291,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -3109,7 +3329,7 @@ ...@@ -3109,7 +3329,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 76 "__id__": 82
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3182,7 +3402,7 @@ ...@@ -3182,7 +3402,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 77 "__id__": 83
}, },
"_id": "" "_id": ""
}, },
......
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "DrawGraphyNodeBase", "_name": "DrawGraphyNodeBase_0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 5 "__id__": 5
...@@ -348,8 +348,8 @@ ...@@ -348,8 +348,8 @@
"_strokeColor": { "_strokeColor": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
"g": 105, "g": 208,
"b": 158, "b": 47,
"a": 255 "a": 255
}, },
"_lineJoin": 1, "_lineJoin": 1,
...@@ -357,8 +357,8 @@ ...@@ -357,8 +357,8 @@
"_fillColor": { "_fillColor": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
"g": 105, "g": 208,
"b": 158, "b": 47,
"a": 255 "a": 255
}, },
"_miterLimit": 60, "_miterLimit": 60,
......
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "DrawGraphyNodeBase", "_name": "DrawGraphyNodeBase_0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 5 "__id__": 5
...@@ -348,8 +348,8 @@ ...@@ -348,8 +348,8 @@
"_strokeColor": { "_strokeColor": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
"g": 105, "g": 208,
"b": 158, "b": 47,
"a": 255 "a": 255
}, },
"_lineJoin": 1, "_lineJoin": 1,
...@@ -357,8 +357,8 @@ ...@@ -357,8 +357,8 @@
"_fillColor": { "_fillColor": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
"g": 105, "g": 208,
"b": 158, "b": 47,
"a": 255 "a": 255
}, },
"_miterLimit": 60, "_miterLimit": 60,
......
...@@ -1625,8 +1625,8 @@ ...@@ -1625,8 +1625,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-0.31899999999999995, -4.651,
-183.867, -192.532,
0, 0,
0, 0,
0, 0,
...@@ -1732,8 +1732,8 @@ ...@@ -1732,8 +1732,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
36.819, 33.786,
-233.591, -238.356,
0, 0,
0, 0,
0, 0,
......
...@@ -27,17 +27,17 @@ ...@@ -27,17 +27,17 @@
"__id__": 20 "__id__": 20
}, },
{ {
"__id__": 61 "__id__": 76
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 71 "__id__": 86
} }
], ],
"_prefab": { "_prefab": {
"__id__": 72 "__id__": 87
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -780,12 +780,27 @@ ...@@ -780,12 +780,27 @@
}, },
{ {
"__id__": 57 "__id__": 57
},
{
"__id__": 60
},
{
"__id__": 63
},
{
"__id__": 66
},
{
"__id__": 69
},
{
"__id__": 72
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 60 "__id__": 75
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -1837,7 +1852,7 @@ ...@@ -1837,7 +1852,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
120.861, 120.861,
164.353, 34.778,
0, 0,
0, 0,
0, 0,
...@@ -1901,12 +1916,12 @@ ...@@ -1901,12 +1916,12 @@
"asset": { "asset": {
"__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9" "__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9"
}, },
"fileId": "1flDgWQUVHDLqCsbyyobGP", "fileId": "b9y2xm2gdI74rdvCa9nTDn",
"sync": false "sync": false
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "NodePos_1_0", "_name": "NodePos_0_10",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 20
...@@ -1944,7 +1959,7 @@ ...@@ -1944,7 +1959,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
120.861, 120.861,
164.353, 99.005,
0, 0,
0, 0,
0, 0,
...@@ -2008,12 +2023,12 @@ ...@@ -2008,12 +2023,12 @@
"asset": { "asset": {
"__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9" "__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9"
}, },
"fileId": "4ec3Yg4A1AxJA+xRS8KXN8", "fileId": "86tiV9kg9I55HTdTx6RuBz",
"sync": false "sync": false
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "NodePos_1_1", "_name": "NodePos_0_11",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 20
...@@ -2051,7 +2066,7 @@ ...@@ -2051,7 +2066,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
120.861, 120.861,
-95.543, 164.353,
0, 0,
0, 0,
0, 0,
...@@ -2115,12 +2130,12 @@ ...@@ -2115,12 +2130,12 @@
"asset": { "asset": {
"__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9" "__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9"
}, },
"fileId": "d2rGQ1ATxCa7CTD4QtLavU", "fileId": "1flDgWQUVHDLqCsbyyobGP",
"sync": false "sync": false
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "NodePos_1_2", "_name": "NodePos_1_0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 20
...@@ -2158,7 +2173,7 @@ ...@@ -2158,7 +2173,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
120.861, 120.861,
-163.701, 164.637,
0, 0,
0, 0,
0, 0,
...@@ -2222,40 +2237,25 @@ ...@@ -2222,40 +2237,25 @@
"asset": { "asset": {
"__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9" "__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9"
}, },
"fileId": "68gWKlSGhIT7jTM89gYuYV", "fileId": "4ec3Yg4A1AxJA+xRS8KXN8",
"sync": false
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9"
},
"fileId": "a4wt4S6ttPrKRwgLvFnBFy",
"sync": false "sync": false
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "BtnUpdate", "_name": "NodePos_1_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1 "__id__": 20
}, },
"_children": [ "_children": [],
{
"__id__": 62
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 69 "__id__": 61
} }
], ],
"_prefab": { "_prefab": {
"__id__": 70 "__id__": 62
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2267,8 +2267,8 @@ ...@@ -2267,8 +2267,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 100, "width": 53,
"height": 40 "height": 53
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2279,8 +2279,8 @@ ...@@ -2279,8 +2279,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
392.552, 120.861,
157.323, 97.985,
0, 0,
0, 0,
0, 0,
...@@ -2305,28 +2305,64 @@ ...@@ -2305,28 +2305,64 @@
"_id": "" "_id": ""
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Sprite",
"_name": "Background", "_name": "",
"_objFlags": 512, "_objFlags": 0,
"_parent": { "node": {
"__id__": 61 "__id__": 60
}, },
"_children": [ "_enabled": true,
"_materials": [
{ {
"__id__": 63 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_active": true, "_srcBlendFactor": 770,
"_components": [ "_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{ {
"__id__": 66 "__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9"
},
"fileId": "982zaMT5VOvLEoCXH3+skt",
"sync": false
}, },
{ {
"__id__": 67 "__type__": "cc.Node",
"_name": "NodePos_1_2",
"_objFlags": 0,
"_parent": {
"__id__": 20
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 64
} }
], ],
"_prefab": { "_prefab": {
"__id__": 68 "__id__": 65
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2338,8 +2374,8 @@ ...@@ -2338,8 +2374,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 100, "width": 53,
"height": 40 "height": 53
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2350,8 +2386,8 @@ ...@@ -2350,8 +2386,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 120.861,
0, 35.898,
0, 0,
0, 0,
0, 0,
...@@ -2375,35 +2411,78 @@ ...@@ -2375,35 +2411,78 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "" "_id": ""
}, },
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9"
},
"fileId": "58zldGFKlGXKCtDAhHTbZu",
"sync": false
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Label", "_name": "NodePos_1_3",
"_objFlags": 512, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 62 "__id__": 20
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 64 "__id__": 67
} }
], ],
"_prefab": { "_prefab": {
"__id__": 65 "__id__": 68
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 0, "r": 255,
"g": 0, "g": 255,
"b": 0, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 100, "width": 53,
"height": 40 "height": 53
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2414,8 +2493,8 @@ ...@@ -2414,8 +2493,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 120.861,
0, -26.188,
0, 0,
0, 0,
0, 0,
...@@ -2440,11 +2519,11 @@ ...@@ -2440,11 +2519,11 @@
"_id": "" "_id": ""
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 63 "__id__": 66
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2454,23 +2533,21 @@ ...@@ -2454,23 +2533,21 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": false, "_spriteFrame": {
"_string": "button", "__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
"_N$string": "button", },
"_fontSize": 20, "_type": 0,
"_lineHeight": 40, "_sizeMode": 1,
"_enableWrapText": false, "_fillType": 0,
"_N$file": null, "_fillCenter": {
"_isSystemFontUsed": true, "__type__": "cc.Vec2",
"_spacingX": 0, "x": 0,
"_batchAsBitmap": false, "y": 0
"_styleFlags": 0, },
"_underlineHeight": 0, "_fillStart": 0,
"_N$horizontalAlign": 1, "_fillRange": 0,
"_N$verticalAlign": 1, "_isTrimmedMode": true,
"_N$fontFamily": "Arial", "_atlas": null,
"_N$overflow": 1,
"_N$cacheMode": 1,
"_id": "" "_id": ""
}, },
{ {
...@@ -2481,30 +2558,503 @@ ...@@ -2481,30 +2558,503 @@
"asset": { "asset": {
"__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9" "__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9"
}, },
"fileId": "78Bd25ap1AparHYPiOyRXP", "fileId": "d4ayaGUxZF655OrBlJ/okZ",
"sync": false "sync": false
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Node",
"_name": "", "_name": "NodePos_1_4",
"_objFlags": 0, "_objFlags": 0,
"node": { "_parent": {
"__id__": 62 "__id__": 20
}, },
"_enabled": true, "_children": [],
"_materials": [ "_active": true,
"_components": [
{ {
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__id__": 70
} }
], ],
"_srcBlendFactor": 770, "_prefab": {
"_dstBlendFactor": 771, "__id__": 71
"_spriteFrame": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
}, },
"_type": 1, "_opacity": 255,
"_sizeMode": 0, "_color": {
"_fillType": 0, "__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
120.861,
-95.543,
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": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 69
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9"
},
"fileId": "d2rGQ1ATxCa7CTD4QtLavU",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "NodePos_1_5",
"_objFlags": 0,
"_parent": {
"__id__": 20
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 73
}
],
"_prefab": {
"__id__": 74
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
120.861,
-163.701,
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": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9"
},
"fileId": "68gWKlSGhIT7jTM89gYuYV",
"sync": false
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9"
},
"fileId": "a4wt4S6ttPrKRwgLvFnBFy",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "BtnUpdate",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_children": [
{
"__id__": 77
}
],
"_active": true,
"_components": [
{
"__id__": 84
}
],
"_prefab": {
"__id__": 85
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
392.552,
157.323,
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": ""
},
{
"__type__": "cc.Node",
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 76
},
"_children": [
{
"__id__": 78
}
],
"_active": true,
"_components": [
{
"__id__": 81
},
{
"__id__": 82
}
],
"_prefab": {
"__id__": 83
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
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": ""
},
{
"__type__": "cc.Node",
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 77
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 79
}
],
"_prefab": {
"__id__": 80
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
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": ""
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "button",
"_N$string": "button",
"_fontSize": 20,
"_lineHeight": 40,
"_enableWrapText": false,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 1,
"_N$cacheMode": 1,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "58fa2489-877e-40a1-ad3c-84227de292f9"
},
"fileId": "78Bd25ap1AparHYPiOyRXP",
"sync": false
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0, "x": 0,
...@@ -2521,7 +3071,7 @@ ...@@ -2521,7 +3071,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 62 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -2559,7 +3109,7 @@ ...@@ -2559,7 +3109,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 61 "__id__": 76
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2632,7 +3182,7 @@ ...@@ -2632,7 +3182,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 62 "__id__": 77
}, },
"_id": "" "_id": ""
}, },
......
module.exports = { module.exports = {
letterList: [ letterList: [
'a', 'b', 'c' 'a', 'b'
] ]
} }
...@@ -175,10 +175,11 @@ export async function showFireworks(baseNode, nodeList, pos = cc.v2(0, 0), side ...@@ -175,10 +175,11 @@ export async function showFireworks(baseNode, nodeList, pos = cc.v2(0, 0), side
.delay(5) .delay(5)
.to(0.3, { opacity: 0 }) .to(0.3, { opacity: 0 })
.call(() => { .call(() => {
console.log("X")
node.stopAllActions(); node.stopAllActions();
node.active = false; node.active = false;
node.parent = null; node.parent = null;
node = null; rabbonNode.destroy();
}) })
.start(); .start();
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment