Commit 120594e1 authored by 杨一航's avatar 杨一航

feat: 优化调整

parent 3e3e3954
...@@ -78,34 +78,34 @@ ...@@ -78,34 +78,34 @@
"__id__": 10 "__id__": 10
}, },
{ {
"__id__": 81 "__id__": 89
}, },
{ {
"__id__": 83 "__id__": 91
}, },
{ {
"__id__": 86 "__id__": 94
}, },
{ {
"__id__": 89 "__id__": 97
}, },
{ {
"__id__": 94 "__id__": 102
}, },
{ {
"__id__": 96 "__id__": 104
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 122 "__id__": 130
}, },
{ {
"__id__": 123 "__id__": 131
}, },
{ {
"__id__": 124 "__id__": 132
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -401,7 +401,7 @@ ...@@ -401,7 +401,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" "__uuid__": "cd2418c1-5066-42a5-9361-bc82d74df61b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -487,9 +487,6 @@ ...@@ -487,9 +487,6 @@
{ {
"__id__": 11 "__id__": 11
}, },
{
"__id__": 21
},
{ {
"__id__": 23 "__id__": 23
}, },
...@@ -497,28 +494,31 @@ ...@@ -497,28 +494,31 @@
"__id__": 25 "__id__": 25
}, },
{ {
"__id__": 27 "__id__": 28
}, },
{ {
"__id__": 29 "__id__": 31
}, },
{ {
"__id__": 33 "__id__": 33
}, },
{ {
"__id__": 54 "__id__": 37
}, },
{ {
"__id__": 75 "__id__": 60
}, },
{ {
"__id__": 77 "__id__": 83
},
{
"__id__": 85
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 80 "__id__": 88
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -585,9 +585,6 @@ ...@@ -585,9 +585,6 @@
}, },
{ {
"__id__": 16 "__id__": 16
},
{
"__id__": 18
} }
], ],
"_active": true, "_active": true,
...@@ -616,14 +613,14 @@ ...@@ -616,14 +613,14 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-32.11, -32.11,
-130.495, 200,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
0.3, 1,
0.3, 1,
1 1
] ]
}, },
...@@ -838,16 +835,85 @@ ...@@ -838,16 +835,85 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "icon", "_name": "root",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 11 "__id__": 11
}, },
"_children": [
{
"__id__": 17
},
{
"__id__": 19
}
],
"_active": true,
"_components": [
{
"__id__": 22
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 300,
"height": 379.6
},
"_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": "97K+dSHWhBPa9VniNjHXbM"
},
{
"__type__": "cc.Node",
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 16
},
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 17 "__id__": 18
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -874,7 +940,7 @@ ...@@ -874,7 +940,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
30.49, 39.80000000000001,
0, 0,
0, 0,
0, 0,
...@@ -903,7 +969,7 @@ ...@@ -903,7 +969,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 16 "__id__": 17
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -933,16 +999,16 @@ ...@@ -933,16 +999,16 @@
"_name": "lb", "_name": "lb",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 11 "__id__": 16
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 19 "__id__": 20
}, },
{ {
"__id__": 20 "__id__": 21
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -956,7 +1022,7 @@ ...@@ -956,7 +1022,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 204.21, "width": 300,
"height": 79.6 "height": 79.6
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -969,7 +1035,7 @@ ...@@ -969,7 +1035,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-159.125, -150,
0, 0,
0, 0,
0, 0,
...@@ -998,7 +1064,7 @@ ...@@ -998,7 +1064,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 18 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1008,11 +1074,11 @@ ...@@ -1008,11 +1074,11 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "123445", "_string": "",
"_N$string": "123445", "_N$string": "",
"_fontSize": 60, "_fontSize": 60,
"_lineHeight": 60, "_lineHeight": 60,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
"_spacingX": 0, "_spacingX": 0,
...@@ -1022,7 +1088,7 @@ ...@@ -1022,7 +1088,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "30rQmiGZ5BW4O5x1hfno5t" "_id": "30rQmiGZ5BW4O5x1hfno5t"
}, },
...@@ -1031,7 +1097,7 @@ ...@@ -1031,7 +1097,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 18 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -1044,6 +1110,38 @@ ...@@ -1044,6 +1110,38 @@
"_width": 2, "_width": 2,
"_id": "94EFREEUdB65UVZ0VJNkWz" "_id": "94EFREEUdB65UVZ0VJNkWz"
}, },
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
},
"_enabled": true,
"_layoutSize": {
"__type__": "cc.Size",
"width": 300,
"height": 379.6
},
"_resize": 1,
"_N$layoutType": 2,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_N$startAxis": 0,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 0,
"_N$spacingY": 0,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "6fXbdf5+9AwIbLjcJDGSWb"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "minpp", "_name": "minpp",
...@@ -1055,7 +1153,7 @@ ...@@ -1055,7 +1153,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 22 "__id__": 24
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1111,7 +1209,7 @@ ...@@ -1111,7 +1209,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 21 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1157,7 +1255,10 @@ ...@@ -1157,7 +1255,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 24 "__id__": 26
},
{
"__id__": 27
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1184,7 +1285,7 @@ ...@@ -1184,7 +1285,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-14.926, -14.926,
-376.428, -392.095,
0, 0,
0, 0,
0, 0,
...@@ -1213,7 +1314,7 @@ ...@@ -1213,7 +1314,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 23 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1248,6 +1349,33 @@ ...@@ -1248,6 +1349,33 @@
"_N$enableBatch": false, "_N$enableBatch": false,
"_id": "7bEeJ9GPdJl4LPNVGQb+el" "_id": "7bEeJ9GPdJl4LPNVGQb+el"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 10,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "70WZBtZPJN4KKEuPBhtjYT"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img_hold_dangban_green", "_name": "img_hold_dangban_green",
...@@ -1259,7 +1387,10 @@ ...@@ -1259,7 +1387,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 26 "__id__": 29
},
{
"__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1286,7 +1417,7 @@ ...@@ -1286,7 +1417,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-322.283, -322.283,
-417.325, -416,
0, 0,
0, 0,
0, 0,
...@@ -1315,7 +1446,7 @@ ...@@ -1315,7 +1446,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 25 "__id__": 28
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1342,6 +1473,33 @@ ...@@ -1342,6 +1473,33 @@
"_atlas": null, "_atlas": null,
"_id": "b7uz268pBLebV5Sb2lmFyK" "_id": "b7uz268pBLebV5Sb2lmFyK"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "216TTApA9EE6+6u+Eak5x2"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "ban", "_name": "ban",
...@@ -1353,7 +1511,7 @@ ...@@ -1353,7 +1511,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 32
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1409,7 +1567,7 @@ ...@@ -1409,7 +1567,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 27 "__id__": 31
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1445,13 +1603,13 @@ ...@@ -1445,13 +1603,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 30 "__id__": 34
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 32 "__id__": 36
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1507,13 +1665,13 @@ ...@@ -1507,13 +1665,13 @@
"_name": "box", "_name": "box",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 33
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 31 "__id__": 35
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1569,7 +1727,7 @@ ...@@ -1569,7 +1727,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 30 "__id__": 34
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1601,7 +1759,7 @@ ...@@ -1601,7 +1759,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 29 "__id__": 33
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1637,16 +1795,16 @@ ...@@ -1637,16 +1795,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 34 "__id__": 38
}, },
{ {
"__id__": 45 "__id__": 51
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 53 "__id__": 59
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1702,11 +1860,11 @@ ...@@ -1702,11 +1860,11 @@
"_name": "ATTACHED_NODE_TREE", "_name": "ATTACHED_NODE_TREE",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 33 "__id__": 37
}, },
"_children": [ "_children": [
{ {
"__id__": 35 "__id__": 39
} }
], ],
"_active": true, "_active": true,
...@@ -1764,11 +1922,11 @@ ...@@ -1764,11 +1922,11 @@
"_name": "ATTACHED_NODE:root", "_name": "ATTACHED_NODE:root",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 38
}, },
"_children": [ "_children": [
{ {
"__id__": 36 "__id__": 40
} }
], ],
"_active": true, "_active": true,
...@@ -1826,17 +1984,17 @@ ...@@ -1826,17 +1984,17 @@
"_name": "ATTACHED_NODE:bone", "_name": "ATTACHED_NODE:bone",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 35 "__id__": 39
}, },
"_children": [ "_children": [
{ {
"__id__": 37 "__id__": 41
}, },
{ {
"__id__": 43 "__id__": 49
}, },
{ {
"__id__": 44 "__id__": 50
} }
], ],
"_active": true, "_active": true,
...@@ -1894,17 +2052,14 @@ ...@@ -1894,17 +2052,14 @@
"_name": "ATTACHED_NODE:bone1", "_name": "ATTACHED_NODE:bone1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 36 "__id__": 40
}, },
"_children": [ "_children": [
{ {
"__id__": 38 "__id__": 42
},
{
"__id__": 39
}, },
{ {
"__id__": 41 "__id__": 43
} }
], ],
"_active": true, "_active": true,
...@@ -1962,7 +2117,7 @@ ...@@ -1962,7 +2117,7 @@
"_name": "ATTACHED_NODE:bone4", "_name": "ATTACHED_NODE:bone4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 37 "__id__": 41
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -2017,16 +2172,23 @@ ...@@ -2017,16 +2172,23 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "icon", "_name": "New Node",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 37 "__id__": 41
}, },
"_children": [], "_children": [
{
"__id__": 44
},
{
"__id__": 46
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 40 "__id__": 48
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2040,8 +2202,8 @@ ...@@ -2040,8 +2202,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 270, "width": 300,
"height": 240 "height": 305.6
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2052,7 +2214,7 @@ ...@@ -2052,7 +2214,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
70, 80,
0, 0,
0, 0,
0, 0,
...@@ -2075,6 +2237,68 @@ ...@@ -2075,6 +2237,68 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "f0LPhNHf1GxoIDbvAl1957"
},
{
"__type__": "cc.Node",
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 43
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 45
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 193,
"height": 230
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-10,
37.80000000000001,
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": "5aK5411U9OraTwnz4lDOFu" "_id": "5aK5411U9OraTwnz4lDOFu"
}, },
{ {
...@@ -2082,7 +2306,7 @@ ...@@ -2082,7 +2306,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 39 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2112,13 +2336,13 @@ ...@@ -2112,13 +2336,13 @@
"_name": "lb", "_name": "lb",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 37 "__id__": 43
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 42 "__id__": 47
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2144,13 +2368,13 @@ ...@@ -2144,13 +2368,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-90, 0,
-114.99999999999999,
0, 0,
0, 0,
0, 0,
0, 0,
-0.7071067811865475, 1,
0.7071067811865476,
1, 1,
1, 1,
1 1
...@@ -2160,7 +2384,7 @@ ...@@ -2160,7 +2384,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -90 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -2174,7 +2398,7 @@ ...@@ -2174,7 +2398,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 41 "__id__": 46
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2202,12 +2426,44 @@ ...@@ -2202,12 +2426,44 @@
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "8083JH7JNHJZc0g39UQgT2" "_id": "8083JH7JNHJZc0g39UQgT2"
}, },
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
},
"_enabled": true,
"_layoutSize": {
"__type__": "cc.Size",
"width": 300,
"height": 305.6
},
"_resize": 1,
"_N$layoutType": 2,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_N$startAxis": 0,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 0,
"_N$spacingY": 0,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": true,
"_id": "b4Ia6q9rFDBoTzSnXa3tQu"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "ATTACHED_NODE:bone2", "_name": "ATTACHED_NODE:bone2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 36 "__id__": 40
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -2265,7 +2521,7 @@ ...@@ -2265,7 +2521,7 @@
"_name": "ATTACHED_NODE:bone3", "_name": "ATTACHED_NODE:bone3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 36 "__id__": 40
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -2323,23 +2579,23 @@ ...@@ -2323,23 +2579,23 @@
"_name": "guide", "_name": "guide",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 33 "__id__": 37
}, },
"_children": [ "_children": [
{ {
"__id__": 46 "__id__": 52
}, },
{ {
"__id__": 49 "__id__": 55
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 51 "__id__": 57
}, },
{ {
"__id__": 52 "__id__": 58
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2395,16 +2651,16 @@ ...@@ -2395,16 +2651,16 @@
"_name": "hand", "_name": "hand",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 45 "__id__": 51
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 47 "__id__": 53
}, },
{ {
"__id__": 48 "__id__": 54
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2460,7 +2716,7 @@ ...@@ -2460,7 +2716,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 46 "__id__": 52
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -2492,7 +2748,7 @@ ...@@ -2492,7 +2748,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 46 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"_defaultClip": { "_defaultClip": {
...@@ -2511,13 +2767,13 @@ ...@@ -2511,13 +2767,13 @@
"_name": "ani", "_name": "ani",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 45 "__id__": 51
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 50 "__id__": 56
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2573,7 +2829,7 @@ ...@@ -2573,7 +2829,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 49 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2613,7 +2869,7 @@ ...@@ -2613,7 +2869,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 45 "__id__": 51
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -2645,7 +2901,7 @@ ...@@ -2645,7 +2901,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 45 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"_id": "e7JfZwlRJHSJzsR6b9f9yO" "_id": "e7JfZwlRJHSJzsR6b9f9yO"
...@@ -2655,7 +2911,7 @@ ...@@ -2655,7 +2911,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 33 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2699,16 +2955,16 @@ ...@@ -2699,16 +2955,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 55 "__id__": 61
}, },
{ {
"__id__": 66 "__id__": 74
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 82
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2723,7 +2979,7 @@ ...@@ -2723,7 +2979,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 416, "width": 416,
"height": 539.25 "height": 539
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2764,11 +3020,11 @@ ...@@ -2764,11 +3020,11 @@
"_name": "ATTACHED_NODE_TREE", "_name": "ATTACHED_NODE_TREE",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 54 "__id__": 60
}, },
"_children": [ "_children": [
{ {
"__id__": 56 "__id__": 62
} }
], ],
"_active": true, "_active": true,
...@@ -2826,11 +3082,11 @@ ...@@ -2826,11 +3082,11 @@
"_name": "ATTACHED_NODE:root", "_name": "ATTACHED_NODE:root",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 55 "__id__": 61
}, },
"_children": [ "_children": [
{ {
"__id__": 57 "__id__": 63
} }
], ],
"_active": true, "_active": true,
...@@ -2888,17 +3144,17 @@ ...@@ -2888,17 +3144,17 @@
"_name": "ATTACHED_NODE:bone", "_name": "ATTACHED_NODE:bone",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 56 "__id__": 62
}, },
"_children": [ "_children": [
{ {
"__id__": 58 "__id__": 64
}, },
{ {
"__id__": 64 "__id__": 72
}, },
{ {
"__id__": 65 "__id__": 73
} }
], ],
"_active": true, "_active": true,
...@@ -2956,17 +3212,14 @@ ...@@ -2956,17 +3212,14 @@
"_name": "ATTACHED_NODE:bone1", "_name": "ATTACHED_NODE:bone1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 63
}, },
"_children": [ "_children": [
{ {
"__id__": 59 "__id__": 65
},
{
"__id__": 61
}, },
{ {
"__id__": 63 "__id__": 71
} }
], ],
"_active": true, "_active": true,
...@@ -3017,20 +3270,89 @@ ...@@ -3017,20 +3270,89 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "dd3KTFA1BEQ4aWHQjOGoZh" "_id": "dd3KTFA1BEQ4aWHQjOGoZh"
},
{
"__type__": "cc.Node",
"_name": "New Node",
"_objFlags": 0,
"_parent": {
"__id__": 64
},
"_children": [
{
"__id__": 66
},
{
"__id__": 68
}
],
"_active": true,
"_components": [
{
"__id__": 70
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 300,
"height": 315.6
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
80,
0,
0,
0,
0,
-0.7071067811865475,
0.7071067811865476,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": -90
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "90ahMsbyNG+5xkPT6Iu0Mx"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 58 "__id__": 65
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 60 "__id__": 67
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3056,13 +3378,13 @@ ...@@ -3056,13 +3378,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
70,
0, 0,
37.80000000000001,
0, 0,
0, 0,
0, 0,
-0.7071067811865475, 0,
0.7071067811865476, 1,
1, 1,
1, 1,
1 1
...@@ -3072,7 +3394,7 @@ ...@@ -3072,7 +3394,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -90 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -3086,7 +3408,7 @@ ...@@ -3086,7 +3408,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 59 "__id__": 66
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3116,13 +3438,13 @@ ...@@ -3116,13 +3438,13 @@
"_name": "lb", "_name": "lb",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 58 "__id__": 65
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 62 "__id__": 69
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3148,13 +3470,13 @@ ...@@ -3148,13 +3470,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-90,
0, 0,
-119.99999999999999,
0, 0,
0, 0,
0, 0,
-0.7071067811865475, 0,
0.7071067811865476, 1,
1, 1,
1, 1,
1 1
...@@ -3164,7 +3486,7 @@ ...@@ -3164,7 +3486,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -90 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -3178,7 +3500,7 @@ ...@@ -3178,7 +3500,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 61 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3206,12 +3528,44 @@ ...@@ -3206,12 +3528,44 @@
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "42NQkNrrRP0Y13f2PXEo5I" "_id": "42NQkNrrRP0Y13f2PXEo5I"
}, },
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
},
"_enabled": true,
"_layoutSize": {
"__type__": "cc.Size",
"width": 300,
"height": 315.6
},
"_resize": 1,
"_N$layoutType": 2,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_N$startAxis": 0,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 0,
"_N$spacingY": 0,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": true,
"_id": "feVgIon8dEOJ5aP3KiUmEp"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "ATTACHED_NODE:bone4", "_name": "ATTACHED_NODE:bone4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 58 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -3269,7 +3623,7 @@ ...@@ -3269,7 +3623,7 @@
"_name": "ATTACHED_NODE:bone2", "_name": "ATTACHED_NODE:bone2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 63
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -3327,7 +3681,7 @@ ...@@ -3327,7 +3681,7 @@
"_name": "ATTACHED_NODE:bone3", "_name": "ATTACHED_NODE:bone3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 63
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -3385,23 +3739,23 @@ ...@@ -3385,23 +3739,23 @@
"_name": "guide", "_name": "guide",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 54 "__id__": 60
}, },
"_children": [ "_children": [
{ {
"__id__": 67 "__id__": 75
}, },
{ {
"__id__": 69 "__id__": 77
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 72 "__id__": 80
}, },
{ {
"__id__": 73 "__id__": 81
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3457,13 +3811,13 @@ ...@@ -3457,13 +3811,13 @@
"_name": "ani", "_name": "ani",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 66 "__id__": 74
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 68 "__id__": 76
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3519,7 +3873,7 @@ ...@@ -3519,7 +3873,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3559,16 +3913,16 @@ ...@@ -3559,16 +3913,16 @@
"_name": "hand", "_name": "hand",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 66 "__id__": 74
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 70 "__id__": 78
}, },
{ {
"__id__": 71 "__id__": 79
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3624,7 +3978,7 @@ ...@@ -3624,7 +3978,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 77
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -3656,7 +4010,7 @@ ...@@ -3656,7 +4010,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"_defaultClip": { "_defaultClip": {
...@@ -3675,7 +4029,7 @@ ...@@ -3675,7 +4029,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 74
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -3707,7 +4061,7 @@ ...@@ -3707,7 +4061,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 74
}, },
"_enabled": true, "_enabled": true,
"_id": "09lE0yisBMJZoJLXBhkY84" "_id": "09lE0yisBMJZoJLXBhkY84"
...@@ -3717,7 +4071,7 @@ ...@@ -3717,7 +4071,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 54 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3763,7 +4117,7 @@ ...@@ -3763,7 +4117,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 76 "__id__": 84
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3819,7 +4173,7 @@ ...@@ -3819,7 +4173,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 75 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3865,10 +4219,10 @@ ...@@ -3865,10 +4219,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 78 "__id__": 86
}, },
{ {
"__id__": 79 "__id__": 87
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3924,7 +4278,7 @@ ...@@ -3924,7 +4278,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 85
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3956,7 +4310,7 @@ ...@@ -3956,7 +4310,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 85
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4053,7 +4407,7 @@ ...@@ -4053,7 +4407,7 @@
"__id__": 2 "__id__": 2
}, },
"_prefab": { "_prefab": {
"__id__": 82 "__id__": 90
}, },
"_name": "boy", "_name": "boy",
"_active": false, "_active": false,
...@@ -4084,7 +4438,7 @@ ...@@ -4084,7 +4438,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 81 "__id__": 89
}, },
"asset": { "asset": {
"__uuid__": "e2c60f31-0e99-4c0d-bf7c-6355dae2c724" "__uuid__": "e2c60f31-0e99-4c0d-bf7c-6355dae2c724"
...@@ -4103,10 +4457,10 @@ ...@@ -4103,10 +4457,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 92
}, },
{ {
"__id__": 85 "__id__": 93
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4162,7 +4516,7 @@ ...@@ -4162,7 +4516,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4194,7 +4548,7 @@ ...@@ -4194,7 +4548,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4268,10 +4622,10 @@ ...@@ -4268,10 +4622,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 87 "__id__": 95
}, },
{ {
"__id__": 88 "__id__": 96
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4327,7 +4681,7 @@ ...@@ -4327,7 +4681,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 94
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -4359,7 +4713,7 @@ ...@@ -4359,7 +4713,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4431,16 +4785,16 @@ ...@@ -4431,16 +4785,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 90 "__id__": 98
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 92 "__id__": 100
}, },
{ {
"__id__": 93 "__id__": 101
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4493,16 +4847,16 @@ ...@@ -4493,16 +4847,16 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "New Label", "_name": "lb",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 89 "__id__": 97
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 91 "__id__": 99
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4558,7 +4912,7 @@ ...@@ -4558,7 +4912,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 90 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4591,7 +4945,7 @@ ...@@ -4591,7 +4945,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4623,7 +4977,7 @@ ...@@ -4623,7 +4977,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4697,7 +5051,7 @@ ...@@ -4697,7 +5051,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 95 "__id__": 103
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4753,7 +5107,7 @@ ...@@ -4753,7 +5107,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 94 "__id__": 102
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4789,13 +5143,13 @@ ...@@ -4789,13 +5143,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 97 "__id__": 105
}, },
{ {
"__id__": 100 "__id__": 108
}, },
{ {
"__id__": 101 "__id__": 109
} }
], ],
"_active": false, "_active": false,
...@@ -4853,11 +5207,11 @@ ...@@ -4853,11 +5207,11 @@
"_name": "font", "_name": "font",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 96 "__id__": 104
}, },
"_children": [ "_children": [
{ {
"__id__": 98 "__id__": 106
} }
], ],
"_active": true, "_active": true,
...@@ -4915,13 +5269,13 @@ ...@@ -4915,13 +5269,13 @@
"_name": "BRLNSDB", "_name": "BRLNSDB",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 97 "__id__": 105
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 107
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4977,7 +5331,7 @@ ...@@ -4977,7 +5331,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 98 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5012,7 +5366,7 @@ ...@@ -5012,7 +5366,7 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 96 "__id__": 104
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -5070,38 +5424,38 @@ ...@@ -5070,38 +5424,38 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 96 "__id__": 104
}, },
"_children": [ "_children": [
{ {
"__id__": 102 "__id__": 110
}, },
{ {
"__id__": 104 "__id__": 112
}, },
{ {
"__id__": 106 "__id__": 114
}, },
{ {
"__id__": 108 "__id__": 116
}, },
{ {
"__id__": 110 "__id__": 118
}, },
{ {
"__id__": 112 "__id__": 120
}, },
{ {
"__id__": 114 "__id__": 122
}, },
{ {
"__id__": 116 "__id__": 124
}, },
{ {
"__id__": 118 "__id__": 126
}, },
{ {
"__id__": 120 "__id__": 128
} }
], ],
"_active": true, "_active": true,
...@@ -5159,13 +5513,13 @@ ...@@ -5159,13 +5513,13 @@
"_name": "btn", "_name": "btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 103 "__id__": 111
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5221,7 +5575,7 @@ ...@@ -5221,7 +5575,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 110
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5240,13 +5594,13 @@ ...@@ -5240,13 +5594,13 @@
"_name": "boxout", "_name": "boxout",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 105 "__id__": 113
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5302,7 +5656,7 @@ ...@@ -5302,7 +5656,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 104 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5321,13 +5675,13 @@ ...@@ -5321,13 +5675,13 @@
"_name": "bigpp", "_name": "bigpp",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 107 "__id__": 115
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5383,7 +5737,7 @@ ...@@ -5383,7 +5737,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 106 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5402,13 +5756,13 @@ ...@@ -5402,13 +5756,13 @@
"_name": "boxin", "_name": "boxin",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 109 "__id__": 117
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5464,7 +5818,7 @@ ...@@ -5464,7 +5818,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 108 "__id__": 116
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5483,13 +5837,13 @@ ...@@ -5483,13 +5837,13 @@
"_name": "click", "_name": "click",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 119
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5545,7 +5899,7 @@ ...@@ -5545,7 +5899,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 118
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5564,13 +5918,13 @@ ...@@ -5564,13 +5918,13 @@
"_name": "guidin", "_name": "guidin",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 121
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5626,7 +5980,7 @@ ...@@ -5626,7 +5980,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 120
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5645,13 +5999,13 @@ ...@@ -5645,13 +5999,13 @@
"_name": "pigppbom", "_name": "pigppbom",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 115 "__id__": 123
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5707,7 +6061,7 @@ ...@@ -5707,7 +6061,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 114 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5726,13 +6080,13 @@ ...@@ -5726,13 +6080,13 @@
"_name": "phappy", "_name": "phappy",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 125
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5788,7 +6142,7 @@ ...@@ -5788,7 +6142,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 116 "__id__": 124
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5807,13 +6161,13 @@ ...@@ -5807,13 +6161,13 @@
"_name": "lotspp", "_name": "lotspp",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 119 "__id__": 127
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5869,7 +6223,7 @@ ...@@ -5869,7 +6223,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 118 "__id__": 126
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5888,13 +6242,13 @@ ...@@ -5888,13 +6242,13 @@
"_name": "endstar", "_name": "endstar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 121 "__id__": 129
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5950,7 +6304,7 @@ ...@@ -5950,7 +6304,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 120 "__id__": 128
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -6020,58 +6374,58 @@ ...@@ -6020,58 +6374,58 @@
"__id__": 10 "__id__": 10
}, },
"boyNode": { "boyNode": {
"__id__": 81 "__id__": 89
}, },
"btn_start": { "btn_start": {
"__id__": 83 "__id__": 91
}, },
"btn_next": { "btn_next": {
"__id__": 77 "__id__": 85
}, },
"btn_restart": { "btn_restart": {
"__id__": 86 "__id__": 94
}, },
"minpao": { "minpao": {
"__id__": 21 "__id__": 23
}, },
"bigpao": { "bigpao": {
"__id__": 11 "__id__": 11
}, },
"ppNode": { "ppNode": {
"__id__": 75 "__id__": 83
}, },
"leftBox": { "leftBox": {
"__id__": 33 "__id__": 37
}, },
"leftStrNode": { "leftStrNode": {
"__id__": 41 "__id__": 46
}, },
"leftPicNode": { "leftPicNode": {
"__id__": 39 "__id__": 44
}, },
"leftGuideNode": { "leftGuideNode": {
"__id__": 45 "__id__": 51
}, },
"rightBox": { "rightBox": {
"__id__": 54 "__id__": 60
}, },
"rightStrNode": { "rightStrNode": {
"__id__": 61 "__id__": 68
}, },
"rightPicNode": { "rightPicNode": {
"__id__": 59 "__id__": 66
}, },
"rightGuideNode": { "rightGuideNode": {
"__id__": 66 "__id__": 74
}, },
"candleNode": { "candleNode": {
"__id__": 23 "__id__": 25
}, },
"banNode": { "banNode": {
"__id__": 27 "__id__": 31
}, },
"btn_quit": { "btn_quit": {
"__id__": 89 "__id__": 97
}, },
"_id": "eaTVUpqahPfZeO9+sUI7RP" "_id": "eaTVUpqahPfZeO9+sUI7RP"
} }
......
import { asyncDelay, asyncPlayDragonBoneAnimation, getSpriteFrimeByUrl, onHomeworkFinish } from "../script/util_DG23"; import { asyncDelay, asyncPlayDragonBoneAnimation, getSpriteFrimeByUrl, goNextPage, onHomeworkFinish } from "../script/util_DG23";
import { MyCocosSceneComponent } from "../script/MyCocosSceneComponent_DG23"; import { MyCocosSceneComponent } from "../script/MyCocosSceneComponent_DG23";
import Boy from "../script/items/boy_DG23"; import Boy from "../script/items/boy_DG23";
import TouchLogic from "../script/items/TouchLogic_DG23"; import TouchLogic from "../script/items/TouchLogic_DG23";
...@@ -70,6 +70,8 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -70,6 +70,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
addPreloadAudio() { addPreloadAudio() {
// TODO 根据自己的配置预加载音频资源 // TODO 根据自己的配置预加载音频资源
this.data.audio_url_guide = this.data.global_setting[0].audio_arr[0].value;
this.data.audio_url_success = this.data.global_setting[0].audio_arr[1].value;
this._audioResList.push({ url: this.data.audio_url_guide }); this._audioResList.push({ url: this.data.audio_url_guide });
this._audioResList.push({ url: this.data.audio_url_success }); this._audioResList.push({ url: this.data.audio_url_success });
...@@ -80,6 +82,8 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -80,6 +82,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
async onLoadEnd() { async onLoadEnd() {
cc.log(JSON.stringify(this.data, null, 2))
// TODO 加载完成后的逻辑写在这里, 下面的代码仅供参考 // TODO 加载完成后的逻辑写在这里, 下面的代码仅供参考
this.initBg(); this.initBg();
this.initData(); this.initData();
...@@ -131,6 +135,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -131,6 +135,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
const bgNode = cc.find('Canvas/bg'); const bgNode = cc.find('Canvas/bg');
bgNode.scale = this._mapScaleMax; bgNode.scale = this._mapScaleMax;
this.btn_quit.getChildByName("lb").getComponent(cc.Label).string = this.data.global_setting[0].text_arr[0].value
this.boyNode.active = false; this.boyNode.active = false;
cc.tween(this.btn_start).to(0.3, { scale: 1.1 }).to(0.2, { scale: 1 }).delay(1).union().repeatForever().start(); cc.tween(this.btn_start).to(0.3, { scale: 1.1 }).to(0.2, { scale: 1 }).delay(1).union().repeatForever().start();
cc.tween(this.btn_quit).to(0.3, { scale: 1.1 }).to(0.2, { scale: 1 }).delay(1).union().repeatForever().start(); cc.tween(this.btn_quit).to(0.3, { scale: 1.1 }).to(0.2, { scale: 1 }).delay(1).union().repeatForever().start();
...@@ -141,14 +146,10 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -141,14 +146,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.btn_next.on("click", this.onClickNext, this) this.btn_next.on("click", this.onClickNext, this)
this.btn_restart.on("click", this.initView, this) this.btn_restart.on("click", this.initView, this)
this.btn_quit.on("click", () => { this.btn_quit.on("click", () => {
this.playLocalAudio("btn") this.playLocalAudio("btn")
this.playLocalAudio("btn") goNextPage();
if (!cc.find('middleLayer')) {
console.log("==点击了下一页按钮==")
return;
}
const middleLayer = cc.find('middleLayer').getComponent('middleLayer');
middleLayer.goNextPage(); // 跳转到下一页
}, this) }, this)
} }
...@@ -235,7 +236,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -235,7 +236,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
await asyncDelay(1); await asyncDelay(1);
await this.leftAcation(); await this.leftAcation();
await this.rightAction(); await this.rightAction();
await asyncDelay(1); await asyncDelay(0.1);
await this.playResultAni(); await this.playResultAni();
this.btn_next.active = true; this.btn_next.active = true;
...@@ -243,11 +244,12 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -243,11 +244,12 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
async rightAction() { async rightAction() {
if (this.rightStr) { if (this.rightStr || this.rightPic) {
this.rightGuideNode.active = true; this.rightGuideNode.active = true;
this.rightGuideNode.opacity = this.roundIndex == 0 ? 255 : 0; this.rightGuideNode.opacity = this.roundIndex == 0 ? 255 : 0;
this.rightGuideNode.getComponent(TouchLogic).checkAnge(145, () => { this.rightGuideNode.getComponent(TouchLogic).checkAnge(145, () => {
this._touchRight && this._touchRight(); this._touchRight && this._touchRight();
this._touchRight = null;
this.playLocalAudio("click"); this.playLocalAudio("click");
this.rightGuideNode.active = false; this.rightGuideNode.active = false;
}) })
...@@ -272,26 +274,28 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -272,26 +274,28 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.rightGuideNode.opacity = 0; this.rightGuideNode.opacity = 0;
done = true; done = true;
this.unschedule(func) this.unschedule(func)
cc.log("check done"); cc.log("check done right");
await asyncPlayDragonBoneAnimation(this.rightBox, "normal", 1); await asyncPlayDragonBoneAnimation(this.rightBox, "normal", 1);
this.banNode.x = -260; this.banNode.x = -260;
asyncPlayDragonBoneAnimation(this.candleNode, "fire", -1); asyncPlayDragonBoneAnimation(this.candleNode, "fire", -1);
this.playLocalAudio("lotspp") this.playLocalAudio("lotspp")
this.minpao.active = true; this.minpao.active = true;
this.playLocalAudio("phappy");
await asyncPlayDragonBoneAnimation(this.ppNode, "right", 1); await asyncPlayDragonBoneAnimation(this.ppNode, "right", 1);
asyncPlayDragonBoneAnimation(this.ppNode, "normal", -1); asyncPlayDragonBoneAnimation(this.ppNode, "normal", -1);
this.playLocalAudio("phappy");
await asyncDelay(1);
this.minpao.active = false; this.minpao.active = false;
} }
} }
async leftAcation() { async leftAcation() {
if (this.letfStr) { if (this.letfStr || this.letfPic) {
this.leftGuideNode.active = true; this.leftGuideNode.active = true;
this.leftGuideNode.opacity = this.roundIndex == 0 ? 255 : 0; this.leftGuideNode.opacity = this.roundIndex == 0 ? 255 : 0;
this.leftGuideNode.getComponent(TouchLogic).checkAnge(30, () => { this.leftGuideNode.getComponent(TouchLogic).checkAnge(30, () => {
this._touchRight && this._touchRight(); this._touchRight && this._touchRight();
this._touchRight = null;
this.playLocalAudio("click"); this.playLocalAudio("click");
this.leftGuideNode.active = false; this.leftGuideNode.active = false;
}) })
...@@ -316,16 +320,17 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -316,16 +320,17 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.unschedule(func) this.unschedule(func)
done = true; done = true;
this.leftGuideNode.opacity = 0; this.leftGuideNode.opacity = 0;
cc.log("check done"); cc.log("check done left");
await asyncPlayDragonBoneAnimation(this.leftBox, "normal", 1); await asyncPlayDragonBoneAnimation(this.leftBox, "normal", 1);
this.banNode.x = -260; this.banNode.x = -260;
asyncPlayDragonBoneAnimation(this.candleNode, "fire", -1); asyncPlayDragonBoneAnimation(this.candleNode, "fire", -1);
this.playLocalAudio("lotspp") this.playLocalAudio("lotspp")
this.minpao.active = true; this.minpao.active = true;
this.playLocalAudio("phappy");
await asyncPlayDragonBoneAnimation(this.ppNode, "right", 1); await asyncPlayDragonBoneAnimation(this.ppNode, "right", 1);
asyncPlayDragonBoneAnimation(this.ppNode, "normal", -1); asyncPlayDragonBoneAnimation(this.ppNode, "normal", -1);
this.playLocalAudio("phappy");
await asyncDelay(1);
this.minpao.active = false; this.minpao.active = false;
} }
...@@ -366,58 +371,85 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -366,58 +371,85 @@ export default class SceneComponent extends MyCocosSceneComponent {
initRoudData() { initRoudData() {
let data = this.data.group_arr[this.roundIndex]; let data = this.data.group_arr[this.roundIndex];
this.resultStr = data.text_arr[0].value; this.resultStr = data.text_arr[0]?.value;
this.resultPic = data.image_arr[0].value; this.resultPic = data.image_arr[0]?.value;
this.rightStr = data.group_arr[0]?.text_arr[1]?.value;
this.letfStr = data.group_arr[0]?.text_arr[0]?.value;
this.rightStr = data.group_arr[0]?.text_arr[0]?.value; this.rightPic = data.group_arr[0]?.image_arr[1]?.value;
this.letfStr = data.group_arr[0]?.text_arr[1]?.value; this.letfPic = data.group_arr[0]?.image_arr[0]?.value;
this.rightPic = data.group_arr[0]?.image_arr[0]?.value; cc.log("=============data===============")
this.letfPic = data.group_arr[0]?.image_arr[1]?.value; cc.log("resultStr:" + this.resultStr)
cc.log("resultPic:" + this.resultPic)
cc.log("rightStr:" + this.rightStr)
cc.log("letfStr:" + this.letfStr)
cc.log("rightPic:" + this.rightPic)
cc.log("letfPic:" + this.letfPic)
} }
initRoundView() { initRoundView() {
if (this.resultStr) { if (this.resultStr) {
this.bigpao.getChildByName("root").getChildByName("lb").active = true;
this.bigpao.getChildByName("root").getChildByName("lb").getComponent(cc.Label).string = this.resultStr;
this.bigpao.getChildByName("lb").getComponent(cc.Label).string = this.resultStr; } else {
this.bigpao.getChildByName("root").getChildByName("lb").active = false;
} }
if (this.resultPic) { if (this.resultPic) {
this.bigpao.getChildByName("root").getChildByName("icon").active = true
getSpriteFrimeByUrl(this.rightPic, (spf) => { this.bigpao.getChildByName("root").getChildByName("icon").getComponent(cc.Sprite).spriteFrame = null;
this.bigpao.getChildByName("icon").getComponent(cc.Sprite).spriteFrame = spf; getSpriteFrimeByUrl(this.resultPic, (spf) => {
this.bigpao.getChildByName("root").getChildByName("icon").getComponent(cc.Sprite).spriteFrame = spf;
}) })
} else {
this.bigpao.getChildByName("root").getChildByName("icon").active = false
} }
if (this.rightStr) { if (this.rightStr) {
this.rightBox.active = true; this.rightBox.active = true;
this.rightStrNode.active = true;
this.rightStrNode.getComponent(cc.Label).string = this.rightStr; this.rightStrNode.getComponent(cc.Label).string = this.rightStr;
} else {
this.rightStrNode.active = false;
} }
if (this.letfStr) { if (this.letfStr) {
this.leftBox.active = true; this.leftBox.active = true;
this.leftStrNode.active = true;
this.leftStrNode.getComponent(cc.Label).string = this.letfStr; this.leftStrNode.getComponent(cc.Label).string = this.letfStr;
} else {
this.leftStrNode.active = false;
} }
if (this.rightPic) { if (this.rightPic) {
this.rightBox.active = true;
this.rightPicNode.active = true;
this.rightPicNode.getComponent(cc.Sprite).spriteFrame = null;
getSpriteFrimeByUrl(this.rightPic, (spf) => { getSpriteFrimeByUrl(this.rightPic, (spf) => {
this.rightPicNode.getComponent(cc.Sprite).spriteFrame = spf; this.rightPicNode.getComponent(cc.Sprite).spriteFrame = spf;
this.rightPicNode.scale = Math.min(280 / this.rightPicNode.width, 240 / this.rightPicNode.height) this.rightPicNode.scale = Math.min(280 / this.rightPicNode.width, 240 / this.rightPicNode.height)
}) })
} else {
this.rightPicNode.active = false;
} }
if (this.letfPic) { if (this.letfPic) {
this.leftBox.active = true;
this.leftPicNode.active = true;
this.leftPicNode.getComponent(cc.Sprite).spriteFrame = null;
getSpriteFrimeByUrl(this.letfPic, (spf) => { getSpriteFrimeByUrl(this.letfPic, (spf) => {
this.leftPicNode.getComponent(cc.Sprite).spriteFrame = spf; this.leftPicNode.getComponent(cc.Sprite).spriteFrame = spf;
this.leftPicNode.scale = Math.min(280 / this.leftPicNode.width, 240 / this.leftPicNode.height) this.leftPicNode.scale = Math.min(280 / this.leftPicNode.width, 240 / this.leftPicNode.height)
}) })
} else {
this.leftPicNode.active = false;
} }
} }
initListener() { initListener() {
......
...@@ -4,34 +4,66 @@ export const defaultData = ...@@ -4,34 +4,66 @@ export const defaultData =
{ {
"text_arr": [ "text_arr": [
{ {
"value": "police officer" "value": "tree house"
} }
], ],
"anim_arr": [], "anim_arr": [],
"image_arr": [ "image_arr": [],
"audio_arr": [
{
"value": "http://staging-teach.cdn.ireadabc.com/09478cf67b92f742576faa352843b352.mp3"
},
{ {
"value": "http://staging-teach.cdn.ireadabc.com/8eedbd4f65189b4029ac0a3364e27628.png" "value": "http://staging-teach.cdn.ireadabc.com/80e065274b51e1899b7ae60a0e3fc2dd.mp3"
} }
], ],
"audio_arr": [],
"video_arr": [], "video_arr": [],
"group_arr": [ "group_arr": [
{ {
"text_arr": [ "text_arr": [
{ {
"value": "police" "value": "tree"
}, },
{ {
"value": "officer" "value": "house"
} }
], ],
"anim_arr": [], "anim_arr": [],
"image_arr": [ "image_arr": [
{ {
"value": "http://staging-teach.cdn.ireadabc.com/8665e52ed373c524f55743bd21e7d606.png" "value": "http://staging-teach.cdn.ireadabc.com/b12b8c8f04c1b17915a2457cf6fb63a7.png"
},
{
"value": "http://staging-teach.cdn.ireadabc.com/e1a7be51cbf0298630abf00f712eb7f7.png"
}
],
"audio_arr": [],
"video_arr": [],
"group_arr": []
}
]
}, },
{ {
"value": "http://staging-teach.cdn.ireadabc.com/063784f68bdbb03a37d0e52b481a8095.png" "text_arr": [],
"anim_arr": [],
"image_arr": [
{
"value": "http://staging-teach.cdn.ireadabc.com/0e9cd5cadfd84c93dbdf166fb34546fe.png"
}
],
"audio_arr": [],
"video_arr": [],
"group_arr": [
{
"text_arr": [
{
"value": "house"
}
],
"anim_arr": [],
"image_arr": [
{
"value": "http://staging-teach.cdn.ireadabc.com/a04e56abefd5829357eceba26bff2377.png"
} }
], ],
"audio_arr": [], "audio_arr": [],
...@@ -43,13 +75,13 @@ export const defaultData = ...@@ -43,13 +75,13 @@ export const defaultData =
{ {
"text_arr": [ "text_arr": [
{ {
"value": "police officer" "value": "mud house"
} }
], ],
"anim_arr": [], "anim_arr": [],
"image_arr": [ "image_arr": [
{ {
"value": "http://staging-teach.cdn.ireadabc.com/8eedbd4f65189b4029ac0a3364e27628.png" "value": "http://staging-teach.cdn.ireadabc.com/117d58acf9dfe9018f77b1428003cdb7.png"
} }
], ],
"audio_arr": [], "audio_arr": [],
...@@ -58,16 +90,18 @@ export const defaultData = ...@@ -58,16 +90,18 @@ export const defaultData =
{ {
"text_arr": [ "text_arr": [
{ {
"value": "police" "value": ""
}, },
{
"value": "house"
}
], ],
"anim_arr": [], "anim_arr": [],
"image_arr": [ "image_arr": [
{ {
"value": "http://staging-teach.cdn.ireadabc.com/8665e52ed373c524f55743bd21e7d606.png" "value": "http://staging-teach.cdn.ireadabc.com/afcc6f29845c2c4377c86102cb86fd15.png"
}, },
{}
], ],
"audio_arr": [], "audio_arr": [],
"video_arr": [], "video_arr": [],
...@@ -76,7 +110,106 @@ export const defaultData = ...@@ -76,7 +110,106 @@ export const defaultData =
] ]
} }
], ],
"audio_url_guide": "http://staging-teach.cdn.ireadabc.com/4c8ade54b7a1ff2192f066e64d6579b0_l.mp3", "global_setting": [
"audio_url_success": "http://staging-teach.cdn.ireadabc.com/067b86719184f5a2fee78f4fbc640e76_l.mp3", {
"text_arr": [
{
"value": "去交际广场"
}
],
"anim_arr": [],
"image_arr": [],
"audio_arr": [
{
"value": "http://staging-teach.cdn.ireadabc.com/e66bac8d77385b01ce180987c9a0c601.mp3"
},
{
"value": "http://staging-teach.cdn.ireadabc.com/9541b250b13a284ca28abf87ab0bdedb.mp3"
}
],
"video_arr": [],
"group_arr": []
}
]
} }
// {
// "group_arr": [
// {
// "text_arr": [
// {
// "value": "police officer"
// }
// ],
// "anim_arr": [],
// "image_arr": [
// {
// "value": "http://staging-teach.cdn.ireadabc.com/8eedbd4f65189b4029ac0a3364e27628.png"
// }
// ],
// "audio_arr": [],
// "video_arr": [],
// "group_arr": [
// {
// "text_arr": [
// {
// "value": "police"
// },
// {
// "value": "officer"
// }
// ],
// "anim_arr": [],
// "image_arr": [
// {
// "value": ""//"http://staging-teach.cdn.ireadabc.com/8665e52ed373c524f55743bd21e7d606.png"
// },
// {
// "value": "http://staging-teach.cdn.ireadabc.com/063784f68bdbb03a37d0e52b481a8095.png"
// }
// ],
// "audio_arr": [],
// "video_arr": [],
// "group_arr": []
// }
// ]
// },
// {
// "text_arr": [
// {
// "value": "police officer"
// }
// ],
// "anim_arr": [],
// "image_arr": [
// {
// "value": "http://staging-teach.cdn.ireadabc.com/8eedbd4f65189b4029ac0a3364e27628.png"
// }
// ],
// "audio_arr": [],
// "video_arr": [],
// "group_arr": [
// {
// "text_arr": [
// // {
// // "value": "police"
// // },
// ],
// "anim_arr": [],
// "image_arr": [
// {
// "value": "http://staging-teach.cdn.ireadabc.com/8665e52ed373c524f55743bd21e7d606.png"
// },
// ],
// "audio_arr": [],
// "video_arr": [],
// "group_arr": []
// }
// ]
// }
// ],
// "audio_url_guide": "http://staging-teach.cdn.ireadabc.com/4c8ade54b7a1ff2192f066e64d6579b0_l.mp3",
// "audio_url_success": "http://staging-teach.cdn.ireadabc.com/067b86719184f5a2fee78f4fbc640e76_l.mp3",
// }
\ No newline at end of file
...@@ -416,3 +416,13 @@ export function getMinLv(num) { ...@@ -416,3 +416,13 @@ export function getMinLv(num) {
} }
} }
export function goNextPage() {
if (!cc.find('middleLayer')) {
console.log("==点击了下一页按钮==")
return;
}
const middleLayer = cc.find('middleLayer').getComponent('middleLayer');
middleLayer.goNextPage();
}
{
"ver": "2.3.5",
"uuid": "a742d2c4-7f12-46f8-8166-1f9f6e34a0f6",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 1920,
"height": 78,
"platformSettings": {},
"subMetas": {
"DG23_bottom": {
"ver": "1.0.4",
"uuid": "cd2418c1-5066-42a5-9361-bc82d74df61b",
"rawTextureUuid": "a742d2c4-7f12-46f8-8166-1f9f6e34a0f6",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1920,
"height": 78,
"rawWidth": 1920,
"rawHeight": 78,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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