Commit 88329c28 authored by yu's avatar yu

1

parent 29caab5b
...@@ -156,67 +156,67 @@ ...@@ -156,67 +156,67 @@
"__id__": 147 "__id__": 147
}, },
{ {
"__id__": 154 "__id__": 152
}, },
{ {
"__id__": 161 "__id__": 158
}, },
{ {
"__id__": 188 "__id__": 185
}, },
{ {
"__id__": 209 "__id__": 206
}, },
{ {
"__id__": 211 "__id__": 208
}, },
{ {
"__id__": 212 "__id__": 209
}, },
{ {
"__id__": 220 "__id__": 217
}, },
{ {
"__id__": 221 "__id__": 218
}, },
{ {
"__id__": 241 "__id__": 238
}, },
{ {
"__id__": 243 "__id__": 239
}, },
{ {
"__id__": 247 "__id__": 242
}, },
{ {
"__id__": 250 "__id__": 245
}, },
{ {
"__id__": 251 "__id__": 246
}, },
{ {
"__id__": 252 "__id__": 247
}, },
{ {
"__id__": 254 "__id__": 249
}, },
{ {
"__id__": 260 "__id__": 255
}, },
{ {
"__id__": 273 "__id__": 268
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 299 "__id__": 294
}, },
{ {
"__id__": 300 "__id__": 295
}, },
{ {
"__id__": 301 "__id__": 296
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6786,14 +6786,14 @@ ...@@ -6786,14 +6786,14 @@
"_id": "feA2HsnyFASLUXjdq0vRse" "_id": "feA2HsnyFASLUXjdq0vRse"
}, },
{ {
"__type__": "2fcfdW2e5VPAobxJ60HtqEp", "__type__": "3956eXny+9PNJ+wTcpRViDf",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 127 "__id__": 127
}, },
"_enabled": true, "_enabled": true,
"_id": "09R5wk/0NITYGz7Es4tALJ" "_id": "e2PdlqhBVNn5l7lG/sQZ/s"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -7105,7 +7105,7 @@ ...@@ -7105,7 +7105,7 @@
"_id": "5d9La3XUBG67/bL44GyMMJ" "_id": "5d9La3XUBG67/bL44GyMMJ"
}, },
{ {
"__type__": "c55d4E8fBtKP6qyRrHgJ2FL", "__type__": "7250fyOR8dO3o62LVv7p6iw",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -7113,7 +7113,7 @@ ...@@ -7113,7 +7113,7 @@
}, },
"_enabled": true, "_enabled": true,
"costtime": 4, "costtime": 4,
"_id": "32zyfUT/9EG4jgWsKPFVzS" "_id": "e1VTXLE5ROaZB/94bIh6k8"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -7127,7 +7127,7 @@ ...@@ -7127,7 +7127,7 @@
"__id__": 148 "__id__": 148
}, },
{ {
"__id__": 151 "__id__": 150
} }
], ],
"_active": false, "_active": false,
...@@ -7192,9 +7192,6 @@ ...@@ -7192,9 +7192,6 @@
"_components": [ "_components": [
{ {
"__id__": 149 "__id__": 149
},
{
"__id__": 150
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7277,27 +7274,6 @@ ...@@ -7277,27 +7274,6 @@
"_atlas": null, "_atlas": null,
"_id": "52AKEsEpFBrYGn0KSRn4v5" "_id": "52AKEsEpFBrYGn0KSRn4v5"
}, },
{
"__type__": "230a95cBJpE5qMpGRW24FLR",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
},
"_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", "__type__": "cc.Node",
"_name": "invalid-name_2", "_name": "invalid-name_2",
...@@ -7309,10 +7285,7 @@ ...@@ -7309,10 +7285,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 152 "__id__": 151
},
{
"__id__": 153
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7368,7 +7341,7 @@ ...@@ -7368,7 +7341,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 151 "__id__": 150
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7395,27 +7368,6 @@ ...@@ -7395,27 +7368,6 @@
"_atlas": null, "_atlas": null,
"_id": "bahXJibU5HqZMrCuGhbuP6" "_id": "bahXJibU5HqZMrCuGhbuP6"
}, },
{
"__type__": "230a95cBJpE5qMpGRW24FLR",
"_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": 1,
"black": 0,
"noHead": 0,
"debug": 0,
"_id": "c0Fj3pVLRAQ5fE3Ob6H8hI"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "title", "_name": "title",
...@@ -7425,18 +7377,14 @@ ...@@ -7425,18 +7377,14 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 155 "__id__": 153
}, },
{ {
"__id__": 157 "__id__": 155
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [],
{
"__id__": 160
}
],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -7490,13 +7438,13 @@ ...@@ -7490,13 +7438,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 154 "__id__": 152
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 156 "__id__": 154
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7552,7 +7500,7 @@ ...@@ -7552,7 +7500,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 155 "__id__": 153
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7584,16 +7532,16 @@ ...@@ -7584,16 +7532,16 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 154 "__id__": 152
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 158 "__id__": 156
}, },
{ {
"__id__": 159 "__id__": 157
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7649,7 +7597,7 @@ ...@@ -7649,7 +7597,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 157 "__id__": 155
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7684,7 +7632,7 @@ ...@@ -7684,7 +7632,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 157 "__id__": 155
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -7697,27 +7645,6 @@ ...@@ -7697,27 +7645,6 @@
"_width": 1.5, "_width": 1.5,
"_id": "7eorOc0eJBL7kuwjKM7Nul" "_id": "7eorOc0eJBL7kuwjKM7Nul"
}, },
{
"__type__": "230a95cBJpE5qMpGRW24FLR",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
},
"_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", "__type__": "cc.Node",
"_name": "line", "_name": "line",
...@@ -7726,6 +7653,9 @@ ...@@ -7726,6 +7653,9 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 159
},
{ {
"__id__": 162 "__id__": 162
}, },
...@@ -7733,16 +7663,13 @@ ...@@ -7733,16 +7663,13 @@
"__id__": 165 "__id__": 165
}, },
{ {
"__id__": 168 "__id__": 172
}, },
{ {
"__id__": 175 "__id__": 179
}, },
{ {
"__id__": 182 "__id__": 182
},
{
"__id__": 185
} }
], ],
"_active": false, "_active": false,
...@@ -7800,11 +7727,11 @@ ...@@ -7800,11 +7727,11 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 161 "__id__": 158
}, },
"_children": [ "_children": [
{ {
"__id__": 163 "__id__": 160
} }
], ],
"_active": true, "_active": true,
...@@ -7862,13 +7789,13 @@ ...@@ -7862,13 +7789,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 162 "__id__": 159
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 164 "__id__": 161
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7924,7 +7851,7 @@ ...@@ -7924,7 +7851,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 163 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7956,11 +7883,11 @@ ...@@ -7956,11 +7883,11 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 161 "__id__": 158
}, },
"_children": [ "_children": [
{ {
"__id__": 166 "__id__": 163
} }
], ],
"_active": true, "_active": true,
...@@ -8018,13 +7945,13 @@ ...@@ -8018,13 +7945,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 165 "__id__": 162
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 167 "__id__": 164
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8080,7 +8007,7 @@ ...@@ -8080,7 +8007,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 166 "__id__": 163
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8112,14 +8039,14 @@ ...@@ -8112,14 +8039,14 @@
"_name": "line2", "_name": "line2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 161 "__id__": 158
}, },
"_children": [ "_children": [
{ {
"__id__": 169 "__id__": 166
}, },
{ {
"__id__": 171 "__id__": 168
} }
], ],
"_active": true, "_active": true,
...@@ -8177,13 +8104,13 @@ ...@@ -8177,13 +8104,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 168 "__id__": 165
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 170 "__id__": 167
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8239,7 +8166,7 @@ ...@@ -8239,7 +8166,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 169 "__id__": 166
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8271,17 +8198,17 @@ ...@@ -8271,17 +8198,17 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 168 "__id__": 165
}, },
"_children": [ "_children": [
{ {
"__id__": 172 "__id__": 169
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 174 "__id__": 171
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8337,13 +8264,13 @@ ...@@ -8337,13 +8264,13 @@
"_name": "combined-shape-copy-2", "_name": "combined-shape-copy-2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 171 "__id__": 168
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 173 "__id__": 170
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8399,7 +8326,7 @@ ...@@ -8399,7 +8326,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 172 "__id__": 169
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8431,7 +8358,7 @@ ...@@ -8431,7 +8358,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 171 "__id__": 168
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8463,14 +8390,14 @@ ...@@ -8463,14 +8390,14 @@
"_name": "line3", "_name": "line3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 161 "__id__": 158
}, },
"_children": [ "_children": [
{ {
"__id__": 176 "__id__": 173
}, },
{ {
"__id__": 178 "__id__": 175
} }
], ],
"_active": true, "_active": true,
...@@ -8528,13 +8455,13 @@ ...@@ -8528,13 +8455,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 175 "__id__": 172
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 177 "__id__": 174
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8590,7 +8517,7 @@ ...@@ -8590,7 +8517,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 176 "__id__": 173
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8622,17 +8549,17 @@ ...@@ -8622,17 +8549,17 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 175 "__id__": 172
}, },
"_children": [ "_children": [
{ {
"__id__": 179 "__id__": 176
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 181 "__id__": 178
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8688,13 +8615,13 @@ ...@@ -8688,13 +8615,13 @@
"_name": "combined-shape-copy-2", "_name": "combined-shape-copy-2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 178 "__id__": 175
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 180 "__id__": 177
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8750,7 +8677,7 @@ ...@@ -8750,7 +8677,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 179 "__id__": 176
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8782,7 +8709,7 @@ ...@@ -8782,7 +8709,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 178 "__id__": 175
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8814,11 +8741,11 @@ ...@@ -8814,11 +8741,11 @@
"_name": "line4", "_name": "line4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 161 "__id__": 158
}, },
"_children": [ "_children": [
{ {
"__id__": 183 "__id__": 180
} }
], ],
"_active": true, "_active": true,
...@@ -8876,13 +8803,13 @@ ...@@ -8876,13 +8803,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 182 "__id__": 179
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 184 "__id__": 181
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8938,7 +8865,7 @@ ...@@ -8938,7 +8865,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 183 "__id__": 180
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8970,11 +8897,11 @@ ...@@ -8970,11 +8897,11 @@
"_name": "line5", "_name": "line5",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 161 "__id__": 158
}, },
"_children": [ "_children": [
{ {
"__id__": 186 "__id__": 183
} }
], ],
"_active": true, "_active": true,
...@@ -9032,13 +8959,13 @@ ...@@ -9032,13 +8959,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 185 "__id__": 182
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 187 "__id__": 184
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9094,7 +9021,7 @@ ...@@ -9094,7 +9021,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 186 "__id__": 183
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9130,13 +9057,13 @@ ...@@ -9130,13 +9057,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 189 "__id__": 186
}, },
{ {
"__id__": 196 "__id__": 193
}, },
{ {
"__id__": 203 "__id__": 200
} }
], ],
"_active": false, "_active": false,
...@@ -9194,23 +9121,23 @@ ...@@ -9194,23 +9121,23 @@
"_name": "sub_0", "_name": "sub_0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 188 "__id__": 185
}, },
"_children": [ "_children": [
{ {
"__id__": 190 "__id__": 187
}, },
{ {
"__id__": 192 "__id__": 189
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 194 "__id__": 191
}, },
{ {
"__id__": 195 "__id__": 192
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9266,13 +9193,13 @@ ...@@ -9266,13 +9193,13 @@
"_name": "combined-shape_4", "_name": "combined-shape_4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 189 "__id__": 186
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 191 "__id__": 188
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9328,7 +9255,7 @@ ...@@ -9328,7 +9255,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 190 "__id__": 187
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9360,13 +9287,13 @@ ...@@ -9360,13 +9287,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 189 "__id__": 186
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 193 "__id__": 190
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9422,7 +9349,7 @@ ...@@ -9422,7 +9349,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 192 "__id__": 189
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9457,7 +9384,7 @@ ...@@ -9457,7 +9384,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 189 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9489,7 +9416,7 @@ ...@@ -9489,7 +9416,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 189 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -9550,7 +9477,7 @@ ...@@ -9550,7 +9477,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 189 "__id__": 186
}, },
"_id": "e9hETjbwFN6ofBSoo7woie" "_id": "e9hETjbwFN6ofBSoo7woie"
}, },
...@@ -9559,23 +9486,23 @@ ...@@ -9559,23 +9486,23 @@
"_name": "sub_1", "_name": "sub_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 188 "__id__": 185
}, },
"_children": [ "_children": [
{ {
"__id__": 197 "__id__": 194
}, },
{ {
"__id__": 199 "__id__": 196
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 201 "__id__": 198
}, },
{ {
"__id__": 202 "__id__": 199
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9631,13 +9558,13 @@ ...@@ -9631,13 +9558,13 @@
"_name": "combined-shape_3", "_name": "combined-shape_3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 196 "__id__": 193
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 198 "__id__": 195
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9693,7 +9620,7 @@ ...@@ -9693,7 +9620,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 197 "__id__": 194
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9725,13 +9652,13 @@ ...@@ -9725,13 +9652,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 196 "__id__": 193
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 200 "__id__": 197
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9787,7 +9714,7 @@ ...@@ -9787,7 +9714,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 199 "__id__": 196
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9822,7 +9749,7 @@ ...@@ -9822,7 +9749,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 196 "__id__": 193
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9854,7 +9781,7 @@ ...@@ -9854,7 +9781,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 196 "__id__": 193
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -9915,7 +9842,7 @@ ...@@ -9915,7 +9842,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 196 "__id__": 193
}, },
"_id": "8cGgjvgvhL/LuPKRoVnVQq" "_id": "8cGgjvgvhL/LuPKRoVnVQq"
}, },
...@@ -9924,20 +9851,20 @@ ...@@ -9924,20 +9851,20 @@
"_name": "main", "_name": "main",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 188 "__id__": 185
}, },
"_children": [ "_children": [
{ {
"__id__": 204 "__id__": 201
}, },
{ {
"__id__": 206 "__id__": 203
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 208 "__id__": 205
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9993,13 +9920,13 @@ ...@@ -9993,13 +9920,13 @@
"_name": "oval-18", "_name": "oval-18",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 203 "__id__": 200
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 205 "__id__": 202
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10055,7 +9982,7 @@ ...@@ -10055,7 +9982,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 204 "__id__": 201
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10087,13 +10014,13 @@ ...@@ -10087,13 +10014,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 203 "__id__": 200
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 207 "__id__": 204
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10149,7 +10076,7 @@ ...@@ -10149,7 +10076,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 206 "__id__": 203
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10184,7 +10111,7 @@ ...@@ -10184,7 +10111,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 203 "__id__": 200
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10245,7 +10172,7 @@ ...@@ -10245,7 +10172,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 203 "__id__": 200
}, },
"_id": "f41Ic5OXhCRpAxS/kMIRiA" "_id": "f41Ic5OXhCRpAxS/kMIRiA"
}, },
...@@ -10260,7 +10187,7 @@ ...@@ -10260,7 +10187,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 210 "__id__": 207
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10316,7 +10243,7 @@ ...@@ -10316,7 +10243,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 209 "__id__": 206
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10410,19 +10337,19 @@ ...@@ -10410,19 +10337,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 213 "__id__": 210
}, },
{ {
"__id__": 215 "__id__": 212
}, },
{ {
"__id__": 217 "__id__": 214
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 219 "__id__": 216
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10478,13 +10405,13 @@ ...@@ -10478,13 +10405,13 @@
"_name": "bg_blue", "_name": "bg_blue",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 212 "__id__": 209
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 214 "__id__": 211
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10540,7 +10467,7 @@ ...@@ -10540,7 +10467,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 213 "__id__": 210
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10572,13 +10499,13 @@ ...@@ -10572,13 +10499,13 @@
"_name": "bg_green", "_name": "bg_green",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 212 "__id__": 209
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 216 "__id__": 213
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10634,7 +10561,7 @@ ...@@ -10634,7 +10561,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 215 "__id__": 212
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10666,13 +10593,13 @@ ...@@ -10666,13 +10593,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 212 "__id__": 209
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 218 "__id__": 215
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10728,7 +10655,7 @@ ...@@ -10728,7 +10655,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 217 "__id__": 214
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10763,7 +10690,7 @@ ...@@ -10763,7 +10690,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 212 "__id__": 209
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10824,7 +10751,7 @@ ...@@ -10824,7 +10751,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 212 "__id__": 209
}, },
"_id": "176BYmeDpPZ68HlISEHa8t" "_id": "176BYmeDpPZ68HlISEHa8t"
}, },
...@@ -10895,28 +10822,28 @@ ...@@ -10895,28 +10822,28 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 222 "__id__": 219
}, },
{ {
"__id__": 224 "__id__": 221
}, },
{ {
"__id__": 226 "__id__": 223
}, },
{ {
"__id__": 228 "__id__": 225
}, },
{ {
"__id__": 230 "__id__": 227
}, },
{ {
"__id__": 234 "__id__": 231
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 240 "__id__": 237
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10972,13 +10899,13 @@ ...@@ -10972,13 +10899,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 218
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 223 "__id__": 220
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11034,7 +10961,7 @@ ...@@ -11034,7 +10961,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 222 "__id__": 219
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11066,13 +10993,13 @@ ...@@ -11066,13 +10993,13 @@
"_name": "chose", "_name": "chose",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 218
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 225 "__id__": 222
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11128,7 +11055,7 @@ ...@@ -11128,7 +11055,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 224 "__id__": 221
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11160,13 +11087,13 @@ ...@@ -11160,13 +11087,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 218
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 227 "__id__": 224
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11222,7 +11149,7 @@ ...@@ -11222,7 +11149,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 226 "__id__": 223
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11254,13 +11181,13 @@ ...@@ -11254,13 +11181,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 218
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 229 "__id__": 226
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11316,7 +11243,7 @@ ...@@ -11316,7 +11243,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 228 "__id__": 225
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11351,17 +11278,17 @@ ...@@ -11351,17 +11278,17 @@
"_name": "fail", "_name": "fail",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 218
}, },
"_children": [ "_children": [
{ {
"__id__": 231 "__id__": 228
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 233 "__id__": 230
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11417,13 +11344,13 @@ ...@@ -11417,13 +11344,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 230 "__id__": 227
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 232 "__id__": 229
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11479,7 +11406,7 @@ ...@@ -11479,7 +11406,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 231 "__id__": 228
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11514,7 +11441,7 @@ ...@@ -11514,7 +11441,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 230 "__id__": 227
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11546,20 +11473,20 @@ ...@@ -11546,20 +11473,20 @@
"_name": "success", "_name": "success",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 218
}, },
"_children": [ "_children": [
{ {
"__id__": 235 "__id__": 232
}, },
{ {
"__id__": 237 "__id__": 234
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 239 "__id__": 236
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11615,13 +11542,13 @@ ...@@ -11615,13 +11542,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 234 "__id__": 231
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 236 "__id__": 233
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11677,7 +11604,7 @@ ...@@ -11677,7 +11604,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 235 "__id__": 232
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11712,13 +11639,13 @@ ...@@ -11712,13 +11639,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 234 "__id__": 231
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 238 "__id__": 235
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11774,7 +11701,7 @@ ...@@ -11774,7 +11701,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 237 "__id__": 234
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11806,7 +11733,7 @@ ...@@ -11806,7 +11733,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 234 "__id__": 231
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11838,7 +11765,7 @@ ...@@ -11838,7 +11765,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 221 "__id__": 218
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -11899,7 +11826,7 @@ ...@@ -11899,7 +11826,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 221 "__id__": 218
}, },
"_id": "58IQ76yf1KT71BqZoNtHOV" "_id": "58IQ76yf1KT71BqZoNtHOV"
}, },
...@@ -11912,11 +11839,7 @@ ...@@ -11912,11 +11839,7 @@
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [],
{
"__id__": 242
}
],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -11965,27 +11888,6 @@ ...@@ -11965,27 +11888,6 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "2bxgAtmQJP+bUQoreYMry9" "_id": "2bxgAtmQJP+bUQoreYMry9"
}, },
{
"__type__": "230a95cBJpE5qMpGRW24FLR",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 241
},
"_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", "__type__": "cc.Node",
"_name": "btn_replay1", "_name": "btn_replay1",
...@@ -11997,13 +11899,10 @@ ...@@ -11997,13 +11899,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 244 "__id__": 240
},
{
"__id__": 245
}, },
{ {
"__id__": 246 "__id__": 241
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12059,7 +11958,7 @@ ...@@ -12059,7 +11958,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 243 "__id__": 239
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12091,7 +11990,7 @@ ...@@ -12091,7 +11990,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 243 "__id__": 239
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -12152,31 +12051,10 @@ ...@@ -12152,31 +12051,10 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 243 "__id__": 239
}, },
"_id": "86ErSTSUhP26kFUGhhqqPn" "_id": "86ErSTSUhP26kFUGhhqqPn"
}, },
{
"__type__": "230a95cBJpE5qMpGRW24FLR",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 243
},
"_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", "__type__": "cc.Node",
"_name": "layout_stars", "_name": "layout_stars",
...@@ -12188,10 +12066,10 @@ ...@@ -12188,10 +12066,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 248 "__id__": 243
}, },
{ {
"__id__": 249 "__id__": 244
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12247,7 +12125,7 @@ ...@@ -12247,7 +12125,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 247 "__id__": 242
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -12279,7 +12157,7 @@ ...@@ -12279,7 +12157,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 247 "__id__": 242
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -12428,7 +12306,7 @@ ...@@ -12428,7 +12306,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 253 "__id__": 248
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12484,7 +12362,7 @@ ...@@ -12484,7 +12362,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 252 "__id__": 247
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12528,13 +12406,13 @@ ...@@ -12528,13 +12406,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 255 "__id__": 250
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 259 "__id__": 254
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12590,17 +12468,17 @@ ...@@ -12590,17 +12468,17 @@
"_name": "Star", "_name": "Star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 254 "__id__": 249
}, },
"_children": [ "_children": [
{ {
"__id__": 256 "__id__": 251
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 258 "__id__": 253
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12656,13 +12534,13 @@ ...@@ -12656,13 +12534,13 @@
"_name": "StarBig", "_name": "StarBig",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 255 "__id__": 250
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 257 "__id__": 252
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12718,7 +12596,7 @@ ...@@ -12718,7 +12596,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 256 "__id__": 251
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12750,7 +12628,7 @@ ...@@ -12750,7 +12628,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 255 "__id__": 250
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12782,7 +12660,7 @@ ...@@ -12782,7 +12660,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 254 "__id__": 249
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12818,22 +12696,22 @@ ...@@ -12818,22 +12696,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 261 "__id__": 256
}, },
{ {
"__id__": 263 "__id__": 258
}, },
{ {
"__id__": 265 "__id__": 260
}, },
{ {
"__id__": 267 "__id__": 262
}, },
{ {
"__id__": 269 "__id__": 264
}, },
{ {
"__id__": 271 "__id__": 266
} }
], ],
"_active": false, "_active": false,
...@@ -12891,13 +12769,13 @@ ...@@ -12891,13 +12769,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 260 "__id__": 255
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 262 "__id__": 257
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12953,7 +12831,7 @@ ...@@ -12953,7 +12831,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 261 "__id__": 256
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12985,13 +12863,13 @@ ...@@ -12985,13 +12863,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 260 "__id__": 255
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 264 "__id__": 259
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13047,7 +12925,7 @@ ...@@ -13047,7 +12925,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 263 "__id__": 258
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13079,13 +12957,13 @@ ...@@ -13079,13 +12957,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 260 "__id__": 255
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 266 "__id__": 261
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13141,7 +13019,7 @@ ...@@ -13141,7 +13019,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 265 "__id__": 260
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13173,13 +13051,13 @@ ...@@ -13173,13 +13051,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 260 "__id__": 255
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 268 "__id__": 263
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13235,7 +13113,7 @@ ...@@ -13235,7 +13113,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 267 "__id__": 262
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13267,13 +13145,13 @@ ...@@ -13267,13 +13145,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 260 "__id__": 255
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 270 "__id__": 265
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13329,7 +13207,7 @@ ...@@ -13329,7 +13207,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 269 "__id__": 264
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13361,13 +13239,13 @@ ...@@ -13361,13 +13239,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 260 "__id__": 255
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 272 "__id__": 267
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13423,7 +13301,7 @@ ...@@ -13423,7 +13301,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 271 "__id__": 266
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13458,6 +13336,9 @@ ...@@ -13458,6 +13336,9 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 269
},
{ {
"__id__": 274 "__id__": 274
}, },
...@@ -13469,9 +13350,6 @@ ...@@ -13469,9 +13350,6 @@
}, },
{ {
"__id__": 289 "__id__": 289
},
{
"__id__": 294
} }
], ],
"_active": false, "_active": false,
...@@ -13529,11 +13407,11 @@ ...@@ -13529,11 +13407,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 273 "__id__": 268
}, },
"_children": [ "_children": [
{ {
"__id__": 275 "__id__": 270
} }
], ],
"_active": true, "_active": true,
...@@ -13591,17 +13469,17 @@ ...@@ -13591,17 +13469,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 274 "__id__": 269
}, },
"_children": [ "_children": [
{ {
"__id__": 276 "__id__": 271
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 278 "__id__": 273
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13657,13 +13535,13 @@ ...@@ -13657,13 +13535,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 275 "__id__": 270
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 277 "__id__": 272
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13719,7 +13597,7 @@ ...@@ -13719,7 +13597,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 276 "__id__": 271
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13751,7 +13629,7 @@ ...@@ -13751,7 +13629,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 275 "__id__": 270
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13773,11 +13651,11 @@ ...@@ -13773,11 +13651,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 273 "__id__": 268
}, },
"_children": [ "_children": [
{ {
"__id__": 280 "__id__": 275
} }
], ],
"_active": true, "_active": true,
...@@ -13835,17 +13713,17 @@ ...@@ -13835,17 +13713,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 279 "__id__": 274
}, },
"_children": [ "_children": [
{ {
"__id__": 281 "__id__": 276
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 283 "__id__": 278
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13901,13 +13779,13 @@ ...@@ -13901,13 +13779,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 280 "__id__": 275
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 282 "__id__": 277
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13963,7 +13841,7 @@ ...@@ -13963,7 +13841,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 281 "__id__": 276
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13995,7 +13873,7 @@ ...@@ -13995,7 +13873,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 280 "__id__": 275
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14017,11 +13895,11 @@ ...@@ -14017,11 +13895,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 273 "__id__": 268
}, },
"_children": [ "_children": [
{ {
"__id__": 285 "__id__": 280
} }
], ],
"_active": true, "_active": true,
...@@ -14079,17 +13957,17 @@ ...@@ -14079,17 +13957,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 284 "__id__": 279
}, },
"_children": [ "_children": [
{ {
"__id__": 286 "__id__": 281
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 288 "__id__": 283
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14145,13 +14023,13 @@ ...@@ -14145,13 +14023,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 285 "__id__": 280
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 287 "__id__": 282
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14207,7 +14085,7 @@ ...@@ -14207,7 +14085,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 286 "__id__": 281
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14239,7 +14117,7 @@ ...@@ -14239,7 +14117,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 285 "__id__": 280
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14261,11 +14139,11 @@ ...@@ -14261,11 +14139,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 273 "__id__": 268
}, },
"_children": [ "_children": [
{ {
"__id__": 290 "__id__": 285
} }
], ],
"_active": true, "_active": true,
...@@ -14323,17 +14201,17 @@ ...@@ -14323,17 +14201,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 289 "__id__": 284
}, },
"_children": [ "_children": [
{ {
"__id__": 291 "__id__": 286
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 293 "__id__": 288
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14389,13 +14267,13 @@ ...@@ -14389,13 +14267,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 290 "__id__": 285
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 292 "__id__": 287
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14451,7 +14329,7 @@ ...@@ -14451,7 +14329,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 291 "__id__": 286
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14483,7 +14361,7 @@ ...@@ -14483,7 +14361,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 290 "__id__": 285
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14505,11 +14383,11 @@ ...@@ -14505,11 +14383,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 273 "__id__": 268
}, },
"_children": [ "_children": [
{ {
"__id__": 295 "__id__": 290
} }
], ],
"_active": true, "_active": true,
...@@ -14567,17 +14445,17 @@ ...@@ -14567,17 +14445,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 294 "__id__": 289
}, },
"_children": [ "_children": [
{ {
"__id__": 296 "__id__": 291
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 298 "__id__": 293
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14633,13 +14511,13 @@ ...@@ -14633,13 +14511,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 295 "__id__": 290
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 297 "__id__": 292
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14695,7 +14573,7 @@ ...@@ -14695,7 +14573,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 296 "__id__": 291
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14727,7 +14605,7 @@ ...@@ -14727,7 +14605,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 295 "__id__": 290
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "230a9e5c-049a-44e6-a329-1915b6e052d1", "uuid": "3956e5e7-cbef-4f34-9fb0-4dca515620df",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "c55d413c-7c1b-4a3f-aab2-46b1e027614b",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}
\ No newline at end of file
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "2fcfd5b6-7b95-4f02-86f1-27ad07b6a129", "uuid": "7250fc8e-47c7-4ede-8eb6-2d5bfba7a8b0",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": 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;
}
});
...@@ -409,9 +409,18 @@ export const defaultData = { ...@@ -409,9 +409,18 @@ export const defaultData = {
"bgImg": "https://staging-teach.cdn.ireadabc.com/0d9156d3c45f56e853c4000dbce92302.png", "bgImg": "https://staging-teach.cdn.ireadabc.com/0d9156d3c45f56e853c4000dbce92302.png",
"wordAudio": "https://staging-teach.cdn.ireadabc.com/ce3337620f22232dd15c29c66af57736.mp3", "wordAudio": "https://staging-teach.cdn.ireadabc.com/ce3337620f22232dd15c29c66af57736.mp3",
"imgAni": { "imgAni": {
"ske": {}, "ske": {
"tex": {}, "url": "https://staging-teach.cdn.ireadabc.com/82b32eeb43439a6d666bdf4b79f6374c.json",
"png": {} "name": "banana_ske.json"
},
"tex": {
"url": "https://staging-teach.cdn.ireadabc.com/b430f8389fcf7535191244a3aae95ec1.json",
"name": "banana_tex.json"
},
"png": {
"url": "https://staging-teach.cdn.ireadabc.com/2d2e57ba2d66e67aec41fa6ca5cf9f4c.png",
"name": "banana_tex.png"
}
}, },
"orderAudio": [ "orderAudio": [
"https://staging-teach.cdn.ireadabc.com/f0578961665dbdb83c61e0be64711d23.mp3", "https://staging-teach.cdn.ireadabc.com/f0578961665dbdb83c61e0be64711d23.mp3",
......
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