Commit a806810c authored by Tt's avatar Tt

1

parent cb51ac25
......@@ -156,67 +156,67 @@
"__id__": 146
},
{
"__id__": 153
"__id__": 151
},
{
"__id__": 160
"__id__": 157
},
{
"__id__": 187
"__id__": 184
},
{
"__id__": 208
"__id__": 205
},
{
"__id__": 210
"__id__": 207
},
{
"__id__": 211
"__id__": 208
},
{
"__id__": 219
"__id__": 216
},
{
"__id__": 220
"__id__": 217
},
{
"__id__": 240
"__id__": 237
},
{
"__id__": 242
"__id__": 238
},
{
"__id__": 246
"__id__": 241
},
{
"__id__": 249
"__id__": 244
},
{
"__id__": 250
"__id__": 245
},
{
"__id__": 251
"__id__": 246
},
{
"__id__": 253
"__id__": 248
},
{
"__id__": 259
"__id__": 254
},
{
"__id__": 272
"__id__": 267
}
],
"_active": true,
"_components": [
{
"__id__": 298
"__id__": 293
},
{
"__id__": 299
"__id__": 294
},
{
"__id__": 300
"__id__": 295
}
],
"_prefab": null,
......@@ -6758,14 +6758,14 @@
"_id": "feA2HsnyFASLUXjdq0vRse"
},
{
"__type__": "69ec05LIXFKKbiJLFkV1Ddi",
"__type__": "8c380BOPeBG8Y9YTRRm42Gx",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
},
"_enabled": true,
"_id": "09R5wk/0NITYGz7Es4tALJ"
"_id": "28elLuMaVCC7/pKR0SaUkT"
},
{
"__type__": "cc.Node",
......@@ -7077,7 +7077,7 @@
"_id": "5d9La3XUBG67/bL44GyMMJ"
},
{
"__type__": "8d943sr1MVLaornPCr8NhxR",
"__type__": "1f427W+WVFCsppfss0OSsEc",
"_name": "",
"_objFlags": 0,
"node": {
......@@ -7085,7 +7085,7 @@
},
"_enabled": true,
"costtime": 4,
"_id": "32zyfUT/9EG4jgWsKPFVzS"
"_id": "4bpMZJ+zpB47A9MDzCTPUP"
},
{
"__type__": "cc.Node",
......@@ -7099,7 +7099,7 @@
"__id__": 147
},
{
"__id__": 150
"__id__": 149
}
],
"_active": false,
......@@ -7164,9 +7164,6 @@
"_components": [
{
"__id__": 148
},
{
"__id__": 149
}
],
"_prefab": null,
......@@ -7249,27 +7246,6 @@
"_atlas": null,
"_id": "52AKEsEpFBrYGn0KSRn4v5"
},
{
"__type__": "a93c7x/WHtNuoPS7etMktd5",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
},
"_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",
......@@ -7281,10 +7257,7 @@
"_active": true,
"_components": [
{
"__id__": 151
},
{
"__id__": 152
"__id__": 150
}
],
"_prefab": null,
......@@ -7340,7 +7313,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 149
},
"_enabled": true,
"_materials": [
......@@ -7367,27 +7340,6 @@
"_atlas": null,
"_id": "bahXJibU5HqZMrCuGhbuP6"
},
{
"__type__": "a93c7x/WHtNuoPS7etMktd5",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
},
"_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",
......@@ -7397,18 +7349,14 @@
},
"_children": [
{
"__id__": 154
"__id__": 152
},
{
"__id__": 156
"__id__": 154
}
],
"_active": false,
"_components": [
{
"__id__": 159
}
],
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -7462,13 +7410,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 153
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 155
"__id__": 153
}
],
"_prefab": null,
......@@ -7524,7 +7472,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 152
},
"_enabled": true,
"_materials": [
......@@ -7556,16 +7504,16 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 153
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 157
"__id__": 155
},
{
"__id__": 158
"__id__": 156
}
],
"_prefab": null,
......@@ -7621,7 +7569,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 154
},
"_enabled": true,
"_materials": [
......@@ -7656,7 +7604,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 154
},
"_enabled": true,
"_color": {
......@@ -7669,27 +7617,6 @@
"_width": 1.5,
"_id": "7eorOc0eJBL7kuwjKM7Nul"
},
{
"__type__": "a93c7x/WHtNuoPS7etMktd5",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 153
},
"_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",
......@@ -7698,6 +7625,9 @@
"__id__": 2
},
"_children": [
{
"__id__": 158
},
{
"__id__": 161
},
......@@ -7705,16 +7635,13 @@
"__id__": 164
},
{
"__id__": 167
"__id__": 171
},
{
"__id__": 174
"__id__": 178
},
{
"__id__": 181
},
{
"__id__": 184
}
],
"_active": false,
......@@ -7772,11 +7699,11 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 160
"__id__": 157
},
"_children": [
{
"__id__": 162
"__id__": 159
}
],
"_active": true,
......@@ -7834,13 +7761,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 161
"__id__": 158
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 163
"__id__": 160
}
],
"_prefab": null,
......@@ -7896,7 +7823,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 162
"__id__": 159
},
"_enabled": true,
"_materials": [
......@@ -7928,11 +7855,11 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 160
"__id__": 157
},
"_children": [
{
"__id__": 165
"__id__": 162
}
],
"_active": true,
......@@ -7990,13 +7917,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 161
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 166
"__id__": 163
}
],
"_prefab": null,
......@@ -8052,7 +7979,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 165
"__id__": 162
},
"_enabled": true,
"_materials": [
......@@ -8084,14 +8011,14 @@
"_name": "line2",
"_objFlags": 0,
"_parent": {
"__id__": 160
"__id__": 157
},
"_children": [
{
"__id__": 168
"__id__": 165
},
{
"__id__": 170
"__id__": 167
}
],
"_active": true,
......@@ -8149,13 +8076,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 167
"__id__": 164
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 169
"__id__": 166
}
],
"_prefab": null,
......@@ -8211,7 +8138,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 168
"__id__": 165
},
"_enabled": true,
"_materials": [
......@@ -8243,17 +8170,17 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 167
"__id__": 164
},
"_children": [
{
"__id__": 171
"__id__": 168
}
],
"_active": false,
"_components": [
{
"__id__": 173
"__id__": 170
}
],
"_prefab": null,
......@@ -8309,13 +8236,13 @@
"_name": "combined-shape-copy-2",
"_objFlags": 0,
"_parent": {
"__id__": 170
"__id__": 167
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 172
"__id__": 169
}
],
"_prefab": null,
......@@ -8371,7 +8298,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 171
"__id__": 168
},
"_enabled": true,
"_materials": [
......@@ -8403,7 +8330,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 170
"__id__": 167
},
"_enabled": true,
"_materials": [
......@@ -8435,14 +8362,14 @@
"_name": "line3",
"_objFlags": 0,
"_parent": {
"__id__": 160
"__id__": 157
},
"_children": [
{
"__id__": 175
"__id__": 172
},
{
"__id__": 177
"__id__": 174
}
],
"_active": true,
......@@ -8500,13 +8427,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 174
"__id__": 171
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 176
"__id__": 173
}
],
"_prefab": null,
......@@ -8562,7 +8489,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 175
"__id__": 172
},
"_enabled": true,
"_materials": [
......@@ -8594,17 +8521,17 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 174
"__id__": 171
},
"_children": [
{
"__id__": 178
"__id__": 175
}
],
"_active": false,
"_components": [
{
"__id__": 180
"__id__": 177
}
],
"_prefab": null,
......@@ -8660,13 +8587,13 @@
"_name": "combined-shape-copy-2",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 174
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 179
"__id__": 176
}
],
"_prefab": null,
......@@ -8722,7 +8649,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 178
"__id__": 175
},
"_enabled": true,
"_materials": [
......@@ -8754,7 +8681,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 177
"__id__": 174
},
"_enabled": true,
"_materials": [
......@@ -8786,11 +8713,11 @@
"_name": "line4",
"_objFlags": 0,
"_parent": {
"__id__": 160
"__id__": 157
},
"_children": [
{
"__id__": 182
"__id__": 179
}
],
"_active": true,
......@@ -8848,13 +8775,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 181
"__id__": 178
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 183
"__id__": 180
}
],
"_prefab": null,
......@@ -8910,7 +8837,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 179
},
"_enabled": true,
"_materials": [
......@@ -8942,11 +8869,11 @@
"_name": "line5",
"_objFlags": 0,
"_parent": {
"__id__": 160
"__id__": 157
},
"_children": [
{
"__id__": 185
"__id__": 182
}
],
"_active": true,
......@@ -9004,13 +8931,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 184
"__id__": 181
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 186
"__id__": 183
}
],
"_prefab": null,
......@@ -9066,7 +8993,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 185
"__id__": 182
},
"_enabled": true,
"_materials": [
......@@ -9102,13 +9029,13 @@
},
"_children": [
{
"__id__": 188
"__id__": 185
},
{
"__id__": 195
"__id__": 192
},
{
"__id__": 202
"__id__": 199
}
],
"_active": false,
......@@ -9166,23 +9093,23 @@
"_name": "sub_0",
"_objFlags": 0,
"_parent": {
"__id__": 187
"__id__": 184
},
"_children": [
{
"__id__": 189
"__id__": 186
},
{
"__id__": 191
"__id__": 188
}
],
"_active": true,
"_components": [
{
"__id__": 193
"__id__": 190
},
{
"__id__": 194
"__id__": 191
}
],
"_prefab": null,
......@@ -9238,13 +9165,13 @@
"_name": "combined-shape_4",
"_objFlags": 0,
"_parent": {
"__id__": 188
"__id__": 185
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 190
"__id__": 187
}
],
"_prefab": null,
......@@ -9300,7 +9227,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 189
"__id__": 186
},
"_enabled": true,
"_materials": [
......@@ -9332,13 +9259,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 188
"__id__": 185
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 192
"__id__": 189
}
],
"_prefab": null,
......@@ -9394,7 +9321,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 191
"__id__": 188
},
"_enabled": true,
"_materials": [
......@@ -9429,7 +9356,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 188
"__id__": 185
},
"_enabled": true,
"_materials": [
......@@ -9461,7 +9388,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 188
"__id__": 185
},
"_enabled": true,
"_normalMaterial": null,
......@@ -9522,7 +9449,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 188
"__id__": 185
},
"_id": "e9hETjbwFN6ofBSoo7woie"
},
......@@ -9531,23 +9458,23 @@
"_name": "sub_1",
"_objFlags": 0,
"_parent": {
"__id__": 187
"__id__": 184
},
"_children": [
{
"__id__": 196
"__id__": 193
},
{
"__id__": 198
"__id__": 195
}
],
"_active": true,
"_components": [
{
"__id__": 200
"__id__": 197
},
{
"__id__": 201
"__id__": 198
}
],
"_prefab": null,
......@@ -9603,13 +9530,13 @@
"_name": "combined-shape_3",
"_objFlags": 0,
"_parent": {
"__id__": 195
"__id__": 192
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 197
"__id__": 194
}
],
"_prefab": null,
......@@ -9665,7 +9592,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 196
"__id__": 193
},
"_enabled": true,
"_materials": [
......@@ -9697,13 +9624,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 195
"__id__": 192
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 199
"__id__": 196
}
],
"_prefab": null,
......@@ -9759,7 +9686,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 198
"__id__": 195
},
"_enabled": true,
"_materials": [
......@@ -9794,7 +9721,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 192
},
"_enabled": true,
"_materials": [
......@@ -9826,7 +9753,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 192
},
"_enabled": true,
"_normalMaterial": null,
......@@ -9887,7 +9814,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 195
"__id__": 192
},
"_id": "8cGgjvgvhL/LuPKRoVnVQq"
},
......@@ -9896,20 +9823,20 @@
"_name": "main",
"_objFlags": 0,
"_parent": {
"__id__": 187
"__id__": 184
},
"_children": [
{
"__id__": 203
"__id__": 200
},
{
"__id__": 205
"__id__": 202
}
],
"_active": true,
"_components": [
{
"__id__": 207
"__id__": 204
}
],
"_prefab": null,
......@@ -9965,13 +9892,13 @@
"_name": "oval-18",
"_objFlags": 0,
"_parent": {
"__id__": 202
"__id__": 199
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 204
"__id__": 201
}
],
"_prefab": null,
......@@ -10027,7 +9954,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 203
"__id__": 200
},
"_enabled": true,
"_materials": [
......@@ -10059,13 +9986,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 202
"__id__": 199
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 206
"__id__": 203
}
],
"_prefab": null,
......@@ -10121,7 +10048,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 205
"__id__": 202
},
"_enabled": true,
"_materials": [
......@@ -10156,7 +10083,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 202
"__id__": 199
},
"_enabled": true,
"_normalMaterial": null,
......@@ -10217,7 +10144,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 202
"__id__": 199
},
"_id": "f41Ic5OXhCRpAxS/kMIRiA"
},
......@@ -10232,7 +10159,7 @@
"_active": false,
"_components": [
{
"__id__": 209
"__id__": 206
}
],
"_prefab": null,
......@@ -10288,7 +10215,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 208
"__id__": 205
},
"_enabled": true,
"_materials": [
......@@ -10382,19 +10309,19 @@
},
"_children": [
{
"__id__": 212
"__id__": 209
},
{
"__id__": 214
"__id__": 211
},
{
"__id__": 216
"__id__": 213
}
],
"_active": false,
"_components": [
{
"__id__": 218
"__id__": 215
}
],
"_prefab": null,
......@@ -10450,13 +10377,13 @@
"_name": "bg_blue",
"_objFlags": 0,
"_parent": {
"__id__": 211
"__id__": 208
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 213
"__id__": 210
}
],
"_prefab": null,
......@@ -10512,7 +10439,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 212
"__id__": 209
},
"_enabled": true,
"_materials": [
......@@ -10544,13 +10471,13 @@
"_name": "bg_green",
"_objFlags": 0,
"_parent": {
"__id__": 211
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 215
"__id__": 212
}
],
"_prefab": null,
......@@ -10606,7 +10533,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 214
"__id__": 211
},
"_enabled": true,
"_materials": [
......@@ -10638,13 +10565,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 211
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 217
"__id__": 214
}
],
"_prefab": null,
......@@ -10700,7 +10627,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 216
"__id__": 213
},
"_enabled": true,
"_materials": [
......@@ -10735,7 +10662,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 211
"__id__": 208
},
"_enabled": true,
"_normalMaterial": null,
......@@ -10796,7 +10723,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 211
"__id__": 208
},
"_id": "176BYmeDpPZ68HlISEHa8t"
},
......@@ -10867,28 +10794,28 @@
},
"_children": [
{
"__id__": 221
"__id__": 218
},
{
"__id__": 223
"__id__": 220
},
{
"__id__": 225
"__id__": 222
},
{
"__id__": 227
"__id__": 224
},
{
"__id__": 229
"__id__": 226
},
{
"__id__": 233
"__id__": 230
}
],
"_active": false,
"_components": [
{
"__id__": 239
"__id__": 236
}
],
"_prefab": null,
......@@ -10944,13 +10871,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 220
"__id__": 217
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 222
"__id__": 219
}
],
"_prefab": null,
......@@ -11006,7 +10933,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 221
"__id__": 218
},
"_enabled": true,
"_materials": [
......@@ -11038,13 +10965,13 @@
"_name": "chose",
"_objFlags": 0,
"_parent": {
"__id__": 220
"__id__": 217
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 224
"__id__": 221
}
],
"_prefab": null,
......@@ -11100,7 +11027,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 223
"__id__": 220
},
"_enabled": true,
"_materials": [
......@@ -11132,13 +11059,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 220
"__id__": 217
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 226
"__id__": 223
}
],
"_prefab": null,
......@@ -11194,7 +11121,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 225
"__id__": 222
},
"_enabled": true,
"_materials": [
......@@ -11226,13 +11153,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 220
"__id__": 217
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 228
"__id__": 225
}
],
"_prefab": null,
......@@ -11288,7 +11215,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 227
"__id__": 224
},
"_enabled": true,
"_materials": [
......@@ -11323,17 +11250,17 @@
"_name": "fail",
"_objFlags": 0,
"_parent": {
"__id__": 220
"__id__": 217
},
"_children": [
{
"__id__": 230
"__id__": 227
}
],
"_active": false,
"_components": [
{
"__id__": 232
"__id__": 229
}
],
"_prefab": null,
......@@ -11389,13 +11316,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 229
"__id__": 226
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 231
"__id__": 228
}
],
"_prefab": null,
......@@ -11451,7 +11378,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 230
"__id__": 227
},
"_enabled": true,
"_materials": [
......@@ -11486,7 +11413,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 229
"__id__": 226
},
"_enabled": true,
"_materials": [
......@@ -11518,20 +11445,20 @@
"_name": "success",
"_objFlags": 0,
"_parent": {
"__id__": 220
"__id__": 217
},
"_children": [
{
"__id__": 234
"__id__": 231
},
{
"__id__": 236
"__id__": 233
}
],
"_active": false,
"_components": [
{
"__id__": 238
"__id__": 235
}
],
"_prefab": null,
......@@ -11587,13 +11514,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 233
"__id__": 230
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 235
"__id__": 232
}
],
"_prefab": null,
......@@ -11649,7 +11576,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 234
"__id__": 231
},
"_enabled": true,
"_materials": [
......@@ -11684,13 +11611,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 233
"__id__": 230
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 237
"__id__": 234
}
],
"_prefab": null,
......@@ -11746,7 +11673,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 236
"__id__": 233
},
"_enabled": true,
"_materials": [
......@@ -11778,7 +11705,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 233
"__id__": 230
},
"_enabled": true,
"_materials": [
......@@ -11810,7 +11737,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 220
"__id__": 217
},
"_enabled": true,
"_normalMaterial": null,
......@@ -11871,7 +11798,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 220
"__id__": 217
},
"_id": "58IQ76yf1KT71BqZoNtHOV"
},
......@@ -11884,11 +11811,7 @@
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 241
}
],
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -11937,27 +11860,6 @@
"groupIndex": 0,
"_id": "2bxgAtmQJP+bUQoreYMry9"
},
{
"__type__": "a93c7x/WHtNuoPS7etMktd5",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 240
},
"_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",
......@@ -11969,13 +11871,10 @@
"_active": false,
"_components": [
{
"__id__": 243
},
{
"__id__": 244
"__id__": 239
},
{
"__id__": 245
"__id__": 240
}
],
"_prefab": null,
......@@ -12031,7 +11930,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 242
"__id__": 238
},
"_enabled": true,
"_materials": [
......@@ -12063,7 +11962,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 242
"__id__": 238
},
"_enabled": true,
"_normalMaterial": null,
......@@ -12124,31 +12023,10 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 242
"__id__": 238
},
"_id": "86ErSTSUhP26kFUGhhqqPn"
},
{
"__type__": "a93c7x/WHtNuoPS7etMktd5",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 242
},
"_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",
......@@ -12160,10 +12038,10 @@
"_active": false,
"_components": [
{
"__id__": 247
"__id__": 242
},
{
"__id__": 248
"__id__": 243
}
],
"_prefab": null,
......@@ -12219,7 +12097,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 246
"__id__": 241
},
"_enabled": true,
"_layoutSize": {
......@@ -12251,7 +12129,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 246
"__id__": 241
},
"_enabled": true,
"alignMode": 1,
......@@ -12400,7 +12278,7 @@
"_active": false,
"_components": [
{
"__id__": 252
"__id__": 247
}
],
"_prefab": null,
......@@ -12456,7 +12334,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 251
"__id__": 246
},
"_enabled": true,
"_materials": [
......@@ -12500,13 +12378,13 @@
},
"_children": [
{
"__id__": 254
"__id__": 249
}
],
"_active": false,
"_components": [
{
"__id__": 258
"__id__": 253
}
],
"_prefab": null,
......@@ -12562,17 +12440,17 @@
"_name": "Star",
"_objFlags": 0,
"_parent": {
"__id__": 253
"__id__": 248
},
"_children": [
{
"__id__": 255
"__id__": 250
}
],
"_active": false,
"_components": [
{
"__id__": 257
"__id__": 252
}
],
"_prefab": null,
......@@ -12628,13 +12506,13 @@
"_name": "StarBig",
"_objFlags": 0,
"_parent": {
"__id__": 254
"__id__": 249
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 256
"__id__": 251
}
],
"_prefab": null,
......@@ -12690,7 +12568,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 255
"__id__": 250
},
"_enabled": true,
"_materials": [
......@@ -12722,7 +12600,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 254
"__id__": 249
},
"_enabled": true,
"_materials": [
......@@ -12754,7 +12632,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 253
"__id__": 248
},
"_enabled": true,
"_materials": [
......@@ -12790,22 +12668,22 @@
},
"_children": [
{
"__id__": 260
"__id__": 255
},
{
"__id__": 262
"__id__": 257
},
{
"__id__": 264
"__id__": 259
},
{
"__id__": 266
"__id__": 261
},
{
"__id__": 268
"__id__": 263
},
{
"__id__": 270
"__id__": 265
}
],
"_active": false,
......@@ -12863,13 +12741,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 259
"__id__": 254
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 261
"__id__": 256
}
],
"_prefab": null,
......@@ -12925,7 +12803,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 260
"__id__": 255
},
"_enabled": true,
"_materials": [
......@@ -12957,13 +12835,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 259
"__id__": 254
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 263
"__id__": 258
}
],
"_prefab": null,
......@@ -13019,7 +12897,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 262
"__id__": 257
},
"_enabled": true,
"_materials": [
......@@ -13051,13 +12929,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 259
"__id__": 254
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 265
"__id__": 260
}
],
"_prefab": null,
......@@ -13113,7 +12991,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 264
"__id__": 259
},
"_enabled": true,
"_materials": [
......@@ -13145,13 +13023,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 259
"__id__": 254
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 267
"__id__": 262
}
],
"_prefab": null,
......@@ -13207,7 +13085,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 266
"__id__": 261
},
"_enabled": true,
"_materials": [
......@@ -13239,13 +13117,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 259
"__id__": 254
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 269
"__id__": 264
}
],
"_prefab": null,
......@@ -13301,7 +13179,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 268
"__id__": 263
},
"_enabled": true,
"_materials": [
......@@ -13333,13 +13211,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 259
"__id__": 254
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 271
"__id__": 266
}
],
"_prefab": null,
......@@ -13395,7 +13273,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 270
"__id__": 265
},
"_enabled": true,
"_materials": [
......@@ -13430,6 +13308,9 @@
"__id__": 2
},
"_children": [
{
"__id__": 268
},
{
"__id__": 273
},
......@@ -13441,9 +13322,6 @@
},
{
"__id__": 288
},
{
"__id__": 293
}
],
"_active": false,
......@@ -13501,11 +13379,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 272
"__id__": 267
},
"_children": [
{
"__id__": 274
"__id__": 269
}
],
"_active": true,
......@@ -13563,17 +13441,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 273
"__id__": 268
},
"_children": [
{
"__id__": 275
"__id__": 270
}
],
"_active": true,
"_components": [
{
"__id__": 277
"__id__": 272
}
],
"_prefab": null,
......@@ -13629,13 +13507,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 274
"__id__": 269
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 276
"__id__": 271
}
],
"_prefab": null,
......@@ -13691,7 +13569,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 275
"__id__": 270
},
"_enabled": true,
"_materials": [
......@@ -13723,7 +13601,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 274
"__id__": 269
},
"_enabled": true,
"_materials": [
......@@ -13745,11 +13623,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 272
"__id__": 267
},
"_children": [
{
"__id__": 279
"__id__": 274
}
],
"_active": true,
......@@ -13807,17 +13685,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 273
},
"_children": [
{
"__id__": 280
"__id__": 275
}
],
"_active": true,
"_components": [
{
"__id__": 282
"__id__": 277
}
],
"_prefab": null,
......@@ -13873,13 +13751,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 279
"__id__": 274
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 281
"__id__": 276
}
],
"_prefab": null,
......@@ -13935,7 +13813,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 280
"__id__": 275
},
"_enabled": true,
"_materials": [
......@@ -13967,7 +13845,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 279
"__id__": 274
},
"_enabled": true,
"_materials": [
......@@ -13989,11 +13867,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 272
"__id__": 267
},
"_children": [
{
"__id__": 284
"__id__": 279
}
],
"_active": true,
......@@ -14051,17 +13929,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 283
"__id__": 278
},
"_children": [
{
"__id__": 285
"__id__": 280
}
],
"_active": true,
"_components": [
{
"__id__": 287
"__id__": 282
}
],
"_prefab": null,
......@@ -14117,13 +13995,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 284
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 286
"__id__": 281
}
],
"_prefab": null,
......@@ -14179,7 +14057,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 285
"__id__": 280
},
"_enabled": true,
"_materials": [
......@@ -14211,7 +14089,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 284
"__id__": 279
},
"_enabled": true,
"_materials": [
......@@ -14233,11 +14111,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 272
"__id__": 267
},
"_children": [
{
"__id__": 289
"__id__": 284
}
],
"_active": true,
......@@ -14295,17 +14173,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 288
"__id__": 283
},
"_children": [
{
"__id__": 290
"__id__": 285
}
],
"_active": true,
"_components": [
{
"__id__": 292
"__id__": 287
}
],
"_prefab": null,
......@@ -14361,13 +14239,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 289
"__id__": 284
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 291
"__id__": 286
}
],
"_prefab": null,
......@@ -14423,7 +14301,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 290
"__id__": 285
},
"_enabled": true,
"_materials": [
......@@ -14455,7 +14333,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 289
"__id__": 284
},
"_enabled": true,
"_materials": [
......@@ -14477,11 +14355,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 272
"__id__": 267
},
"_children": [
{
"__id__": 294
"__id__": 289
}
],
"_active": true,
......@@ -14539,17 +14417,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 293
"__id__": 288
},
"_children": [
{
"__id__": 295
"__id__": 290
}
],
"_active": true,
"_components": [
{
"__id__": 297
"__id__": 292
}
],
"_prefab": null,
......@@ -14605,13 +14483,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 294
"__id__": 289
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 296
"__id__": 291
}
],
"_prefab": null,
......@@ -14667,7 +14545,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 295
"__id__": 290
},
"_enabled": true,
"_materials": [
......@@ -14699,7 +14577,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 294
"__id__": 289
},
"_enabled": true,
"_materials": [
......
{
"ver": "1.0.8",
"uuid": "a93c7c7f-587b-4dba-83d2-edeb4c92d779",
"uuid": "8c38004e-3de0-46f1-8f58-4d1466e361b1",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "8d943b2b-d4c5-4b6a-8ae7-3c2afc361c51",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.0.8",
"uuid": "69ec0e4b-2171-4a29-b889-2c5915d43762",
"uuid": "1f4275be-5951-42b2-9a5f-b2cd0e4ac11c",
"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