Commit 95c93499 authored by Tt's avatar Tt

修改

parent 9f6aed56
...@@ -144,79 +144,79 @@ ...@@ -144,79 +144,79 @@
"__id__": 113 "__id__": 113
}, },
{ {
"__id__": 126 "__id__": 124
},
{
"__id__": 136
}, },
{ {
"__id__": 138 "__id__": 138
}, },
{ {
"__id__": 140 "__id__": 144
}, },
{ {
"__id__": 146 "__id__": 151
}, },
{ {
"__id__": 153 "__id__": 158
}, },
{ {
"__id__": 160 "__id__": 185
}, },
{ {
"__id__": 187 "__id__": 206
}, },
{ {
"__id__": 208 "__id__": 208
}, },
{ {
"__id__": 210 "__id__": 209
}, },
{ {
"__id__": 211 "__id__": 217
}, },
{ {
"__id__": 219 "__id__": 218
}, },
{ {
"__id__": 220 "__id__": 238
}, },
{ {
"__id__": 240 "__id__": 240
}, },
{ {
"__id__": 242 "__id__": 244
}, },
{ {
"__id__": 246 "__id__": 247
}, },
{ {
"__id__": 249 "__id__": 248
}, },
{ {
"__id__": 250 "__id__": 249
}, },
{ {
"__id__": 251 "__id__": 251
}, },
{ {
"__id__": 253 "__id__": 257
},
{
"__id__": 259
}, },
{ {
"__id__": 272 "__id__": 270
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 298 "__id__": 296
}, },
{ {
"__id__": 299 "__id__": 297
}, },
{ {
"__id__": 300 "__id__": 298
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3360,8 +3360,8 @@ ...@@ -3360,8 +3360,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 49, "width": 100,
"height": 49 "height": 100
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3416,7 +3416,7 @@ ...@@ -3416,7 +3416,7 @@
"__uuid__": "cfe19ca9-98be-4c19-90c9-727f3e0b0b94" "__uuid__": "cfe19ca9-98be-4c19-90c9-727f3e0b0b94"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3458,8 +3458,8 @@ ...@@ -3458,8 +3458,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 220, "width": 440,
"height": 124 "height": 248
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3539,8 +3539,8 @@ ...@@ -3539,8 +3539,8 @@
0, 0,
0, 0,
1, 1,
1, 2,
1, 2,
1 1
] ]
}, },
...@@ -3611,7 +3611,7 @@ ...@@ -3611,7 +3611,7 @@
"__uuid__": "0a3bdb9a-cde0-4c7d-ba1b-9e4e2d4d77ba" "__uuid__": "0a3bdb9a-cde0-4c7d-ba1b-9e4e2d4d77ba"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3653,8 +3653,8 @@ ...@@ -3653,8 +3653,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 277, "width": 554,
"height": 124 "height": 248
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3734,8 +3734,8 @@ ...@@ -3734,8 +3734,8 @@
0, 0,
0, 0,
1, 1,
1, 2,
1, 2,
1 1
] ]
}, },
...@@ -3806,7 +3806,7 @@ ...@@ -3806,7 +3806,7 @@
"__uuid__": "4484df43-f358-4ba3-bb4c-7da0f2cbf61d" "__uuid__": "4484df43-f358-4ba3-bb4c-7da0f2cbf61d"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3863,8 +3863,8 @@ ...@@ -3863,8 +3863,8 @@
0, 0,
0, 0,
1, 1,
1, 2,
1, 2,
1 1
] ]
}, },
...@@ -3963,8 +3963,8 @@ ...@@ -3963,8 +3963,8 @@
0, 0,
0, 0,
1, 1,
2, 1,
2, 1,
1 1
] ]
}, },
...@@ -4113,7 +4113,7 @@ ...@@ -4113,7 +4113,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 428, "width": 428,
"height": 124 "height": 250
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4131,8 +4131,8 @@ ...@@ -4131,8 +4131,8 @@
0, 0,
0, 0,
1, 1,
2, 1,
2, 1,
1 1
] ]
}, },
...@@ -4160,7 +4160,7 @@ ...@@ -4160,7 +4160,7 @@
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 428, "width": 428,
"height": 124 "height": 250
}, },
"_resize": 1, "_resize": 1,
"_N$layoutType": 1, "_N$layoutType": 1,
...@@ -4267,8 +4267,8 @@ ...@@ -4267,8 +4267,8 @@
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "4d51a805-5c5d-42f9-9e4c-1410dc4014a3" "__uuid__": "4d51a805-5c5d-42f9-9e4c-1410dc4014a3"
}, },
"_type": 0, "_type": 1,
"_sizeMode": 1, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4310,8 +4310,8 @@ ...@@ -4310,8 +4310,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 124, "width": 248,
"height": 124 "height": 248
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4391,8 +4391,8 @@ ...@@ -4391,8 +4391,8 @@
0, 0,
0, 0,
1, 1,
1, 2,
1, 2,
1 1
] ]
}, },
...@@ -4463,7 +4463,7 @@ ...@@ -4463,7 +4463,7 @@
"__uuid__": "48f2aabb-d6f5-4008-b809-7e16b10101f3" "__uuid__": "48f2aabb-d6f5-4008-b809-7e16b10101f3"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -5542,18 +5542,15 @@ ...@@ -5542,18 +5542,15 @@
}, },
{ {
"__id__": 120 "__id__": 120
},
{
"__id__": 122
} }
], ],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 124 "__id__": 122
}, },
{ {
"__id__": 125 "__id__": 123
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5612,7 +5609,7 @@ ...@@ -5612,7 +5609,7 @@
"__id__": 113 "__id__": 113
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 115 "__id__": 115
...@@ -5718,7 +5715,7 @@ ...@@ -5718,7 +5715,7 @@
"__id__": 117 "__id__": 117
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 119 "__id__": 119
...@@ -5906,7 +5903,7 @@ ...@@ -5906,7 +5903,7 @@
"__id__": 113 "__id__": 113
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 121 "__id__": 121
...@@ -5992,108 +5989,6 @@ ...@@ -5992,108 +5989,6 @@
"_atlas": null, "_atlas": null,
"_id": "77Ktr/JFFJdZEjm+jqed6F" "_id": "77Ktr/JFFJdZEjm+jqed6F"
}, },
{
"__type__": "cc.Node",
"_name": "New Node",
"_objFlags": 0,
"_parent": {
"__id__": 113
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 123
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 46,
"height": 127
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
2,
2,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "b8ZkwQwERPq6+9Z3lAv10C"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 122
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature",
"_animationName": "normal",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "84759aec-66d8-4e1a-a255-ad6174a46111#4cf9326e-9c64-4b95-b162-fa2b1041b592",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "84759aec-66d8-4e1a-a255-ad6174a46111"
},
"_N$dragonAtlasAsset": {
"__uuid__": "4cf9326e-9c64-4b95-b162-fa2b1041b592"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "9boA0YwH5JhIYuwV9YhUmd"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
...@@ -6204,6 +6099,9 @@ ...@@ -6204,6 +6099,9 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 125
},
{ {
"__id__": 127 "__id__": 127
}, },
...@@ -6212,21 +6110,18 @@ ...@@ -6212,21 +6110,18 @@
}, },
{ {
"__id__": 131 "__id__": 131
},
{
"__id__": 133
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 135 "__id__": 133
}, },
{ {
"__id__": 136 "__id__": 134
}, },
{ {
"__id__": 137 "__id__": 135
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6282,13 +6177,13 @@ ...@@ -6282,13 +6177,13 @@
"_name": "icon_recording", "_name": "icon_recording",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 124
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 128 "__id__": 126
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6344,7 +6239,7 @@ ...@@ -6344,7 +6239,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 127 "__id__": 125
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -6376,13 +6271,13 @@ ...@@ -6376,13 +6271,13 @@
"_name": "p0", "_name": "p0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 124
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 130 "__id__": 128
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6438,7 +6333,7 @@ ...@@ -6438,7 +6333,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 129 "__id__": 127
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6470,13 +6365,13 @@ ...@@ -6470,13 +6365,13 @@
"_name": "p1", "_name": "p1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 124
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 132 "__id__": 130
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6532,7 +6427,7 @@ ...@@ -6532,7 +6427,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 131 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6564,13 +6459,13 @@ ...@@ -6564,13 +6459,13 @@
"_name": "p2", "_name": "p2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 124
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 134 "__id__": 132
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6626,7 +6521,7 @@ ...@@ -6626,7 +6521,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 133 "__id__": 131
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6658,7 +6553,7 @@ ...@@ -6658,7 +6553,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 126 "__id__": 124
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6690,7 +6585,7 @@ ...@@ -6690,7 +6585,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 126 "__id__": 124
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -6751,7 +6646,7 @@ ...@@ -6751,7 +6646,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 126 "__id__": 124
}, },
"_id": "feA2HsnyFASLUXjdq0vRse" "_id": "feA2HsnyFASLUXjdq0vRse"
}, },
...@@ -6760,7 +6655,7 @@ ...@@ -6760,7 +6655,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 126 "__id__": 124
}, },
"_enabled": true, "_enabled": true,
"_id": "09R5wk/0NITYGz7Es4tALJ" "_id": "09R5wk/0NITYGz7Es4tALJ"
...@@ -6776,7 +6671,7 @@ ...@@ -6776,7 +6671,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 139 "__id__": 137
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6832,7 +6727,7 @@ ...@@ -6832,7 +6727,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 138 "__id__": 136
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -6868,19 +6763,19 @@ ...@@ -6868,19 +6763,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 141 "__id__": 139
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 143 "__id__": 141
}, },
{ {
"__id__": 144 "__id__": 142
}, },
{ {
"__id__": 145 "__id__": 143
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6936,13 +6831,13 @@ ...@@ -6936,13 +6831,13 @@
"_name": "bar", "_name": "bar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 140 "__id__": 138
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 142 "__id__": 140
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6998,7 +6893,7 @@ ...@@ -6998,7 +6893,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 139
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7030,7 +6925,7 @@ ...@@ -7030,7 +6925,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 140 "__id__": 138
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7062,12 +6957,12 @@ ...@@ -7062,12 +6957,12 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 140 "__id__": 138
}, },
"_enabled": true, "_enabled": true,
"_N$totalLength": 1383.3, "_N$totalLength": 1383.3,
"_N$barSprite": { "_N$barSprite": {
"__id__": 142 "__id__": 140
}, },
"_N$mode": 0, "_N$mode": 0,
"_N$progress": 0, "_N$progress": 0,
...@@ -7079,7 +6974,7 @@ ...@@ -7079,7 +6974,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 140 "__id__": 138
}, },
"_enabled": true, "_enabled": true,
"costtime": 4, "costtime": 4,
...@@ -7094,10 +6989,10 @@ ...@@ -7094,10 +6989,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 147 "__id__": 145
}, },
{ {
"__id__": 150 "__id__": 148
} }
], ],
"_active": false, "_active": false,
...@@ -7155,16 +7050,16 @@ ...@@ -7155,16 +7050,16 @@
"_name": "invalid-name", "_name": "invalid-name",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 146 "__id__": 144
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 148 "__id__": 146
}, },
{ {
"__id__": 149 "__id__": 147
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7220,7 +7115,7 @@ ...@@ -7220,7 +7115,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 145
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7252,7 +7147,7 @@ ...@@ -7252,7 +7147,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 145
}, },
"_enabled": true, "_enabled": true,
"r_width": 1, "r_width": 1,
...@@ -7273,16 +7168,16 @@ ...@@ -7273,16 +7168,16 @@
"_name": "invalid-name_2", "_name": "invalid-name_2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 146 "__id__": 144
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 151 "__id__": 149
}, },
{ {
"__id__": 152 "__id__": 150
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7338,7 +7233,7 @@ ...@@ -7338,7 +7233,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 150 "__id__": 148
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7370,7 +7265,7 @@ ...@@ -7370,7 +7265,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 150 "__id__": 148
}, },
"_enabled": true, "_enabled": true,
"r_width": 1, "r_width": 1,
...@@ -7395,16 +7290,16 @@ ...@@ -7395,16 +7290,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 154 "__id__": 152
}, },
{ {
"__id__": 156 "__id__": 154
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 159 "__id__": 157
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7460,13 +7355,13 @@ ...@@ -7460,13 +7355,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 153 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 155 "__id__": 153
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7522,7 +7417,7 @@ ...@@ -7522,7 +7417,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7554,16 +7449,16 @@ ...@@ -7554,16 +7449,16 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 153 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 157 "__id__": 155
}, },
{ {
"__id__": 158 "__id__": 156
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7619,7 +7514,7 @@ ...@@ -7619,7 +7514,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 156 "__id__": 154
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7654,7 +7549,7 @@ ...@@ -7654,7 +7549,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 156 "__id__": 154
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -7672,7 +7567,7 @@ ...@@ -7672,7 +7567,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 153 "__id__": 151
}, },
"_enabled": true, "_enabled": true,
"r_width": 0, "r_width": 0,
...@@ -7697,22 +7592,22 @@ ...@@ -7697,22 +7592,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 161 "__id__": 159
}, },
{ {
"__id__": 164 "__id__": 162
}, },
{ {
"__id__": 167 "__id__": 165
}, },
{ {
"__id__": 174 "__id__": 172
}, },
{ {
"__id__": 181 "__id__": 179
}, },
{ {
"__id__": 184 "__id__": 182
} }
], ],
"_active": false, "_active": false,
...@@ -7770,11 +7665,11 @@ ...@@ -7770,11 +7665,11 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 160 "__id__": 158
}, },
"_children": [ "_children": [
{ {
"__id__": 162 "__id__": 160
} }
], ],
"_active": true, "_active": true,
...@@ -7832,13 +7727,13 @@ ...@@ -7832,13 +7727,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 161 "__id__": 159
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 163 "__id__": 161
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7894,7 +7789,7 @@ ...@@ -7894,7 +7789,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 162 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7926,11 +7821,11 @@ ...@@ -7926,11 +7821,11 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 160 "__id__": 158
}, },
"_children": [ "_children": [
{ {
"__id__": 165 "__id__": 163
} }
], ],
"_active": true, "_active": true,
...@@ -7988,13 +7883,13 @@ ...@@ -7988,13 +7883,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 164 "__id__": 162
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 166 "__id__": 164
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8050,7 +7945,7 @@ ...@@ -8050,7 +7945,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 165 "__id__": 163
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8082,14 +7977,14 @@ ...@@ -8082,14 +7977,14 @@
"_name": "line2", "_name": "line2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 160 "__id__": 158
}, },
"_children": [ "_children": [
{ {
"__id__": 168 "__id__": 166
}, },
{ {
"__id__": 170 "__id__": 168
} }
], ],
"_active": true, "_active": true,
...@@ -8147,13 +8042,13 @@ ...@@ -8147,13 +8042,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 167 "__id__": 165
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 169 "__id__": 167
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8209,7 +8104,7 @@ ...@@ -8209,7 +8104,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 168 "__id__": 166
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8241,17 +8136,17 @@ ...@@ -8241,17 +8136,17 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 167 "__id__": 165
}, },
"_children": [ "_children": [
{ {
"__id__": 171 "__id__": 169
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 173 "__id__": 171
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8307,13 +8202,13 @@ ...@@ -8307,13 +8202,13 @@
"_name": "combined-shape-copy-2", "_name": "combined-shape-copy-2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 170 "__id__": 168
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 172 "__id__": 170
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8369,7 +8264,7 @@ ...@@ -8369,7 +8264,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 171 "__id__": 169
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8401,7 +8296,7 @@ ...@@ -8401,7 +8296,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 170 "__id__": 168
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8433,14 +8328,14 @@ ...@@ -8433,14 +8328,14 @@
"_name": "line3", "_name": "line3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 160 "__id__": 158
}, },
"_children": [ "_children": [
{ {
"__id__": 175 "__id__": 173
}, },
{ {
"__id__": 177 "__id__": 175
} }
], ],
"_active": true, "_active": true,
...@@ -8498,13 +8393,13 @@ ...@@ -8498,13 +8393,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 174 "__id__": 172
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 176 "__id__": 174
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8560,7 +8455,7 @@ ...@@ -8560,7 +8455,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 175 "__id__": 173
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8592,17 +8487,17 @@ ...@@ -8592,17 +8487,17 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 174 "__id__": 172
}, },
"_children": [ "_children": [
{ {
"__id__": 178 "__id__": 176
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 180 "__id__": 178
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8658,13 +8553,13 @@ ...@@ -8658,13 +8553,13 @@
"_name": "combined-shape-copy-2", "_name": "combined-shape-copy-2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 175
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 179 "__id__": 177
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8720,7 +8615,7 @@ ...@@ -8720,7 +8615,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 178 "__id__": 176
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8752,7 +8647,7 @@ ...@@ -8752,7 +8647,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 177 "__id__": 175
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8784,11 +8679,11 @@ ...@@ -8784,11 +8679,11 @@
"_name": "line4", "_name": "line4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 160 "__id__": 158
}, },
"_children": [ "_children": [
{ {
"__id__": 182 "__id__": 180
} }
], ],
"_active": true, "_active": true,
...@@ -8846,13 +8741,13 @@ ...@@ -8846,13 +8741,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 181 "__id__": 179
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 183 "__id__": 181
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8908,7 +8803,7 @@ ...@@ -8908,7 +8803,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 182 "__id__": 180
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8940,11 +8835,11 @@ ...@@ -8940,11 +8835,11 @@
"_name": "line5", "_name": "line5",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 160 "__id__": 158
}, },
"_children": [ "_children": [
{ {
"__id__": 185 "__id__": 183
} }
], ],
"_active": true, "_active": true,
...@@ -9002,13 +8897,13 @@ ...@@ -9002,13 +8897,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 184 "__id__": 182
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 186 "__id__": 184
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9064,7 +8959,7 @@ ...@@ -9064,7 +8959,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 185 "__id__": 183
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9100,13 +8995,13 @@ ...@@ -9100,13 +8995,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 188 "__id__": 186
}, },
{ {
"__id__": 195 "__id__": 193
}, },
{ {
"__id__": 202 "__id__": 200
} }
], ],
"_active": false, "_active": false,
...@@ -9164,23 +9059,23 @@ ...@@ -9164,23 +9059,23 @@
"_name": "sub_0", "_name": "sub_0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 187 "__id__": 185
}, },
"_children": [ "_children": [
{ {
"__id__": 189 "__id__": 187
}, },
{ {
"__id__": 191 "__id__": 189
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 193 "__id__": 191
}, },
{ {
"__id__": 194 "__id__": 192
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9236,13 +9131,13 @@ ...@@ -9236,13 +9131,13 @@
"_name": "combined-shape_4", "_name": "combined-shape_4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 188 "__id__": 186
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 190 "__id__": 188
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9298,7 +9193,7 @@ ...@@ -9298,7 +9193,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 189 "__id__": 187
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9330,13 +9225,13 @@ ...@@ -9330,13 +9225,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 188 "__id__": 186
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 192 "__id__": 190
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9392,7 +9287,7 @@ ...@@ -9392,7 +9287,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 191 "__id__": 189
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9427,7 +9322,7 @@ ...@@ -9427,7 +9322,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 188 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9459,7 +9354,7 @@ ...@@ -9459,7 +9354,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 188 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -9520,7 +9415,7 @@ ...@@ -9520,7 +9415,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 188 "__id__": 186
}, },
"_id": "e9hETjbwFN6ofBSoo7woie" "_id": "e9hETjbwFN6ofBSoo7woie"
}, },
...@@ -9529,23 +9424,23 @@ ...@@ -9529,23 +9424,23 @@
"_name": "sub_1", "_name": "sub_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 187 "__id__": 185
}, },
"_children": [ "_children": [
{ {
"__id__": 196 "__id__": 194
}, },
{ {
"__id__": 198 "__id__": 196
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 200 "__id__": 198
}, },
{ {
"__id__": 201 "__id__": 199
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9601,13 +9496,13 @@ ...@@ -9601,13 +9496,13 @@
"_name": "combined-shape_3", "_name": "combined-shape_3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 195 "__id__": 193
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 197 "__id__": 195
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9663,7 +9558,7 @@ ...@@ -9663,7 +9558,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 196 "__id__": 194
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9695,13 +9590,13 @@ ...@@ -9695,13 +9590,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 195 "__id__": 193
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 199 "__id__": 197
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9757,7 +9652,7 @@ ...@@ -9757,7 +9652,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 198 "__id__": 196
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9792,7 +9687,7 @@ ...@@ -9792,7 +9687,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 195 "__id__": 193
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9824,7 +9719,7 @@ ...@@ -9824,7 +9719,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 195 "__id__": 193
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -9885,7 +9780,7 @@ ...@@ -9885,7 +9780,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 195 "__id__": 193
}, },
"_id": "8cGgjvgvhL/LuPKRoVnVQq" "_id": "8cGgjvgvhL/LuPKRoVnVQq"
}, },
...@@ -9894,20 +9789,20 @@ ...@@ -9894,20 +9789,20 @@
"_name": "main", "_name": "main",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 187 "__id__": 185
}, },
"_children": [ "_children": [
{ {
"__id__": 203 "__id__": 201
}, },
{ {
"__id__": 205 "__id__": 203
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 207 "__id__": 205
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9963,13 +9858,13 @@ ...@@ -9963,13 +9858,13 @@
"_name": "oval-18", "_name": "oval-18",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 202 "__id__": 200
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 204 "__id__": 202
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10025,7 +9920,7 @@ ...@@ -10025,7 +9920,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 203 "__id__": 201
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10057,13 +9952,13 @@ ...@@ -10057,13 +9952,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 202 "__id__": 200
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 206 "__id__": 204
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10119,7 +10014,7 @@ ...@@ -10119,7 +10014,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 205 "__id__": 203
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10154,7 +10049,7 @@ ...@@ -10154,7 +10049,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 202 "__id__": 200
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10215,7 +10110,7 @@ ...@@ -10215,7 +10110,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 202 "__id__": 200
}, },
"_id": "f41Ic5OXhCRpAxS/kMIRiA" "_id": "f41Ic5OXhCRpAxS/kMIRiA"
}, },
...@@ -10230,7 +10125,7 @@ ...@@ -10230,7 +10125,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 209 "__id__": 207
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10286,7 +10181,7 @@ ...@@ -10286,7 +10181,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 208 "__id__": 206
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10380,19 +10275,19 @@ ...@@ -10380,19 +10275,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 212 "__id__": 210
}, },
{ {
"__id__": 214 "__id__": 212
}, },
{ {
"__id__": 216 "__id__": 214
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 218 "__id__": 216
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10448,13 +10343,13 @@ ...@@ -10448,13 +10343,13 @@
"_name": "bg_blue", "_name": "bg_blue",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 211 "__id__": 209
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 213 "__id__": 211
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10510,7 +10405,7 @@ ...@@ -10510,7 +10405,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 212 "__id__": 210
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10542,13 +10437,13 @@ ...@@ -10542,13 +10437,13 @@
"_name": "bg_green", "_name": "bg_green",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 211 "__id__": 209
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 215 "__id__": 213
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10604,7 +10499,7 @@ ...@@ -10604,7 +10499,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 214 "__id__": 212
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10636,13 +10531,13 @@ ...@@ -10636,13 +10531,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 211 "__id__": 209
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 217 "__id__": 215
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10698,7 +10593,7 @@ ...@@ -10698,7 +10593,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 216 "__id__": 214
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10733,7 +10628,7 @@ ...@@ -10733,7 +10628,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 211 "__id__": 209
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10794,7 +10689,7 @@ ...@@ -10794,7 +10689,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 211 "__id__": 209
}, },
"_id": "176BYmeDpPZ68HlISEHa8t" "_id": "176BYmeDpPZ68HlISEHa8t"
}, },
...@@ -10864,6 +10759,9 @@ ...@@ -10864,6 +10759,9 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 219
},
{ {
"__id__": 221 "__id__": 221
}, },
...@@ -10877,16 +10775,13 @@ ...@@ -10877,16 +10775,13 @@
"__id__": 227 "__id__": 227
}, },
{ {
"__id__": 229 "__id__": 231
},
{
"__id__": 233
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 239 "__id__": 237
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10942,13 +10837,13 @@ ...@@ -10942,13 +10837,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 220 "__id__": 218
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 222 "__id__": 220
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11004,7 +10899,7 @@ ...@@ -11004,7 +10899,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 221 "__id__": 219
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11036,13 +10931,13 @@ ...@@ -11036,13 +10931,13 @@
"_name": "chose", "_name": "chose",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 220 "__id__": 218
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 224 "__id__": 222
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11098,7 +10993,7 @@ ...@@ -11098,7 +10993,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 223 "__id__": 221
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11130,13 +11025,13 @@ ...@@ -11130,13 +11025,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 220 "__id__": 218
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 226 "__id__": 224
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11192,7 +11087,7 @@ ...@@ -11192,7 +11087,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 225 "__id__": 223
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11224,13 +11119,13 @@ ...@@ -11224,13 +11119,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 220 "__id__": 218
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 228 "__id__": 226
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11286,7 +11181,7 @@ ...@@ -11286,7 +11181,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 227 "__id__": 225
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11321,17 +11216,17 @@ ...@@ -11321,17 +11216,17 @@
"_name": "fail", "_name": "fail",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 220 "__id__": 218
}, },
"_children": [ "_children": [
{ {
"__id__": 230 "__id__": 228
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 232 "__id__": 230
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11387,13 +11282,13 @@ ...@@ -11387,13 +11282,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 229 "__id__": 227
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 231 "__id__": 229
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11449,7 +11344,7 @@ ...@@ -11449,7 +11344,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 230 "__id__": 228
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11484,7 +11379,7 @@ ...@@ -11484,7 +11379,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 229 "__id__": 227
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11516,20 +11411,20 @@ ...@@ -11516,20 +11411,20 @@
"_name": "success", "_name": "success",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 220 "__id__": 218
}, },
"_children": [ "_children": [
{ {
"__id__": 234 "__id__": 232
}, },
{ {
"__id__": 236 "__id__": 234
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 238 "__id__": 236
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11585,13 +11480,13 @@ ...@@ -11585,13 +11480,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 233 "__id__": 231
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 235 "__id__": 233
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11647,7 +11542,7 @@ ...@@ -11647,7 +11542,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 234 "__id__": 232
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11682,13 +11577,13 @@ ...@@ -11682,13 +11577,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 233 "__id__": 231
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 237 "__id__": 235
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11744,7 +11639,7 @@ ...@@ -11744,7 +11639,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 236 "__id__": 234
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11776,7 +11671,7 @@ ...@@ -11776,7 +11671,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 233 "__id__": 231
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11808,7 +11703,7 @@ ...@@ -11808,7 +11703,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 220 "__id__": 218
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -11869,7 +11764,7 @@ ...@@ -11869,7 +11764,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 220 "__id__": 218
}, },
"_id": "58IQ76yf1KT71BqZoNtHOV" "_id": "58IQ76yf1KT71BqZoNtHOV"
}, },
...@@ -11884,7 +11779,7 @@ ...@@ -11884,7 +11779,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 241 "__id__": 239
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11940,7 +11835,7 @@ ...@@ -11940,7 +11835,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 240 "__id__": 238
}, },
"_enabled": true, "_enabled": true,
"r_width": 0, "r_width": 0,
...@@ -11967,13 +11862,13 @@ ...@@ -11967,13 +11862,13 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 243 "__id__": 241
}, },
{ {
"__id__": 244 "__id__": 242
}, },
{ {
"__id__": 245 "__id__": 243
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12029,7 +11924,7 @@ ...@@ -12029,7 +11924,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 242 "__id__": 240
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12061,7 +11956,7 @@ ...@@ -12061,7 +11956,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 242 "__id__": 240
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -12122,7 +12017,7 @@ ...@@ -12122,7 +12017,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 242 "__id__": 240
}, },
"_id": "86ErSTSUhP26kFUGhhqqPn" "_id": "86ErSTSUhP26kFUGhhqqPn"
}, },
...@@ -12131,7 +12026,7 @@ ...@@ -12131,7 +12026,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 242 "__id__": 240
}, },
"_enabled": true, "_enabled": true,
"r_width": 0, "r_width": 0,
...@@ -12158,10 +12053,10 @@ ...@@ -12158,10 +12053,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 247 "__id__": 245
}, },
{ {
"__id__": 248 "__id__": 246
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12217,7 +12112,7 @@ ...@@ -12217,7 +12112,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 246 "__id__": 244
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -12249,7 +12144,7 @@ ...@@ -12249,7 +12144,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 246 "__id__": 244
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -12398,7 +12293,7 @@ ...@@ -12398,7 +12293,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 252 "__id__": 250
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12454,7 +12349,7 @@ ...@@ -12454,7 +12349,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 251 "__id__": 249
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12498,13 +12393,13 @@ ...@@ -12498,13 +12393,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 254 "__id__": 252
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 258 "__id__": 256
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12560,17 +12455,17 @@ ...@@ -12560,17 +12455,17 @@
"_name": "Star", "_name": "Star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 253 "__id__": 251
}, },
"_children": [ "_children": [
{ {
"__id__": 255 "__id__": 253
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 257 "__id__": 255
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12626,13 +12521,13 @@ ...@@ -12626,13 +12521,13 @@
"_name": "StarBig", "_name": "StarBig",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 254 "__id__": 252
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 256 "__id__": 254
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12688,7 +12583,7 @@ ...@@ -12688,7 +12583,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 255 "__id__": 253
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12720,7 +12615,7 @@ ...@@ -12720,7 +12615,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 254 "__id__": 252
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12752,7 +12647,7 @@ ...@@ -12752,7 +12647,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 253 "__id__": 251
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12787,6 +12682,9 @@ ...@@ -12787,6 +12682,9 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 258
},
{ {
"__id__": 260 "__id__": 260
}, },
...@@ -12801,9 +12699,6 @@ ...@@ -12801,9 +12699,6 @@
}, },
{ {
"__id__": 268 "__id__": 268
},
{
"__id__": 270
} }
], ],
"_active": false, "_active": false,
...@@ -12861,13 +12756,13 @@ ...@@ -12861,13 +12756,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 259 "__id__": 257
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 261 "__id__": 259
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12923,7 +12818,7 @@ ...@@ -12923,7 +12818,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 260 "__id__": 258
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12955,13 +12850,13 @@ ...@@ -12955,13 +12850,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 259 "__id__": 257
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 263 "__id__": 261
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13017,7 +12912,7 @@ ...@@ -13017,7 +12912,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 262 "__id__": 260
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13049,13 +12944,13 @@ ...@@ -13049,13 +12944,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 259 "__id__": 257
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 265 "__id__": 263
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13111,7 +13006,7 @@ ...@@ -13111,7 +13006,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 264 "__id__": 262
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13143,13 +13038,13 @@ ...@@ -13143,13 +13038,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 259 "__id__": 257
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 267 "__id__": 265
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13205,7 +13100,7 @@ ...@@ -13205,7 +13100,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 266 "__id__": 264
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13237,13 +13132,13 @@ ...@@ -13237,13 +13132,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 259 "__id__": 257
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 269 "__id__": 267
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13299,7 +13194,7 @@ ...@@ -13299,7 +13194,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 268 "__id__": 266
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13331,13 +13226,13 @@ ...@@ -13331,13 +13226,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 259 "__id__": 257
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 271 "__id__": 269
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13393,7 +13288,7 @@ ...@@ -13393,7 +13288,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 270 "__id__": 268
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13429,19 +13324,19 @@ ...@@ -13429,19 +13324,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 273 "__id__": 271
}, },
{ {
"__id__": 278 "__id__": 276
}, },
{ {
"__id__": 283 "__id__": 281
}, },
{ {
"__id__": 288 "__id__": 286
}, },
{ {
"__id__": 293 "__id__": 291
} }
], ],
"_active": false, "_active": false,
...@@ -13499,11 +13394,11 @@ ...@@ -13499,11 +13394,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 272 "__id__": 270
}, },
"_children": [ "_children": [
{ {
"__id__": 274 "__id__": 272
} }
], ],
"_active": true, "_active": true,
...@@ -13561,17 +13456,17 @@ ...@@ -13561,17 +13456,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 273 "__id__": 271
}, },
"_children": [ "_children": [
{ {
"__id__": 275 "__id__": 273
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 277 "__id__": 275
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13627,13 +13522,13 @@ ...@@ -13627,13 +13522,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 274 "__id__": 272
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 276 "__id__": 274
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13689,7 +13584,7 @@ ...@@ -13689,7 +13584,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 275 "__id__": 273
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13721,7 +13616,7 @@ ...@@ -13721,7 +13616,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 274 "__id__": 272
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13743,11 +13638,11 @@ ...@@ -13743,11 +13638,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 272 "__id__": 270
}, },
"_children": [ "_children": [
{ {
"__id__": 279 "__id__": 277
} }
], ],
"_active": true, "_active": true,
...@@ -13805,17 +13700,17 @@ ...@@ -13805,17 +13700,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 278 "__id__": 276
}, },
"_children": [ "_children": [
{ {
"__id__": 280 "__id__": 278
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 282 "__id__": 280
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13871,13 +13766,13 @@ ...@@ -13871,13 +13766,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 279 "__id__": 277
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 281 "__id__": 279
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13933,7 +13828,7 @@ ...@@ -13933,7 +13828,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 280 "__id__": 278
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13965,7 +13860,7 @@ ...@@ -13965,7 +13860,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 279 "__id__": 277
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13987,11 +13882,11 @@ ...@@ -13987,11 +13882,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 272 "__id__": 270
}, },
"_children": [ "_children": [
{ {
"__id__": 284 "__id__": 282
} }
], ],
"_active": true, "_active": true,
...@@ -14049,17 +13944,17 @@ ...@@ -14049,17 +13944,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 283 "__id__": 281
}, },
"_children": [ "_children": [
{ {
"__id__": 285 "__id__": 283
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 287 "__id__": 285
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14115,13 +14010,13 @@ ...@@ -14115,13 +14010,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 284 "__id__": 282
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 286 "__id__": 284
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14177,7 +14072,7 @@ ...@@ -14177,7 +14072,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 285 "__id__": 283
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14209,7 +14104,7 @@ ...@@ -14209,7 +14104,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 284 "__id__": 282
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14231,11 +14126,11 @@ ...@@ -14231,11 +14126,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 272 "__id__": 270
}, },
"_children": [ "_children": [
{ {
"__id__": 289 "__id__": 287
} }
], ],
"_active": true, "_active": true,
...@@ -14293,17 +14188,17 @@ ...@@ -14293,17 +14188,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 288 "__id__": 286
}, },
"_children": [ "_children": [
{ {
"__id__": 290 "__id__": 288
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 292 "__id__": 290
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14359,13 +14254,13 @@ ...@@ -14359,13 +14254,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 289 "__id__": 287
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 291 "__id__": 289
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14421,7 +14316,7 @@ ...@@ -14421,7 +14316,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 290 "__id__": 288
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14453,7 +14348,7 @@ ...@@ -14453,7 +14348,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 289 "__id__": 287
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14475,11 +14370,11 @@ ...@@ -14475,11 +14370,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 272 "__id__": 270
}, },
"_children": [ "_children": [
{ {
"__id__": 294 "__id__": 292
} }
], ],
"_active": true, "_active": true,
...@@ -14537,17 +14432,17 @@ ...@@ -14537,17 +14432,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 293 "__id__": 291
}, },
"_children": [ "_children": [
{ {
"__id__": 295 "__id__": 293
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 297 "__id__": 295
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14603,13 +14498,13 @@ ...@@ -14603,13 +14498,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 294 "__id__": 292
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 296 "__id__": 294
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14665,7 +14560,7 @@ ...@@ -14665,7 +14560,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 295 "__id__": 293
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14697,7 +14592,7 @@ ...@@ -14697,7 +14592,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 294 "__id__": 292
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -570,12 +570,14 @@ cc.Class({ ...@@ -570,12 +570,14 @@ cc.Class({
pg.audio.playAudioByUrlCall(this._stageData.sound).then((id) => { pg.audio.playAudioByUrlCall(this._stageData.sound).then((id) => {
audioFinished = true; audioFinished = true;
let time = cc.audioEngine.getDuration(id); let time = cc.audioEngine.getDuration(id);
this.showSliderAction(time).then(() => { this.showCardAction(time + 1).then(() => {
this.showSliderAction(1).then(() => {
if (aniFinished && audioFinished) { if (aniFinished && audioFinished) {
this._playing = false; this._playing = false;
resolve(''); resolve('');
} }
}); });
});
}) })
} else { } else {
this._timeoutIds.push(setTimeout(() => { this._timeoutIds.push(setTimeout(() => {
...@@ -594,14 +596,16 @@ cc.Class({ ...@@ -594,14 +596,16 @@ cc.Class({
pg.audio.playAudioByUrlCall(this._stageData.sound).then((id) => { pg.audio.playAudioByUrlCall(this._stageData.sound).then((id) => {
audioFinished = true; audioFinished = true;
let time = cc.audioEngine.getDuration(id); let time = cc.audioEngine.getDuration(id);
this.showSliderAction(time).then(() => { this.showCardAction(time + 1).then(() => {
this.showSliderAction(1).then(() => {
if (aniFinished && audioFinished) { if (aniFinished && audioFinished) {
this._playing = false; this._playing = false;
resolve(''); resolve('');
} }
}); });
}) })
}, 1000 * 2)); })
}, 1000));
} }
}); });
}, },
...@@ -696,7 +700,7 @@ cc.Class({ ...@@ -696,7 +700,7 @@ cc.Class({
slider.action = true; slider.action = true;
layout_card.removeAllChildren(); layout_card.removeAllChildren();
layout_normal.removeAllChildren(); layout_normal.removeAllChildren();
layout_card.opacity = 255; layout_card.opacity = 1;
layout_normal.opacity = 0; layout_normal.opacity = 0;
let r = [239, 0, 135]; let r = [239, 0, 135];
let l = [2, 171, 241]; let l = [2, 171, 241];
...@@ -731,11 +735,37 @@ cc.Class({ ...@@ -731,11 +735,37 @@ cc.Class({
laebl.active = true; laebl.active = true;
} }
}) })
layout_card.getComponent(cc.Layout).updateLayout();
setTimeout(() => { setTimeout(() => {
card_bg2.width = layout_card.width; let size = this.node.width;
let lWidth = layout_card.width;
if (lWidth > size - 300) {
layout_card.scale = size / lWidth - 0.05;
}
layout_card.opacity = 255;
// card_bg2.width = layout_card.width;
}, 60); }, 60);
}, },
showCardAction(time) {
return new Promise(async (resolve, reject) => {
let layout_card = cc.find("card_group/layout_card", this.node);
let len = layout_card.children.length
let content = this._stageData.word;
let t = time / content.length;
for (let i = 0; i < len; i++) {
let card = layout_card.children[i];
if (card.name == "add") continue;
await this.cardAction(card, t);
}
return resolve("")
});
},
cardAction(card, time) {
return new Promise((resolve, reject) => {
cc.tween(card).to(time / 2, { scale: 1.1 }).to(time / 2, { scale: 1 }).call(() => { return resolve("") }).start();
});
},
showSliderAction(time) { showSliderAction(time) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let card_group = cc.find("card_group", this.node); let card_group = cc.find("card_group", this.node);
...@@ -756,8 +786,10 @@ cc.Class({ ...@@ -756,8 +786,10 @@ cc.Class({
.to(t, { progress: 0.9 }).call(() => { this.setCardColor(sl.progress); }) .to(t, { progress: 0.9 }).call(() => { this.setCardColor(sl.progress); })
.to(t, { progress: 1 }).call(() => { .to(t, { progress: 1 }).call(() => {
this.setCardColor(sl.progress); this.setCardColor(sl.progress);
this._timeoutIds.push(setTimeout(() => {
this.hideBox(); this.hideBox();
return resolve("") return resolve("")
}, 1000))
}) })
.start(); .start();
}); });
......
...@@ -26,7 +26,15 @@ export const defaultData = { ...@@ -26,7 +26,15 @@ export const defaultData = {
{ {
"card": "le", "card": "le",
"color": 1 "color": 1
} },
{
"card": "pp",
"color": 1
},
{
"card": "le",
"color": 1
},
], ],
"bgImg": "http://staging-teach.cdn.ireadabc.com/97e19da9309e4e5aafca5ea2e9db8f46.png", "bgImg": "http://staging-teach.cdn.ireadabc.com/97e19da9309e4e5aafca5ea2e9db8f46.png",
"wordAudio": "http://staging-teach.cdn.ireadabc.com/ab3538f7d4d57ac1abd740bd32f06b2d.mp3", "wordAudio": "http://staging-teach.cdn.ireadabc.com/ab3538f7d4d57ac1abd740bd32f06b2d.mp3",
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</div> </div>
</div> </div>
<div> <!-- <div>
<div class="border"> <div class="border">
<div style="width: 100%; align-items:center;"> <div style="width: 100%; align-items:center;">
<div class="item-box" style="width: 50%;height:200px; margin-left: 25%; margin-top: 10%;"> <div class="item-box" style="width: 50%;height:200px; margin-left: 25%; margin-top: 10%;">
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</div> </div>
</div> </div>
</div> </div> -->
<!-- http://localhost:4200/?type=form <!-- http://localhost:4200/?type=form
一组游戏 一组游戏
一个图片动画 一个图片动画
......
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