Commit 890a12a3 authored by Tt's avatar Tt

xiugai

parent 95c93499
......@@ -144,79 +144,79 @@
"__id__": 113
},
{
"__id__": 124
},
{
"__id__": 136
"__id__": 126
},
{
"__id__": 138
},
{
"__id__": 144
"__id__": 140
},
{
"__id__": 151
"__id__": 146
},
{
"__id__": 158
"__id__": 153
},
{
"__id__": 185
"__id__": 160
},
{
"__id__": 206
"__id__": 187
},
{
"__id__": 208
},
{
"__id__": 209
"__id__": 210
},
{
"__id__": 217
"__id__": 211
},
{
"__id__": 218
"__id__": 219
},
{
"__id__": 238
"__id__": 220
},
{
"__id__": 240
},
{
"__id__": 244
"__id__": 242
},
{
"__id__": 247
"__id__": 246
},
{
"__id__": 248
"__id__": 249
},
{
"__id__": 249
"__id__": 250
},
{
"__id__": 251
},
{
"__id__": 257
"__id__": 253
},
{
"__id__": 270
"__id__": 259
},
{
"__id__": 272
}
],
"_active": true,
"_components": [
{
"__id__": 296
"__id__": 298
},
{
"__id__": 297
"__id__": 299
},
{
"__id__": 298
"__id__": 300
}
],
"_prefab": null,
......@@ -3520,7 +3520,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"width": 190,
"height": 126
},
"_anchorPoint": {
......@@ -3715,7 +3715,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"width": 260,
"height": 126
},
"_anchorPoint": {
......@@ -4174,7 +4174,7 @@
"_N$paddingRight": 25,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 15,
"_N$spacingX": 25,
"_N$spacingY": 0,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
......@@ -5542,15 +5542,18 @@
},
{
"__id__": 120
},
{
"__id__": 122
}
],
"_active": false,
"_components": [
{
"__id__": 122
"__id__": 124
},
{
"__id__": 123
"__id__": 125
}
],
"_prefab": null,
......@@ -5609,7 +5612,7 @@
"__id__": 113
},
"_children": [],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 115
......@@ -5715,7 +5718,7 @@
"__id__": 117
}
],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 119
......@@ -5903,7 +5906,7 @@
"__id__": 113
},
"_children": [],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 121
......@@ -5989,6 +5992,108 @@
"_atlas": null,
"_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": "4aMs3wutNGtJY0nU1Wec12"
},
{
"__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": "04rakuPwpIDbdGHU2u662a"
},
{
"__type__": "cc.Sprite",
"_name": "",
......@@ -6099,9 +6204,6 @@
"__id__": 2
},
"_children": [
{
"__id__": 125
},
{
"__id__": 127
},
......@@ -6110,18 +6212,21 @@
},
{
"__id__": 131
},
{
"__id__": 133
}
],
"_active": false,
"_components": [
{
"__id__": 133
"__id__": 135
},
{
"__id__": 134
"__id__": 136
},
{
"__id__": 135
"__id__": 137
}
],
"_prefab": null,
......@@ -6177,13 +6282,13 @@
"_name": "icon_recording",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 126
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 126
"__id__": 128
}
],
"_prefab": null,
......@@ -6239,7 +6344,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 125
"__id__": 127
},
"_enabled": false,
"_materials": [
......@@ -6271,13 +6376,13 @@
"_name": "p0",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 126
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 128
"__id__": 130
}
],
"_prefab": null,
......@@ -6333,7 +6438,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 129
},
"_enabled": true,
"_materials": [
......@@ -6365,13 +6470,13 @@
"_name": "p1",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 126
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 130
"__id__": 132
}
],
"_prefab": null,
......@@ -6427,7 +6532,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 129
"__id__": 131
},
"_enabled": true,
"_materials": [
......@@ -6459,13 +6564,13 @@
"_name": "p2",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 126
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 132
"__id__": 134
}
],
"_prefab": null,
......@@ -6521,7 +6626,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 131
"__id__": 133
},
"_enabled": true,
"_materials": [
......@@ -6553,7 +6658,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 126
},
"_enabled": true,
"_materials": [
......@@ -6585,7 +6690,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 126
},
"_enabled": true,
"_normalMaterial": null,
......@@ -6646,7 +6751,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 124
"__id__": 126
},
"_id": "feA2HsnyFASLUXjdq0vRse"
},
......@@ -6655,7 +6760,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 126
},
"_enabled": true,
"_id": "09R5wk/0NITYGz7Es4tALJ"
......@@ -6671,7 +6776,7 @@
"_active": false,
"_components": [
{
"__id__": 137
"__id__": 139
}
],
"_prefab": null,
......@@ -6727,7 +6832,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 136
"__id__": 138
},
"_enabled": false,
"_materials": [
......@@ -6763,19 +6868,19 @@
},
"_children": [
{
"__id__": 139
"__id__": 141
}
],
"_active": false,
"_components": [
{
"__id__": 141
"__id__": 143
},
{
"__id__": 142
"__id__": 144
},
{
"__id__": 143
"__id__": 145
}
],
"_prefab": null,
......@@ -6831,13 +6936,13 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
"__id__": 138
"__id__": 140
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 140
"__id__": 142
}
],
"_prefab": null,
......@@ -6893,7 +6998,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 139
"__id__": 141
},
"_enabled": true,
"_materials": [
......@@ -6925,7 +7030,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 140
},
"_enabled": true,
"_materials": [
......@@ -6957,12 +7062,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 140
},
"_enabled": true,
"_N$totalLength": 1383.3,
"_N$barSprite": {
"__id__": 140
"__id__": 142
},
"_N$mode": 0,
"_N$progress": 0,
......@@ -6974,7 +7079,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 140
},
"_enabled": true,
"costtime": 4,
......@@ -6989,10 +7094,10 @@
},
"_children": [
{
"__id__": 145
"__id__": 147
},
{
"__id__": 148
"__id__": 150
}
],
"_active": false,
......@@ -7050,16 +7155,16 @@
"_name": "invalid-name",
"_objFlags": 0,
"_parent": {
"__id__": 144
"__id__": 146
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 146
"__id__": 148
},
{
"__id__": 147
"__id__": 149
}
],
"_prefab": null,
......@@ -7115,7 +7220,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 147
},
"_enabled": true,
"_materials": [
......@@ -7147,7 +7252,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 147
},
"_enabled": true,
"r_width": 1,
......@@ -7168,16 +7273,16 @@
"_name": "invalid-name_2",
"_objFlags": 0,
"_parent": {
"__id__": 144
"__id__": 146
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 149
"__id__": 151
},
{
"__id__": 150
"__id__": 152
}
],
"_prefab": null,
......@@ -7233,7 +7338,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
"__id__": 150
},
"_enabled": true,
"_materials": [
......@@ -7265,7 +7370,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
"__id__": 150
},
"_enabled": true,
"r_width": 1,
......@@ -7290,16 +7395,16 @@
},
"_children": [
{
"__id__": 152
"__id__": 154
},
{
"__id__": 154
"__id__": 156
}
],
"_active": false,
"_components": [
{
"__id__": 157
"__id__": 159
}
],
"_prefab": null,
......@@ -7355,13 +7460,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 151
"__id__": 153
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 153
"__id__": 155
}
],
"_prefab": null,
......@@ -7417,7 +7522,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 154
},
"_enabled": true,
"_materials": [
......@@ -7449,16 +7554,16 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 151
"__id__": 153
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 155
"__id__": 157
},
{
"__id__": 156
"__id__": 158
}
],
"_prefab": null,
......@@ -7514,7 +7619,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 156
},
"_enabled": true,
"_materials": [
......@@ -7549,7 +7654,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 156
},
"_enabled": true,
"_color": {
......@@ -7567,7 +7672,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
"__id__": 153
},
"_enabled": true,
"r_width": 0,
......@@ -7592,22 +7697,22 @@
},
"_children": [
{
"__id__": 159
"__id__": 161
},
{
"__id__": 162
"__id__": 164
},
{
"__id__": 165
"__id__": 167
},
{
"__id__": 172
"__id__": 174
},
{
"__id__": 179
"__id__": 181
},
{
"__id__": 182
"__id__": 184
}
],
"_active": false,
......@@ -7665,11 +7770,11 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 158
"__id__": 160
},
"_children": [
{
"__id__": 160
"__id__": 162
}
],
"_active": true,
......@@ -7727,13 +7832,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 159
"__id__": 161
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 161
"__id__": 163
}
],
"_prefab": null,
......@@ -7789,7 +7894,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
"__id__": 162
},
"_enabled": true,
"_materials": [
......@@ -7821,11 +7926,11 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 158
"__id__": 160
},
"_children": [
{
"__id__": 163
"__id__": 165
}
],
"_active": true,
......@@ -7883,13 +7988,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 164
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 164
"__id__": 166
}
],
"_prefab": null,
......@@ -7945,7 +8050,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 163
"__id__": 165
},
"_enabled": true,
"_materials": [
......@@ -7977,14 +8082,14 @@
"_name": "line2",
"_objFlags": 0,
"_parent": {
"__id__": 158
"__id__": 160
},
"_children": [
{
"__id__": 166
"__id__": 168
},
{
"__id__": 168
"__id__": 170
}
],
"_active": true,
......@@ -8042,13 +8147,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 165
"__id__": 167
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 167
"__id__": 169
}
],
"_prefab": null,
......@@ -8104,7 +8209,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 168
},
"_enabled": true,
"_materials": [
......@@ -8136,17 +8241,17 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 165
"__id__": 167
},
"_children": [
{
"__id__": 169
"__id__": 171
}
],
"_active": false,
"_components": [
{
"__id__": 171
"__id__": 173
}
],
"_prefab": null,
......@@ -8202,13 +8307,13 @@
"_name": "combined-shape-copy-2",
"_objFlags": 0,
"_parent": {
"__id__": 168
"__id__": 170
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 170
"__id__": 172
}
],
"_prefab": null,
......@@ -8264,7 +8369,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 171
},
"_enabled": true,
"_materials": [
......@@ -8296,7 +8401,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 168
"__id__": 170
},
"_enabled": true,
"_materials": [
......@@ -8328,14 +8433,14 @@
"_name": "line3",
"_objFlags": 0,
"_parent": {
"__id__": 158
"__id__": 160
},
"_children": [
{
"__id__": 173
"__id__": 175
},
{
"__id__": 175
"__id__": 177
}
],
"_active": true,
......@@ -8393,13 +8498,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 172
"__id__": 174
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 174
"__id__": 176
}
],
"_prefab": null,
......@@ -8455,7 +8560,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
"__id__": 175
},
"_enabled": true,
"_materials": [
......@@ -8487,17 +8592,17 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 172
"__id__": 174
},
"_children": [
{
"__id__": 176
"__id__": 178
}
],
"_active": false,
"_components": [
{
"__id__": 178
"__id__": 180
}
],
"_prefab": null,
......@@ -8553,13 +8658,13 @@
"_name": "combined-shape-copy-2",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 177
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 177
"__id__": 179
}
],
"_prefab": null,
......@@ -8615,7 +8720,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 176
"__id__": 178
},
"_enabled": true,
"_materials": [
......@@ -8647,7 +8752,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 175
"__id__": 177
},
"_enabled": true,
"_materials": [
......@@ -8679,11 +8784,11 @@
"_name": "line4",
"_objFlags": 0,
"_parent": {
"__id__": 158
"__id__": 160
},
"_children": [
{
"__id__": 180
"__id__": 182
}
],
"_active": true,
......@@ -8741,13 +8846,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 179
"__id__": 181
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 181
"__id__": 183
}
],
"_prefab": null,
......@@ -8803,7 +8908,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 182
},
"_enabled": true,
"_materials": [
......@@ -8835,11 +8940,11 @@
"_name": "line5",
"_objFlags": 0,
"_parent": {
"__id__": 158
"__id__": 160
},
"_children": [
{
"__id__": 183
"__id__": 185
}
],
"_active": true,
......@@ -8897,13 +9002,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 184
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 184
"__id__": 186
}
],
"_prefab": null,
......@@ -8959,7 +9064,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 183
"__id__": 185
},
"_enabled": true,
"_materials": [
......@@ -8995,13 +9100,13 @@
},
"_children": [
{
"__id__": 186
"__id__": 188
},
{
"__id__": 193
"__id__": 195
},
{
"__id__": 200
"__id__": 202
}
],
"_active": false,
......@@ -9059,23 +9164,23 @@
"_name": "sub_0",
"_objFlags": 0,
"_parent": {
"__id__": 185
"__id__": 187
},
"_children": [
{
"__id__": 187
"__id__": 189
},
{
"__id__": 189
"__id__": 191
}
],
"_active": true,
"_components": [
{
"__id__": 191
"__id__": 193
},
{
"__id__": 192
"__id__": 194
}
],
"_prefab": null,
......@@ -9131,13 +9236,13 @@
"_name": "combined-shape_4",
"_objFlags": 0,
"_parent": {
"__id__": 186
"__id__": 188
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 188
"__id__": 190
}
],
"_prefab": null,
......@@ -9193,7 +9298,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 187
"__id__": 189
},
"_enabled": true,
"_materials": [
......@@ -9225,13 +9330,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 186
"__id__": 188
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 190
"__id__": 192
}
],
"_prefab": null,
......@@ -9287,7 +9392,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 189
"__id__": 191
},
"_enabled": true,
"_materials": [
......@@ -9322,7 +9427,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 188
},
"_enabled": true,
"_materials": [
......@@ -9354,7 +9459,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 188
},
"_enabled": true,
"_normalMaterial": null,
......@@ -9415,7 +9520,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 186
"__id__": 188
},
"_id": "e9hETjbwFN6ofBSoo7woie"
},
......@@ -9424,23 +9529,23 @@
"_name": "sub_1",
"_objFlags": 0,
"_parent": {
"__id__": 185
"__id__": 187
},
"_children": [
{
"__id__": 194
"__id__": 196
},
{
"__id__": 196
"__id__": 198
}
],
"_active": true,
"_components": [
{
"__id__": 198
"__id__": 200
},
{
"__id__": 199
"__id__": 201
}
],
"_prefab": null,
......@@ -9496,13 +9601,13 @@
"_name": "combined-shape_3",
"_objFlags": 0,
"_parent": {
"__id__": 193
"__id__": 195
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 195
"__id__": 197
}
],
"_prefab": null,
......@@ -9558,7 +9663,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 194
"__id__": 196
},
"_enabled": true,
"_materials": [
......@@ -9590,13 +9695,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 193
"__id__": 195
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 197
"__id__": 199
}
],
"_prefab": null,
......@@ -9652,7 +9757,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 196
"__id__": 198
},
"_enabled": true,
"_materials": [
......@@ -9687,7 +9792,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 193
"__id__": 195
},
"_enabled": true,
"_materials": [
......@@ -9719,7 +9824,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 193
"__id__": 195
},
"_enabled": true,
"_normalMaterial": null,
......@@ -9780,7 +9885,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 193
"__id__": 195
},
"_id": "8cGgjvgvhL/LuPKRoVnVQq"
},
......@@ -9789,20 +9894,20 @@
"_name": "main",
"_objFlags": 0,
"_parent": {
"__id__": 185
"__id__": 187
},
"_children": [
{
"__id__": 201
"__id__": 203
},
{
"__id__": 203
"__id__": 205
}
],
"_active": true,
"_components": [
{
"__id__": 205
"__id__": 207
}
],
"_prefab": null,
......@@ -9858,13 +9963,13 @@
"_name": "oval-18",
"_objFlags": 0,
"_parent": {
"__id__": 200
"__id__": 202
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 202
"__id__": 204
}
],
"_prefab": null,
......@@ -9920,7 +10025,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 201
"__id__": 203
},
"_enabled": true,
"_materials": [
......@@ -9952,13 +10057,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 200
"__id__": 202
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 204
"__id__": 206
}
],
"_prefab": null,
......@@ -10014,7 +10119,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 203
"__id__": 205
},
"_enabled": true,
"_materials": [
......@@ -10049,7 +10154,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 200
"__id__": 202
},
"_enabled": true,
"_normalMaterial": null,
......@@ -10110,7 +10215,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 200
"__id__": 202
},
"_id": "f41Ic5OXhCRpAxS/kMIRiA"
},
......@@ -10125,7 +10230,7 @@
"_active": false,
"_components": [
{
"__id__": 207
"__id__": 209
}
],
"_prefab": null,
......@@ -10181,7 +10286,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 206
"__id__": 208
},
"_enabled": true,
"_materials": [
......@@ -10274,20 +10379,20 @@
"__id__": 2
},
"_children": [
{
"__id__": 210
},
{
"__id__": 212
},
{
"__id__": 214
},
{
"__id__": 216
}
],
"_active": false,
"_components": [
{
"__id__": 216
"__id__": 218
}
],
"_prefab": null,
......@@ -10343,13 +10448,13 @@
"_name": "bg_blue",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 211
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 211
"__id__": 213
}
],
"_prefab": null,
......@@ -10405,7 +10510,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 210
"__id__": 212
},
"_enabled": true,
"_materials": [
......@@ -10437,13 +10542,13 @@
"_name": "bg_green",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 211
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 213
"__id__": 215
}
],
"_prefab": null,
......@@ -10499,7 +10604,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 212
"__id__": 214
},
"_enabled": true,
"_materials": [
......@@ -10531,13 +10636,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 211
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 215
"__id__": 217
}
],
"_prefab": null,
......@@ -10593,7 +10698,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 214
"__id__": 216
},
"_enabled": true,
"_materials": [
......@@ -10628,7 +10733,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 209
"__id__": 211
},
"_enabled": true,
"_normalMaterial": null,
......@@ -10689,7 +10794,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 209
"__id__": 211
},
"_id": "176BYmeDpPZ68HlISEHa8t"
},
......@@ -10759,9 +10864,6 @@
"__id__": 2
},
"_children": [
{
"__id__": 219
},
{
"__id__": 221
},
......@@ -10775,13 +10877,16 @@
"__id__": 227
},
{
"__id__": 231
"__id__": 229
},
{
"__id__": 233
}
],
"_active": false,
"_components": [
{
"__id__": 237
"__id__": 239
}
],
"_prefab": null,
......@@ -10837,13 +10942,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 220
"__id__": 222
}
],
"_prefab": null,
......@@ -10899,7 +11004,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 219
"__id__": 221
},
"_enabled": true,
"_materials": [
......@@ -10931,13 +11036,13 @@
"_name": "chose",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 222
"__id__": 224
}
],
"_prefab": null,
......@@ -10993,7 +11098,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 221
"__id__": 223
},
"_enabled": true,
"_materials": [
......@@ -11025,13 +11130,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 224
"__id__": 226
}
],
"_prefab": null,
......@@ -11087,7 +11192,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 223
"__id__": 225
},
"_enabled": true,
"_materials": [
......@@ -11119,13 +11224,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 226
"__id__": 228
}
],
"_prefab": null,
......@@ -11181,7 +11286,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 225
"__id__": 227
},
"_enabled": true,
"_materials": [
......@@ -11216,17 +11321,17 @@
"_name": "fail",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [
{
"__id__": 228
"__id__": 230
}
],
"_active": false,
"_components": [
{
"__id__": 230
"__id__": 232
}
],
"_prefab": null,
......@@ -11282,13 +11387,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 227
"__id__": 229
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 229
"__id__": 231
}
],
"_prefab": null,
......@@ -11344,7 +11449,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 228
"__id__": 230
},
"_enabled": true,
"_materials": [
......@@ -11379,7 +11484,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 227
"__id__": 229
},
"_enabled": true,
"_materials": [
......@@ -11411,20 +11516,20 @@
"_name": "success",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [
{
"__id__": 232
"__id__": 234
},
{
"__id__": 234
"__id__": 236
}
],
"_active": false,
"_components": [
{
"__id__": 236
"__id__": 238
}
],
"_prefab": null,
......@@ -11480,13 +11585,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 231
"__id__": 233
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 233
"__id__": 235
}
],
"_prefab": null,
......@@ -11542,7 +11647,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 232
"__id__": 234
},
"_enabled": true,
"_materials": [
......@@ -11577,13 +11682,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 231
"__id__": 233
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 235
"__id__": 237
}
],
"_prefab": null,
......@@ -11639,7 +11744,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 234
"__id__": 236
},
"_enabled": true,
"_materials": [
......@@ -11671,7 +11776,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 231
"__id__": 233
},
"_enabled": true,
"_materials": [
......@@ -11703,7 +11808,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 218
"__id__": 220
},
"_enabled": true,
"_normalMaterial": null,
......@@ -11764,7 +11869,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 218
"__id__": 220
},
"_id": "58IQ76yf1KT71BqZoNtHOV"
},
......@@ -11779,7 +11884,7 @@
"_active": false,
"_components": [
{
"__id__": 239
"__id__": 241
}
],
"_prefab": null,
......@@ -11835,7 +11940,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 238
"__id__": 240
},
"_enabled": true,
"r_width": 0,
......@@ -11862,13 +11967,13 @@
"_active": false,
"_components": [
{
"__id__": 241
"__id__": 243
},
{
"__id__": 242
"__id__": 244
},
{
"__id__": 243
"__id__": 245
}
],
"_prefab": null,
......@@ -11924,7 +12029,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 240
"__id__": 242
},
"_enabled": true,
"_materials": [
......@@ -11956,7 +12061,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 240
"__id__": 242
},
"_enabled": true,
"_normalMaterial": null,
......@@ -12017,7 +12122,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 240
"__id__": 242
},
"_id": "86ErSTSUhP26kFUGhhqqPn"
},
......@@ -12026,7 +12131,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 240
"__id__": 242
},
"_enabled": true,
"r_width": 0,
......@@ -12053,10 +12158,10 @@
"_active": false,
"_components": [
{
"__id__": 245
"__id__": 247
},
{
"__id__": 246
"__id__": 248
}
],
"_prefab": null,
......@@ -12112,7 +12217,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 244
"__id__": 246
},
"_enabled": true,
"_layoutSize": {
......@@ -12144,7 +12249,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 244
"__id__": 246
},
"_enabled": true,
"alignMode": 1,
......@@ -12293,7 +12398,7 @@
"_active": false,
"_components": [
{
"__id__": 250
"__id__": 252
}
],
"_prefab": null,
......@@ -12349,7 +12454,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 249
"__id__": 251
},
"_enabled": true,
"_materials": [
......@@ -12393,13 +12498,13 @@
},
"_children": [
{
"__id__": 252
"__id__": 254
}
],
"_active": false,
"_components": [
{
"__id__": 256
"__id__": 258
}
],
"_prefab": null,
......@@ -12455,17 +12560,17 @@
"_name": "Star",
"_objFlags": 0,
"_parent": {
"__id__": 251
"__id__": 253
},
"_children": [
{
"__id__": 253
"__id__": 255
}
],
"_active": false,
"_components": [
{
"__id__": 255
"__id__": 257
}
],
"_prefab": null,
......@@ -12521,13 +12626,13 @@
"_name": "StarBig",
"_objFlags": 0,
"_parent": {
"__id__": 252
"__id__": 254
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 254
"__id__": 256
}
],
"_prefab": null,
......@@ -12583,7 +12688,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 253
"__id__": 255
},
"_enabled": true,
"_materials": [
......@@ -12615,7 +12720,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 252
"__id__": 254
},
"_enabled": true,
"_materials": [
......@@ -12647,7 +12752,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 251
"__id__": 253
},
"_enabled": true,
"_materials": [
......@@ -12682,9 +12787,6 @@
"__id__": 2
},
"_children": [
{
"__id__": 258
},
{
"__id__": 260
},
......@@ -12699,6 +12801,9 @@
},
{
"__id__": 268
},
{
"__id__": 270
}
],
"_active": false,
......@@ -12756,13 +12861,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 257
"__id__": 259
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 259
"__id__": 261
}
],
"_prefab": null,
......@@ -12818,7 +12923,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 258
"__id__": 260
},
"_enabled": true,
"_materials": [
......@@ -12850,13 +12955,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 257
"__id__": 259
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 261
"__id__": 263
}
],
"_prefab": null,
......@@ -12912,7 +13017,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 260
"__id__": 262
},
"_enabled": true,
"_materials": [
......@@ -12944,13 +13049,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 257
"__id__": 259
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 263
"__id__": 265
}
],
"_prefab": null,
......@@ -13006,7 +13111,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 262
"__id__": 264
},
"_enabled": true,
"_materials": [
......@@ -13038,13 +13143,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 257
"__id__": 259
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 265
"__id__": 267
}
],
"_prefab": null,
......@@ -13100,7 +13205,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 264
"__id__": 266
},
"_enabled": true,
"_materials": [
......@@ -13132,13 +13237,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 257
"__id__": 259
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 267
"__id__": 269
}
],
"_prefab": null,
......@@ -13194,7 +13299,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 266
"__id__": 268
},
"_enabled": true,
"_materials": [
......@@ -13226,13 +13331,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 257
"__id__": 259
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 269
"__id__": 271
}
],
"_prefab": null,
......@@ -13288,7 +13393,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 268
"__id__": 270
},
"_enabled": true,
"_materials": [
......@@ -13324,19 +13429,19 @@
},
"_children": [
{
"__id__": 271
"__id__": 273
},
{
"__id__": 276
"__id__": 278
},
{
"__id__": 281
"__id__": 283
},
{
"__id__": 286
"__id__": 288
},
{
"__id__": 291
"__id__": 293
}
],
"_active": false,
......@@ -13394,11 +13499,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 270
"__id__": 272
},
"_children": [
{
"__id__": 272
"__id__": 274
}
],
"_active": true,
......@@ -13456,17 +13561,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 271
"__id__": 273
},
"_children": [
{
"__id__": 273
"__id__": 275
}
],
"_active": true,
"_components": [
{
"__id__": 275
"__id__": 277
}
],
"_prefab": null,
......@@ -13522,13 +13627,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 272
"__id__": 274
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 274
"__id__": 276
}
],
"_prefab": null,
......@@ -13584,7 +13689,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 273
"__id__": 275
},
"_enabled": true,
"_materials": [
......@@ -13616,7 +13721,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 272
"__id__": 274
},
"_enabled": true,
"_materials": [
......@@ -13638,11 +13743,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 270
"__id__": 272
},
"_children": [
{
"__id__": 277
"__id__": 279
}
],
"_active": true,
......@@ -13700,17 +13805,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 276
"__id__": 278
},
"_children": [
{
"__id__": 278
"__id__": 280
}
],
"_active": true,
"_components": [
{
"__id__": 280
"__id__": 282
}
],
"_prefab": null,
......@@ -13766,13 +13871,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 277
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 279
"__id__": 281
}
],
"_prefab": null,
......@@ -13828,7 +13933,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 278
"__id__": 280
},
"_enabled": true,
"_materials": [
......@@ -13860,7 +13965,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 277
"__id__": 279
},
"_enabled": true,
"_materials": [
......@@ -13882,11 +13987,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 270
"__id__": 272
},
"_children": [
{
"__id__": 282
"__id__": 284
}
],
"_active": true,
......@@ -13944,17 +14049,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 281
"__id__": 283
},
"_children": [
{
"__id__": 283
"__id__": 285
}
],
"_active": true,
"_components": [
{
"__id__": 285
"__id__": 287
}
],
"_prefab": null,
......@@ -14010,13 +14115,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 282
"__id__": 284
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 284
"__id__": 286
}
],
"_prefab": null,
......@@ -14072,7 +14177,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 283
"__id__": 285
},
"_enabled": true,
"_materials": [
......@@ -14104,7 +14209,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 282
"__id__": 284
},
"_enabled": true,
"_materials": [
......@@ -14126,11 +14231,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 270
"__id__": 272
},
"_children": [
{
"__id__": 287
"__id__": 289
}
],
"_active": true,
......@@ -14188,17 +14293,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 286
"__id__": 288
},
"_children": [
{
"__id__": 288
"__id__": 290
}
],
"_active": true,
"_components": [
{
"__id__": 290
"__id__": 292
}
],
"_prefab": null,
......@@ -14254,13 +14359,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 287
"__id__": 289
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 289
"__id__": 291
}
],
"_prefab": null,
......@@ -14316,7 +14421,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 288
"__id__": 290
},
"_enabled": true,
"_materials": [
......@@ -14348,7 +14453,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 287
"__id__": 289
},
"_enabled": true,
"_materials": [
......@@ -14370,11 +14475,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 270
"__id__": 272
},
"_children": [
{
"__id__": 292
"__id__": 294
}
],
"_active": true,
......@@ -14432,17 +14537,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 291
"__id__": 293
},
"_children": [
{
"__id__": 293
"__id__": 295
}
],
"_active": true,
"_components": [
{
"__id__": 295
"__id__": 297
}
],
"_prefab": null,
......@@ -14498,13 +14603,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 292
"__id__": 294
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 294
"__id__": 296
}
],
"_prefab": null,
......@@ -14560,7 +14665,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 293
"__id__": 295
},
"_enabled": true,
"_materials": [
......@@ -14592,7 +14697,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 292
"__id__": 294
},
"_enabled": true,
"_materials": [
......
......@@ -282,6 +282,7 @@ cc.Class({
let btn_picture = pg.view.find(this, "btn_picture");
let layout_normal = pg.view.find(this, "card_group/layout_normal");
layout_normal.removeAllChildren();
layout_normal.opacity = 0;
let layout_card = pg.view.find(this, "card_group/layout_card");
cc.find("card_group/card_bg2", this.node).opacity = 0;
layout_card.removeAllChildren();
......
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