Commit bbf62353 authored by Tt's avatar Tt

1

parent 07493792
......@@ -156,67 +156,67 @@
"__id__": 150
},
{
"__id__": 157
"__id__": 155
},
{
"__id__": 164
"__id__": 161
},
{
"__id__": 191
"__id__": 188
},
{
"__id__": 212
"__id__": 209
},
{
"__id__": 214
"__id__": 211
},
{
"__id__": 215
"__id__": 212
},
{
"__id__": 223
"__id__": 220
},
{
"__id__": 224
"__id__": 221
},
{
"__id__": 244
"__id__": 241
},
{
"__id__": 246
"__id__": 242
},
{
"__id__": 250
"__id__": 245
},
{
"__id__": 253
"__id__": 248
},
{
"__id__": 254
"__id__": 249
},
{
"__id__": 255
"__id__": 250
},
{
"__id__": 257
"__id__": 252
},
{
"__id__": 263
"__id__": 258
},
{
"__id__": 276
"__id__": 271
}
],
"_active": true,
"_components": [
{
"__id__": 302
"__id__": 297
},
{
"__id__": 303
"__id__": 298
},
{
"__id__": 304
"__id__": 299
}
],
"_prefab": null,
......@@ -6921,14 +6921,14 @@
"_id": "feA2HsnyFASLUXjdq0vRse"
},
{
"__type__": "728faQKxvZPLYurzotiUO/x",
"__type__": "67cf1ioJYtLiJCFClYrTmRM",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 130
},
"_enabled": true,
"_id": "09R5wk/0NITYGz7Es4tALJ"
"_id": "05vad9+9tFu61x6vcSkc3j"
},
{
"__type__": "cc.Node",
......@@ -7240,7 +7240,7 @@
"_id": "5d9La3XUBG67/bL44GyMMJ"
},
{
"__type__": "86d80zPOA9DUK5J6h9WhOBN",
"__type__": "c2048R700VHYqu4vEeAy/0f",
"_name": "",
"_objFlags": 0,
"node": {
......@@ -7248,7 +7248,7 @@
},
"_enabled": true,
"costtime": 4,
"_id": "32zyfUT/9EG4jgWsKPFVzS"
"_id": "c2ro/v71pMZp5O6IrU8uNc"
},
{
"__type__": "cc.Node",
......@@ -7262,7 +7262,7 @@
"__id__": 151
},
{
"__id__": 154
"__id__": 153
}
],
"_active": false,
......@@ -7327,9 +7327,6 @@
"_components": [
{
"__id__": 152
},
{
"__id__": 153
}
],
"_prefab": null,
......@@ -7412,27 +7409,6 @@
"_atlas": null,
"_id": "52AKEsEpFBrYGn0KSRn4v5"
},
{
"__type__": "e55f0Ml4W5KfYaPtWAwLQLy",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
},
"_enabled": true,
"r_width": 1,
"r_height": 1,
"r_top": 0,
"r_bottom": 0,
"p_left": 0,
"p_right": 0,
"p_top": 0,
"p_bottom": 0,
"black": 0,
"noHead": 0,
"debug": 0,
"_id": "1aRSob4ytPy44PTb6cdhEK"
},
{
"__type__": "cc.Node",
"_name": "invalid-name_2",
......@@ -7444,10 +7420,7 @@
"_active": true,
"_components": [
{
"__id__": 155
},
{
"__id__": 156
"__id__": 154
}
],
"_prefab": null,
......@@ -7503,7 +7476,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 153
},
"_enabled": true,
"_materials": [
......@@ -7530,27 +7503,6 @@
"_atlas": null,
"_id": "bahXJibU5HqZMrCuGhbuP6"
},
{
"__type__": "e55f0Ml4W5KfYaPtWAwLQLy",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
},
"_enabled": true,
"r_width": 1,
"r_height": 1,
"r_top": 0,
"r_bottom": 0,
"p_left": 0,
"p_right": 0,
"p_top": 0,
"p_bottom": 1,
"black": 0,
"noHead": 0,
"debug": 0,
"_id": "c0Fj3pVLRAQ5fE3Ob6H8hI"
},
{
"__type__": "cc.Node",
"_name": "title",
......@@ -7560,18 +7512,14 @@
},
"_children": [
{
"__id__": 158
"__id__": 156
},
{
"__id__": 160
"__id__": 158
}
],
"_active": false,
"_components": [
{
"__id__": 163
}
],
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -7625,13 +7573,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 157
"__id__": 155
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 159
"__id__": 157
}
],
"_prefab": null,
......@@ -7687,7 +7635,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 158
"__id__": 156
},
"_enabled": true,
"_materials": [
......@@ -7719,16 +7667,16 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 157
"__id__": 155
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 161
"__id__": 159
},
{
"__id__": 162
"__id__": 160
}
],
"_prefab": null,
......@@ -7784,7 +7732,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
"__id__": 158
},
"_enabled": true,
"_materials": [
......@@ -7819,7 +7767,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
"__id__": 158
},
"_enabled": true,
"_color": {
......@@ -7832,27 +7780,6 @@
"_width": 1.5,
"_id": "7eorOc0eJBL7kuwjKM7Nul"
},
{
"__type__": "e55f0Ml4W5KfYaPtWAwLQLy",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
},
"_enabled": true,
"r_width": 0,
"r_height": 0,
"r_top": 0,
"r_bottom": 0,
"p_left": 0,
"p_right": 0,
"p_top": 1,
"p_bottom": 0,
"black": 0,
"noHead": 0,
"debug": 0,
"_id": "4eatYVtk5HwLfMuLXgp/sS"
},
{
"__type__": "cc.Node",
"_name": "line",
......@@ -7861,6 +7788,9 @@
"__id__": 2
},
"_children": [
{
"__id__": 162
},
{
"__id__": 165
},
......@@ -7868,16 +7798,13 @@
"__id__": 168
},
{
"__id__": 171
"__id__": 175
},
{
"__id__": 178
"__id__": 182
},
{
"__id__": 185
},
{
"__id__": 188
}
],
"_active": false,
......@@ -7935,11 +7862,11 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 161
},
"_children": [
{
"__id__": 166
"__id__": 163
}
],
"_active": true,
......@@ -7997,13 +7924,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 165
"__id__": 162
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 167
"__id__": 164
}
],
"_prefab": null,
......@@ -8059,7 +7986,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 163
},
"_enabled": true,
"_materials": [
......@@ -8091,11 +8018,11 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 161
},
"_children": [
{
"__id__": 169
"__id__": 166
}
],
"_active": true,
......@@ -8153,13 +8080,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 168
"__id__": 165
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 170
"__id__": 167
}
],
"_prefab": null,
......@@ -8215,7 +8142,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 166
},
"_enabled": true,
"_materials": [
......@@ -8247,14 +8174,14 @@
"_name": "line2",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 161
},
"_children": [
{
"__id__": 172
"__id__": 169
},
{
"__id__": 174
"__id__": 171
}
],
"_active": true,
......@@ -8312,13 +8239,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 171
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 173
"__id__": 170
}
],
"_prefab": null,
......@@ -8374,7 +8301,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 172
"__id__": 169
},
"_enabled": true,
"_materials": [
......@@ -8406,17 +8333,17 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 171
"__id__": 168
},
"_children": [
{
"__id__": 175
"__id__": 172
}
],
"_active": false,
"_components": [
{
"__id__": 177
"__id__": 174
}
],
"_prefab": null,
......@@ -8472,13 +8399,13 @@
"_name": "combined-shape-copy-2",
"_objFlags": 0,
"_parent": {
"__id__": 174
"__id__": 171
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 176
"__id__": 173
}
],
"_prefab": null,
......@@ -8534,7 +8461,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 175
"__id__": 172
},
"_enabled": true,
"_materials": [
......@@ -8566,7 +8493,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 174
"__id__": 171
},
"_enabled": true,
"_materials": [
......@@ -8598,14 +8525,14 @@
"_name": "line3",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 161
},
"_children": [
{
"__id__": 179
"__id__": 176
},
{
"__id__": 181
"__id__": 178
}
],
"_active": true,
......@@ -8663,13 +8590,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 178
"__id__": 175
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 180
"__id__": 177
}
],
"_prefab": null,
......@@ -8725,7 +8652,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 179
"__id__": 176
},
"_enabled": true,
"_materials": [
......@@ -8757,17 +8684,17 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 178
"__id__": 175
},
"_children": [
{
"__id__": 182
"__id__": 179
}
],
"_active": false,
"_components": [
{
"__id__": 184
"__id__": 181
}
],
"_prefab": null,
......@@ -8823,13 +8750,13 @@
"_name": "combined-shape-copy-2",
"_objFlags": 0,
"_parent": {
"__id__": 181
"__id__": 178
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 183
"__id__": 180
}
],
"_prefab": null,
......@@ -8885,7 +8812,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 179
},
"_enabled": true,
"_materials": [
......@@ -8917,7 +8844,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 181
"__id__": 178
},
"_enabled": true,
"_materials": [
......@@ -8949,11 +8876,11 @@
"_name": "line4",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 161
},
"_children": [
{
"__id__": 186
"__id__": 183
}
],
"_active": true,
......@@ -9011,13 +8938,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 185
"__id__": 182
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 187
"__id__": 184
}
],
"_prefab": null,
......@@ -9073,7 +9000,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 183
},
"_enabled": true,
"_materials": [
......@@ -9105,11 +9032,11 @@
"_name": "line5",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 161
},
"_children": [
{
"__id__": 189
"__id__": 186
}
],
"_active": true,
......@@ -9167,13 +9094,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 188
"__id__": 185
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 190
"__id__": 187
}
],
"_prefab": null,
......@@ -9229,7 +9156,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 189
"__id__": 186
},
"_enabled": true,
"_materials": [
......@@ -9265,13 +9192,13 @@
},
"_children": [
{
"__id__": 192
"__id__": 189
},
{
"__id__": 199
"__id__": 196
},
{
"__id__": 206
"__id__": 203
}
],
"_active": false,
......@@ -9329,23 +9256,23 @@
"_name": "sub_0",
"_objFlags": 0,
"_parent": {
"__id__": 191
"__id__": 188
},
"_children": [
{
"__id__": 193
"__id__": 190
},
{
"__id__": 195
"__id__": 192
}
],
"_active": true,
"_components": [
{
"__id__": 197
"__id__": 194
},
{
"__id__": 198
"__id__": 195
}
],
"_prefab": null,
......@@ -9401,13 +9328,13 @@
"_name": "combined-shape_4",
"_objFlags": 0,
"_parent": {
"__id__": 192
"__id__": 189
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 194
"__id__": 191
}
],
"_prefab": null,
......@@ -9463,7 +9390,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 193
"__id__": 190
},
"_enabled": true,
"_materials": [
......@@ -9495,13 +9422,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 192
"__id__": 189
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 196
"__id__": 193
}
],
"_prefab": null,
......@@ -9557,7 +9484,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 192
},
"_enabled": true,
"_materials": [
......@@ -9592,7 +9519,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 192
"__id__": 189
},
"_enabled": true,
"_materials": [
......@@ -9624,7 +9551,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 192
"__id__": 189
},
"_enabled": true,
"_normalMaterial": null,
......@@ -9685,7 +9612,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 192
"__id__": 189
},
"_id": "e9hETjbwFN6ofBSoo7woie"
},
......@@ -9694,23 +9621,23 @@
"_name": "sub_1",
"_objFlags": 0,
"_parent": {
"__id__": 191
"__id__": 188
},
"_children": [
{
"__id__": 200
"__id__": 197
},
{
"__id__": 202
"__id__": 199
}
],
"_active": true,
"_components": [
{
"__id__": 204
"__id__": 201
},
{
"__id__": 205
"__id__": 202
}
],
"_prefab": null,
......@@ -9766,13 +9693,13 @@
"_name": "combined-shape_3",
"_objFlags": 0,
"_parent": {
"__id__": 199
"__id__": 196
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 201
"__id__": 198
}
],
"_prefab": null,
......@@ -9828,7 +9755,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 200
"__id__": 197
},
"_enabled": true,
"_materials": [
......@@ -9860,13 +9787,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 199
"__id__": 196
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 203
"__id__": 200
}
],
"_prefab": null,
......@@ -9922,7 +9849,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 202
"__id__": 199
},
"_enabled": true,
"_materials": [
......@@ -9957,7 +9884,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 199
"__id__": 196
},
"_enabled": true,
"_materials": [
......@@ -9989,7 +9916,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 199
"__id__": 196
},
"_enabled": true,
"_normalMaterial": null,
......@@ -10050,7 +9977,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 199
"__id__": 196
},
"_id": "8cGgjvgvhL/LuPKRoVnVQq"
},
......@@ -10059,20 +9986,20 @@
"_name": "main",
"_objFlags": 0,
"_parent": {
"__id__": 191
"__id__": 188
},
"_children": [
{
"__id__": 207
"__id__": 204
},
{
"__id__": 209
"__id__": 206
}
],
"_active": true,
"_components": [
{
"__id__": 211
"__id__": 208
}
],
"_prefab": null,
......@@ -10128,13 +10055,13 @@
"_name": "oval-18",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 203
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 208
"__id__": 205
}
],
"_prefab": null,
......@@ -10190,7 +10117,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 207
"__id__": 204
},
"_enabled": true,
"_materials": [
......@@ -10222,13 +10149,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 203
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 210
"__id__": 207
}
],
"_prefab": null,
......@@ -10284,7 +10211,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 209
"__id__": 206
},
"_enabled": true,
"_materials": [
......@@ -10319,7 +10246,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 206
"__id__": 203
},
"_enabled": true,
"_normalMaterial": null,
......@@ -10380,7 +10307,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 206
"__id__": 203
},
"_id": "f41Ic5OXhCRpAxS/kMIRiA"
},
......@@ -10395,7 +10322,7 @@
"_active": false,
"_components": [
{
"__id__": 213
"__id__": 210
}
],
"_prefab": null,
......@@ -10451,7 +10378,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 212
"__id__": 209
},
"_enabled": true,
"_materials": [
......@@ -10545,19 +10472,19 @@
},
"_children": [
{
"__id__": 216
"__id__": 213
},
{
"__id__": 218
"__id__": 215
},
{
"__id__": 220
"__id__": 217
}
],
"_active": false,
"_components": [
{
"__id__": 222
"__id__": 219
}
],
"_prefab": null,
......@@ -10613,13 +10540,13 @@
"_name": "bg_blue",
"_objFlags": 0,
"_parent": {
"__id__": 215
"__id__": 212
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 217
"__id__": 214
}
],
"_prefab": null,
......@@ -10675,7 +10602,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 216
"__id__": 213
},
"_enabled": true,
"_materials": [
......@@ -10707,13 +10634,13 @@
"_name": "bg_green",
"_objFlags": 0,
"_parent": {
"__id__": 215
"__id__": 212
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 219
"__id__": 216
}
],
"_prefab": null,
......@@ -10769,7 +10696,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 218
"__id__": 215
},
"_enabled": true,
"_materials": [
......@@ -10801,13 +10728,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 215
"__id__": 212
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 221
"__id__": 218
}
],
"_prefab": null,
......@@ -10863,7 +10790,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 220
"__id__": 217
},
"_enabled": true,
"_materials": [
......@@ -10898,7 +10825,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 215
"__id__": 212
},
"_enabled": true,
"_normalMaterial": null,
......@@ -10959,7 +10886,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 215
"__id__": 212
},
"_id": "176BYmeDpPZ68HlISEHa8t"
},
......@@ -11030,28 +10957,28 @@
},
"_children": [
{
"__id__": 225
"__id__": 222
},
{
"__id__": 227
"__id__": 224
},
{
"__id__": 229
"__id__": 226
},
{
"__id__": 231
"__id__": 228
},
{
"__id__": 233
"__id__": 230
},
{
"__id__": 237
"__id__": 234
}
],
"_active": false,
"_components": [
{
"__id__": 243
"__id__": 240
}
],
"_prefab": null,
......@@ -11107,13 +11034,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 224
"__id__": 221
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 226
"__id__": 223
}
],
"_prefab": null,
......@@ -11169,7 +11096,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 225
"__id__": 222
},
"_enabled": true,
"_materials": [
......@@ -11201,13 +11128,13 @@
"_name": "chose",
"_objFlags": 0,
"_parent": {
"__id__": 224
"__id__": 221
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 228
"__id__": 225
}
],
"_prefab": null,
......@@ -11263,7 +11190,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 227
"__id__": 224
},
"_enabled": true,
"_materials": [
......@@ -11295,13 +11222,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 224
"__id__": 221
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 230
"__id__": 227
}
],
"_prefab": null,
......@@ -11357,7 +11284,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 229
"__id__": 226
},
"_enabled": true,
"_materials": [
......@@ -11389,13 +11316,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 224
"__id__": 221
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 232
"__id__": 229
}
],
"_prefab": null,
......@@ -11451,7 +11378,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 231
"__id__": 228
},
"_enabled": true,
"_materials": [
......@@ -11486,17 +11413,17 @@
"_name": "fail",
"_objFlags": 0,
"_parent": {
"__id__": 224
"__id__": 221
},
"_children": [
{
"__id__": 234
"__id__": 231
}
],
"_active": false,
"_components": [
{
"__id__": 236
"__id__": 233
}
],
"_prefab": null,
......@@ -11552,13 +11479,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 233
"__id__": 230
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 235
"__id__": 232
}
],
"_prefab": null,
......@@ -11614,7 +11541,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 234
"__id__": 231
},
"_enabled": true,
"_materials": [
......@@ -11649,7 +11576,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 233
"__id__": 230
},
"_enabled": true,
"_materials": [
......@@ -11681,20 +11608,20 @@
"_name": "success",
"_objFlags": 0,
"_parent": {
"__id__": 224
"__id__": 221
},
"_children": [
{
"__id__": 238
"__id__": 235
},
{
"__id__": 240
"__id__": 237
}
],
"_active": false,
"_components": [
{
"__id__": 242
"__id__": 239
}
],
"_prefab": null,
......@@ -11750,13 +11677,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 237
"__id__": 234
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 239
"__id__": 236
}
],
"_prefab": null,
......@@ -11812,7 +11739,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 238
"__id__": 235
},
"_enabled": true,
"_materials": [
......@@ -11847,13 +11774,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 237
"__id__": 234
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 241
"__id__": 238
}
],
"_prefab": null,
......@@ -11909,7 +11836,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 240
"__id__": 237
},
"_enabled": true,
"_materials": [
......@@ -11941,7 +11868,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 237
"__id__": 234
},
"_enabled": true,
"_materials": [
......@@ -11973,7 +11900,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 224
"__id__": 221
},
"_enabled": true,
"_normalMaterial": null,
......@@ -12034,7 +11961,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 224
"__id__": 221
},
"_id": "58IQ76yf1KT71BqZoNtHOV"
},
......@@ -12047,11 +11974,7 @@
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 245
}
],
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -12100,27 +12023,6 @@
"groupIndex": 0,
"_id": "2bxgAtmQJP+bUQoreYMry9"
},
{
"__type__": "e55f0Ml4W5KfYaPtWAwLQLy",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 244
},
"_enabled": true,
"r_width": 0,
"r_height": 0,
"r_top": 0,
"r_bottom": 0,
"p_left": 0,
"p_right": 0,
"p_top": 0,
"p_bottom": 1,
"black": 0,
"noHead": 0,
"debug": 0,
"_id": "ebQ2jKaixDO7nZRIohsaP7"
},
{
"__type__": "cc.Node",
"_name": "btn_replay1",
......@@ -12132,13 +12034,10 @@
"_active": false,
"_components": [
{
"__id__": 247
},
{
"__id__": 248
"__id__": 243
},
{
"__id__": 249
"__id__": 244
}
],
"_prefab": null,
......@@ -12194,7 +12093,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 246
"__id__": 242
},
"_enabled": true,
"_materials": [
......@@ -12226,7 +12125,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 246
"__id__": 242
},
"_enabled": true,
"_normalMaterial": null,
......@@ -12287,31 +12186,10 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 246
"__id__": 242
},
"_id": "86ErSTSUhP26kFUGhhqqPn"
},
{
"__type__": "e55f0Ml4W5KfYaPtWAwLQLy",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 246
},
"_enabled": true,
"r_width": 0,
"r_height": 0,
"r_top": 0,
"r_bottom": 0,
"p_left": 0,
"p_right": 0,
"p_top": 0,
"p_bottom": 1,
"black": 0,
"noHead": 0,
"debug": 0,
"_id": "bag+W8tmtDzpqX/Hm+/x8i"
},
{
"__type__": "cc.Node",
"_name": "layout_stars",
......@@ -12323,10 +12201,10 @@
"_active": false,
"_components": [
{
"__id__": 251
"__id__": 246
},
{
"__id__": 252
"__id__": 247
}
],
"_prefab": null,
......@@ -12382,7 +12260,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 250
"__id__": 245
},
"_enabled": true,
"_layoutSize": {
......@@ -12414,7 +12292,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 250
"__id__": 245
},
"_enabled": true,
"alignMode": 1,
......@@ -12563,7 +12441,7 @@
"_active": false,
"_components": [
{
"__id__": 256
"__id__": 251
}
],
"_prefab": null,
......@@ -12619,7 +12497,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 255
"__id__": 250
},
"_enabled": true,
"_materials": [
......@@ -12663,13 +12541,13 @@
},
"_children": [
{
"__id__": 258
"__id__": 253
}
],
"_active": false,
"_components": [
{
"__id__": 262
"__id__": 257
}
],
"_prefab": null,
......@@ -12725,17 +12603,17 @@
"_name": "Star",
"_objFlags": 0,
"_parent": {
"__id__": 257
"__id__": 252
},
"_children": [
{
"__id__": 259
"__id__": 254
}
],
"_active": false,
"_components": [
{
"__id__": 261
"__id__": 256
}
],
"_prefab": null,
......@@ -12791,13 +12669,13 @@
"_name": "StarBig",
"_objFlags": 0,
"_parent": {
"__id__": 258
"__id__": 253
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 260
"__id__": 255
}
],
"_prefab": null,
......@@ -12853,7 +12731,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 259
"__id__": 254
},
"_enabled": true,
"_materials": [
......@@ -12885,7 +12763,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 258
"__id__": 253
},
"_enabled": true,
"_materials": [
......@@ -12917,7 +12795,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 257
"__id__": 252
},
"_enabled": true,
"_materials": [
......@@ -12953,22 +12831,22 @@
},
"_children": [
{
"__id__": 264
"__id__": 259
},
{
"__id__": 266
"__id__": 261
},
{
"__id__": 268
"__id__": 263
},
{
"__id__": 270
"__id__": 265
},
{
"__id__": 272
"__id__": 267
},
{
"__id__": 274
"__id__": 269
}
],
"_active": false,
......@@ -13026,13 +12904,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 263
"__id__": 258
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 265
"__id__": 260
}
],
"_prefab": null,
......@@ -13088,7 +12966,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 264
"__id__": 259
},
"_enabled": true,
"_materials": [
......@@ -13120,13 +12998,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 263
"__id__": 258
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 267
"__id__": 262
}
],
"_prefab": null,
......@@ -13182,7 +13060,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 266
"__id__": 261
},
"_enabled": true,
"_materials": [
......@@ -13214,13 +13092,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 263
"__id__": 258
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 269
"__id__": 264
}
],
"_prefab": null,
......@@ -13276,7 +13154,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 268
"__id__": 263
},
"_enabled": true,
"_materials": [
......@@ -13308,13 +13186,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 263
"__id__": 258
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 271
"__id__": 266
}
],
"_prefab": null,
......@@ -13370,7 +13248,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 270
"__id__": 265
},
"_enabled": true,
"_materials": [
......@@ -13402,13 +13280,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 263
"__id__": 258
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 273
"__id__": 268
}
],
"_prefab": null,
......@@ -13464,7 +13342,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 272
"__id__": 267
},
"_enabled": true,
"_materials": [
......@@ -13496,13 +13374,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 263
"__id__": 258
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 275
"__id__": 270
}
],
"_prefab": null,
......@@ -13558,7 +13436,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 274
"__id__": 269
},
"_enabled": true,
"_materials": [
......@@ -13593,6 +13471,9 @@
"__id__": 2
},
"_children": [
{
"__id__": 272
},
{
"__id__": 277
},
......@@ -13604,9 +13485,6 @@
},
{
"__id__": 292
},
{
"__id__": 297
}
],
"_active": false,
......@@ -13664,11 +13542,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 276
"__id__": 271
},
"_children": [
{
"__id__": 278
"__id__": 273
}
],
"_active": true,
......@@ -13726,17 +13604,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 277
"__id__": 272
},
"_children": [
{
"__id__": 279
"__id__": 274
}
],
"_active": true,
"_components": [
{
"__id__": 281
"__id__": 276
}
],
"_prefab": null,
......@@ -13792,13 +13670,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 273
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 280
"__id__": 275
}
],
"_prefab": null,
......@@ -13854,7 +13732,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 279
"__id__": 274
},
"_enabled": true,
"_materials": [
......@@ -13886,7 +13764,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 278
"__id__": 273
},
"_enabled": true,
"_materials": [
......@@ -13908,11 +13786,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 276
"__id__": 271
},
"_children": [
{
"__id__": 283
"__id__": 278
}
],
"_active": true,
......@@ -13970,17 +13848,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 282
"__id__": 277
},
"_children": [
{
"__id__": 284
"__id__": 279
}
],
"_active": true,
"_components": [
{
"__id__": 286
"__id__": 281
}
],
"_prefab": null,
......@@ -14036,13 +13914,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 283
"__id__": 278
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 285
"__id__": 280
}
],
"_prefab": null,
......@@ -14098,7 +13976,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 284
"__id__": 279
},
"_enabled": true,
"_materials": [
......@@ -14130,7 +14008,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 283
"__id__": 278
},
"_enabled": true,
"_materials": [
......@@ -14152,11 +14030,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 276
"__id__": 271
},
"_children": [
{
"__id__": 288
"__id__": 283
}
],
"_active": true,
......@@ -14214,17 +14092,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 287
"__id__": 282
},
"_children": [
{
"__id__": 289
"__id__": 284
}
],
"_active": true,
"_components": [
{
"__id__": 291
"__id__": 286
}
],
"_prefab": null,
......@@ -14280,13 +14158,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 288
"__id__": 283
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 290
"__id__": 285
}
],
"_prefab": null,
......@@ -14342,7 +14220,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 289
"__id__": 284
},
"_enabled": true,
"_materials": [
......@@ -14374,7 +14252,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 288
"__id__": 283
},
"_enabled": true,
"_materials": [
......@@ -14396,11 +14274,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 276
"__id__": 271
},
"_children": [
{
"__id__": 293
"__id__": 288
}
],
"_active": true,
......@@ -14458,17 +14336,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 292
"__id__": 287
},
"_children": [
{
"__id__": 294
"__id__": 289
}
],
"_active": true,
"_components": [
{
"__id__": 296
"__id__": 291
}
],
"_prefab": null,
......@@ -14524,13 +14402,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 293
"__id__": 288
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 295
"__id__": 290
}
],
"_prefab": null,
......@@ -14586,7 +14464,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 294
"__id__": 289
},
"_enabled": true,
"_materials": [
......@@ -14618,7 +14496,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 293
"__id__": 288
},
"_enabled": true,
"_materials": [
......@@ -14640,11 +14518,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 276
"__id__": 271
},
"_children": [
{
"__id__": 298
"__id__": 293
}
],
"_active": true,
......@@ -14702,17 +14580,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 297
"__id__": 292
},
"_children": [
{
"__id__": 299
"__id__": 294
}
],
"_active": true,
"_components": [
{
"__id__": 301
"__id__": 296
}
],
"_prefab": null,
......@@ -14768,13 +14646,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 298
"__id__": 293
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 300
"__id__": 295
}
],
"_prefab": null,
......@@ -14830,7 +14708,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 299
"__id__": 294
},
"_enabled": true,
"_materials": [
......@@ -14862,7 +14740,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 298
"__id__": 293
},
"_enabled": true,
"_materials": [
......
{
"ver": "1.0.8",
"uuid": "e55f0325-e16e-4a7d-868f-b560302d02f2",
"uuid": "67cf18a8-258b-4b88-9085-0a562b4e644c",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "86d80ccf-380f-4350-ae49-ea1f5684e04d",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.0.8",
"uuid": "728fa40a-c6f6-4f2d-8bab-ce8b6250eff1",
"uuid": "c204847b-d345-4762-abb8-bc4780cbfd1f",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
class CalculativeResize {
static resizeInfo() {
//0.设计尺寸
let baseSize = cc.size(1280, 720);
//1.获取屏幕尺寸
let canvasSize = cc.view.getCanvasSize();
//2.将屏幕宽高 以高度对齐的方式 换算出场景 宽度
let sumSizeW = cc.size(canvasSize.width * baseSize.height / canvasSize.height, baseSize.height)
//3.计算场景宽度与设计宽度比率
let scaleX = sumSizeW.width / baseSize.width;
//高屏幕适配
if (scaleX <= 1) {
let sumSizeY = cc.size(baseSize.width, canvasSize.height * (baseSize.width / canvasSize.width))
let scaleY = sumSizeY.height / baseSize.height;
let posY = sumSizeY.height - baseSize.height;
return {
scaleX: 1,
posX: 0,
moveX: 0,
scaleY: scaleY,
posY: posY,
moveY: - posY / 2
}
} else {
let posX = sumSizeW.width - baseSize.width;
//需要拓展的宽度缩放比
return {
scaleX: scaleX,
posX: posX,
moveX: - posX / 2,
scaleY: 1,
posY: 0,
moveY: 0
};
}
}
}
//关于齐刘海的适配方案。
//1.需要获取对应的手机型号
//2.需要写上安全间距标记(主要是中间部分)
//3.不同的手机安全间距可能不同。(主要适配iPhone X)
cc.Class({
extends: cc.Component,
properties: {
r_width: 1,
r_height: 1,
r_top: 0,
r_bottom: 0,
p_left: 0,
p_right: 0,
p_top: 0,
p_bottom: 0,
black: 0,//用于不能直接缩放的图片(如引导),两边补齐黑边
noHead: 0,
debug: 0,
},
// LIFE-CYCLE CALLBACKS:
onLoad() {
let { scaleX, posX, scaleY, posY } = CalculativeResize.resizeInfo();
this.resizeScaleX = scaleX;
this.resizeScaleY = scaleY;
this.posX = posX;
this.posY = posY;
let { width, height, x, y } = this.node;
this.nodeWidth = width;
this.nodeHeight = height;
this.nodeX = x;
this.nodeY = y;
//增加一个resize的监听,当屏幕出现宽高比变化的时候,进行一次重新适配。
//主要用于刘海屏的重置,以及动态屏幕变化的控制(虚拟按键屏)。
},
start() {
this.resize();
},
update(dt) {
},
onDestroy() {
if (this.black1)
pg.view.removChildren(this.black1);
if (this.black2)
pg.view.removChildren(this.black2);
this.black1 = null;
this.black2 = null;
},
resize() {
if (!this.resizeScaleX && !this.nodeWidth) {
console.warn("手动调用此方法时,不能再onLoad中使用");
return;
}
this.resizeHeight();
this.resizeWidth();
},
//高屏幕适配
resizeHeight() {
if (this.resizeScaleY <= 1.05) return;
let scaleY = this.resizeScaleY;
let posY = this.posY;
let nodeWidth = this.nodeWidth;
let nodeHeight = this.nodeHeight;
let nodeX = this.nodeX;
let nodeY = this.nodeY;
if (this.debug == 1) {
console.log("断点调试点");
}
//宽度拉伸
if (this.r_width == 1) {
this.node.width = nodeWidth * scaleY;
}
//高度拉升
if (this.r_height == 1) {
this.node.height = nodeHeight * scaleY;
// //高度拉伸后,图片顶部齐边【坐标下移】 y坐标下移
// if (this.r_top == 1) {
// this.node.y = nodeY - nodeHeight * (scaleY - 1) / 2;
// }
// //高度拉伸后,图片底部齐边【坐标上移】 y坐标上移
// if (this.r_bottom == 1) {
// this.node.y = nodeY + nodeHeight * (scaleY - 1) / 2;
// }
}
// //如果是刘海屏,减去对应的刘海屏的宽度
// let lhpSize = { top: 0, bottom: 0 };
// //动态左移
// if (this.p_left == 1) {
// this.node.x = nodeX - posX / 2 + lhpSize.top;
// }
// //动态右移
// if (this.p_right == 1) {
// this.node.x = nodeX + posX / 2 - lhpSize.bottom;
// }
//动态上移
if (this.p_top == 1) {
this.node.y = nodeY + posY / 2
}
//动态下移
if (this.p_bottom == 1) {
this.node.y = nodeY - posY / 2
}
},
//长屏幕适配
resizeWidth() {
if (this.resizeScaleX <= 1.05) return;
let resizeScaleX = this.resizeScaleX;
let posX = this.posX;
let nodeWidth = this.nodeWidth;
let nodeHeight = this.nodeHeight;
let nodeX = this.nodeX;
let nodeY = this.nodeY;
if (this.debug == 1) {
console.log("断点调试点");
}
//宽度拉伸
if (this.r_width == 1) {
this.node.width = nodeWidth * resizeScaleX;
}
//高度拉升
if (this.r_height == 1) {
this.node.height = nodeHeight * resizeScaleX;
//高度拉伸后,图片顶部齐边【坐标下移】 y坐标下移
if (this.r_top == 1) {
this.node.y = nodeY - nodeHeight * (resizeScaleX - 1) / 2;
}
//高度拉伸后,图片底部齐边【坐标上移】 y坐标上移
if (this.r_bottom == 1) {
this.node.y = nodeY + nodeHeight * (resizeScaleX - 1) / 2;
}
}
if (this.black == 1) {
let baseSize = cc.size(1280, 720);
this.black1 = this.createBalck();
this.black2 = this.createBalck();
let curWidth = nodeWidth * resizeScaleX;
let curHeight = nodeHeight * resizeScaleX;
let blackWidth = (curWidth - baseSize.width) / 2;
let blackHeight = curHeight;
this.black1.width = blackWidth;
this.black1.height = blackHeight;
this.black2.width = blackWidth;
this.black2.height = blackHeight;
this.black1.x = - baseSize.width / 2 - this.black1.width / 2;
this.black2.x = baseSize.width / 2 + this.black1.width / 2;
this.black1.y = this.black2.y = nodeY;
pg.view.addChild(this.node, this.black1);
pg.view.addChild(this.node, this.black2);
this.black1.active = false;
this.black2.active = false;
if (this.node.nodeData && (this.node.nodeData.bg != "" && this.node.nodeData.bg != "rect")) {
this.black1.active = true;
this.black2.active = true;
}
}
//如果是刘海屏,减去对应的刘海屏的宽度
let lhpSize = { top: 0, bottom: 0 };
if (!this.noHead && posX != 0) lhpSize = { top: 44 * 1.5, bottom: 34 * 1.5 };
//动态左移
if (this.p_left == 1) {
this.node.x = nodeX - posX / 2 + lhpSize.top;
}
//动态右移
if (this.p_right == 1) {
this.node.x = nodeX + posX / 2 - lhpSize.bottom;
}
},
//屏幕适配--end
createBalck() {
let black = cc.instantiate(cc.find('Canvas/blackBg'));
return black;
},
setBlackActive(val) {
if (this.black1)
this.black1.active = val;
if (this.black2)
this.black2.active = val;
}
});
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