Commit 2d52c6ee authored by yu's avatar yu

1

parent ebb8fa92
...@@ -36,6 +36,7 @@ export class ItemJigsaw { ...@@ -36,6 +36,7 @@ export class ItemJigsaw {
constructor(data, page) { constructor(data, page) {
// this.audio = data.audio; // this.audio = data.audio;
this.image = data.pic_url; this.image = data.pic_url;
this.audio = data.audio_url;
// this.voice = data.voice; // this.voice = data.voice;
// this.time = data.time; // this.time = data.time;
this.id = page; this.id = page;
......
...@@ -99,25 +99,25 @@ ...@@ -99,25 +99,25 @@
"__id__": 147 "__id__": 147
}, },
{ {
"__id__": 175 "__id__": 176
}, },
{ {
"__id__": 220 "__id__": 221
}, },
{ {
"__id__": 242 "__id__": 243
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 281
},
{ {
"__id__": 282 "__id__": 282
}, },
{ {
"__id__": 283 "__id__": 283
},
{
"__id__": 284
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6466,20 +6466,20 @@ ...@@ -6466,20 +6466,20 @@
"__id__": 153 "__id__": 153
}, },
{ {
"__id__": 168 "__id__": 169
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 172 "__id__": 173
}, },
{ {
"__id__": 173 "__id__": 174
} }
], ],
"_prefab": { "_prefab": {
"__id__": 174 "__id__": 175
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -6752,10 +6752,13 @@ ...@@ -6752,10 +6752,13 @@
"_components": [ "_components": [
{ {
"__id__": 166 "__id__": 166
},
{
"__id__": 167
} }
], ],
"_prefab": { "_prefab": {
"__id__": 167 "__id__": 168
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -6768,7 +6771,7 @@ ...@@ -6768,7 +6771,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 148.45, "width": 148.45,
"height": 63 "height": 50
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -7269,9 +7272,36 @@ ...@@ -7269,9 +7272,36 @@
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 2,
"_id": "7aSJCEwqxFm41MOZwfSYFr" "_id": "7aSJCEwqxFm41MOZwfSYFr"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 153
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_left": 274.52700000000004,
"_right": 0,
"_top": 73.89999999999998,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "38vGEA6UZNILtrzb+W0dxg"
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
...@@ -7294,14 +7324,14 @@ ...@@ -7294,14 +7324,14 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 169 "__id__": 170
}, },
{ {
"__id__": 170 "__id__": 171
} }
], ],
"_prefab": { "_prefab": {
"__id__": 171 "__id__": 172
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -7355,7 +7385,7 @@ ...@@ -7355,7 +7385,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 168 "__id__": 169
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -7382,7 +7412,7 @@ ...@@ -7382,7 +7412,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 168 "__id__": 169
}, },
"_enabled": true, "_enabled": true,
"_id": "73bNc89zRA07fam6Bk0WDU" "_id": "73bNc89zRA07fam6Bk0WDU"
...@@ -7455,29 +7485,29 @@ ...@@ -7455,29 +7485,29 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 176 "__id__": 177
}, },
{ {
"__id__": 190 "__id__": 191
}, },
{ {
"__id__": 199 "__id__": 200
}, },
{ {
"__id__": 208 "__id__": 209
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 217 "__id__": 218
}, },
{ {
"__id__": 218 "__id__": 219
} }
], ],
"_prefab": { "_prefab": {
"__id__": 219 "__id__": 220
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -7531,26 +7561,26 @@ ...@@ -7531,26 +7561,26 @@
"_name": "voice", "_name": "voice",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 175 "__id__": 176
}, },
"_children": [ "_children": [
{ {
"__id__": 177 "__id__": 178
}, },
{ {
"__id__": 180 "__id__": 181
}, },
{ {
"__id__": 183 "__id__": 184
}, },
{ {
"__id__": 186 "__id__": 187
} }
], ],
"_active": false, "_active": false,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 189 "__id__": 190
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -7604,17 +7634,17 @@ ...@@ -7604,17 +7634,17 @@
"_name": "excellent", "_name": "excellent",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 176 "__id__": 177
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 178 "__id__": 179
} }
], ],
"_prefab": { "_prefab": {
"__id__": 179 "__id__": 180
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -7668,7 +7698,7 @@ ...@@ -7668,7 +7698,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 177 "__id__": 178
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7685,7 +7715,7 @@ ...@@ -7685,7 +7715,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -7698,17 +7728,17 @@ ...@@ -7698,17 +7728,17 @@
"_name": "good", "_name": "good",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 176 "__id__": 177
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 181 "__id__": 182
} }
], ],
"_prefab": { "_prefab": {
"__id__": 182 "__id__": 183
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -7762,7 +7792,7 @@ ...@@ -7762,7 +7792,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 180 "__id__": 181
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7779,7 +7809,7 @@ ...@@ -7779,7 +7809,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -7792,17 +7822,17 @@ ...@@ -7792,17 +7822,17 @@
"_name": "tryagain", "_name": "tryagain",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 176 "__id__": 177
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 184 "__id__": 185
} }
], ],
"_prefab": { "_prefab": {
"__id__": 185 "__id__": 186
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -7856,7 +7886,7 @@ ...@@ -7856,7 +7886,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 183 "__id__": 184
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7873,7 +7903,7 @@ ...@@ -7873,7 +7903,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -7886,17 +7916,17 @@ ...@@ -7886,17 +7916,17 @@
"_name": "ani", "_name": "ani",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 176 "__id__": 177
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 187 "__id__": 188
} }
], ],
"_prefab": { "_prefab": {
"__id__": 188 "__id__": 189
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -7950,7 +7980,7 @@ ...@@ -7950,7 +7980,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 186 "__id__": 187
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7967,7 +7997,7 @@ ...@@ -7967,7 +7997,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -7978,7 +8008,7 @@ ...@@ -7978,7 +8008,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -7991,24 +8021,24 @@ ...@@ -7991,24 +8021,24 @@
"_name": "layout_excellent", "_name": "layout_excellent",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 175 "__id__": 176
}, },
"_children": [ "_children": [
{ {
"__id__": 191 "__id__": 192
}, },
{ {
"__id__": 194 "__id__": 195
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 197 "__id__": 198
} }
], ],
"_prefab": { "_prefab": {
"__id__": 198 "__id__": 199
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8062,17 +8092,17 @@ ...@@ -8062,17 +8092,17 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 190 "__id__": 191
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 192 "__id__": 193
} }
], ],
"_prefab": { "_prefab": {
"__id__": 193 "__id__": 194
}, },
"_opacity": 150, "_opacity": 150,
"_color": { "_color": {
...@@ -8126,7 +8156,7 @@ ...@@ -8126,7 +8156,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 191 "__id__": 192
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8156,7 +8186,7 @@ ...@@ -8156,7 +8186,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -8169,17 +8199,17 @@ ...@@ -8169,17 +8199,17 @@
"_name": "AniNode", "_name": "AniNode",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 190 "__id__": 191
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 195 "__id__": 196
} }
], ],
"_prefab": { "_prefab": {
"__id__": 196 "__id__": 197
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8233,7 +8263,7 @@ ...@@ -8233,7 +8263,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 194 "__id__": 195
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8271,7 +8301,7 @@ ...@@ -8271,7 +8301,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -8284,7 +8314,7 @@ ...@@ -8284,7 +8314,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 190 "__id__": 191
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -8309,7 +8339,7 @@ ...@@ -8309,7 +8339,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -8322,24 +8352,24 @@ ...@@ -8322,24 +8352,24 @@
"_name": "layout_good", "_name": "layout_good",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 175 "__id__": 176
}, },
"_children": [ "_children": [
{ {
"__id__": 200 "__id__": 201
}, },
{ {
"__id__": 203 "__id__": 204
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 206 "__id__": 207
} }
], ],
"_prefab": { "_prefab": {
"__id__": 207 "__id__": 208
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8393,17 +8423,17 @@ ...@@ -8393,17 +8423,17 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 199 "__id__": 200
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 201 "__id__": 202
} }
], ],
"_prefab": { "_prefab": {
"__id__": 202 "__id__": 203
}, },
"_opacity": 150, "_opacity": 150,
"_color": { "_color": {
...@@ -8457,7 +8487,7 @@ ...@@ -8457,7 +8487,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 200 "__id__": 201
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8487,7 +8517,7 @@ ...@@ -8487,7 +8517,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -8500,17 +8530,17 @@ ...@@ -8500,17 +8530,17 @@
"_name": "AniNode", "_name": "AniNode",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 199 "__id__": 200
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 204 "__id__": 205
} }
], ],
"_prefab": { "_prefab": {
"__id__": 205 "__id__": 206
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8564,7 +8594,7 @@ ...@@ -8564,7 +8594,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 203 "__id__": 204
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8602,7 +8632,7 @@ ...@@ -8602,7 +8632,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -8615,7 +8645,7 @@ ...@@ -8615,7 +8645,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 199 "__id__": 200
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -8640,7 +8670,7 @@ ...@@ -8640,7 +8670,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -8653,24 +8683,24 @@ ...@@ -8653,24 +8683,24 @@
"_name": "layout_tryagain", "_name": "layout_tryagain",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 175 "__id__": 176
}, },
"_children": [ "_children": [
{ {
"__id__": 209 "__id__": 210
}, },
{ {
"__id__": 212 "__id__": 213
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 215 "__id__": 216
} }
], ],
"_prefab": { "_prefab": {
"__id__": 216 "__id__": 217
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8724,17 +8754,17 @@ ...@@ -8724,17 +8754,17 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 208 "__id__": 209
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 210 "__id__": 211
} }
], ],
"_prefab": { "_prefab": {
"__id__": 211 "__id__": 212
}, },
"_opacity": 150, "_opacity": 150,
"_color": { "_color": {
...@@ -8788,7 +8818,7 @@ ...@@ -8788,7 +8818,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 209 "__id__": 210
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8818,7 +8848,7 @@ ...@@ -8818,7 +8848,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -8831,17 +8861,17 @@ ...@@ -8831,17 +8861,17 @@
"_name": "AniNode", "_name": "AniNode",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 208 "__id__": 209
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 213 "__id__": 214
} }
], ],
"_prefab": { "_prefab": {
"__id__": 214 "__id__": 215
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8895,7 +8925,7 @@ ...@@ -8895,7 +8925,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 212 "__id__": 213
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8933,7 +8963,7 @@ ...@@ -8933,7 +8963,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -8946,7 +8976,7 @@ ...@@ -8946,7 +8976,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 208 "__id__": 209
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -8971,7 +9001,7 @@ ...@@ -8971,7 +9001,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -8984,7 +9014,7 @@ ...@@ -8984,7 +9014,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 175 "__id__": 176
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -9011,7 +9041,7 @@ ...@@ -9011,7 +9041,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 175 "__id__": 176
}, },
"_enabled": true, "_enabled": true,
"_id": "9c/TTsfO5OWJWcAXuG5JNw" "_id": "9c/TTsfO5OWJWcAXuG5JNw"
...@@ -9019,7 +9049,7 @@ ...@@ -9019,7 +9049,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 175 "__id__": 176
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -9036,20 +9066,20 @@ ...@@ -9036,20 +9066,20 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 221 "__id__": 222
}, },
{ {
"__id__": 235 "__id__": 236
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 240 "__id__": 241
} }
], ],
"_prefab": { "_prefab": {
"__id__": 241 "__id__": 242
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -9103,26 +9133,26 @@ ...@@ -9103,26 +9133,26 @@
"_name": "layout_center", "_name": "layout_center",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 220 "__id__": 221
}, },
"_children": [ "_children": [
{ {
"__id__": 222 "__id__": 223
}, },
{ {
"__id__": 225 "__id__": 226
}, },
{ {
"__id__": 228 "__id__": 229
}, },
{ {
"__id__": 231 "__id__": 232
} }
], ],
"_active": false, "_active": false,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 234 "__id__": 235
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -9176,17 +9206,17 @@ ...@@ -9176,17 +9206,17 @@
"_name": "bg_gray", "_name": "bg_gray",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 222
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 223 "__id__": 224
} }
], ],
"_prefab": { "_prefab": {
"__id__": 224 "__id__": 225
}, },
"_opacity": 102, "_opacity": 102,
"_color": { "_color": {
...@@ -9240,7 +9270,7 @@ ...@@ -9240,7 +9270,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 222 "__id__": 223
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9270,7 +9300,7 @@ ...@@ -9270,7 +9300,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 220 "__id__": 221
}, },
"asset": { "asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747" "__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
...@@ -9283,17 +9313,17 @@ ...@@ -9283,17 +9313,17 @@
"_name": "aniNode1", "_name": "aniNode1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 222
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 226 "__id__": 227
} }
], ],
"_prefab": { "_prefab": {
"__id__": 227 "__id__": 228
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -9347,7 +9377,7 @@ ...@@ -9347,7 +9377,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 225 "__id__": 226
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9385,7 +9415,7 @@ ...@@ -9385,7 +9415,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 220 "__id__": 221
}, },
"asset": { "asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747" "__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
...@@ -9398,17 +9428,17 @@ ...@@ -9398,17 +9428,17 @@
"_name": "aniNode2", "_name": "aniNode2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 222
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 229 "__id__": 230
} }
], ],
"_prefab": { "_prefab": {
"__id__": 230 "__id__": 231
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -9462,7 +9492,7 @@ ...@@ -9462,7 +9492,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 228 "__id__": 229
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9500,7 +9530,7 @@ ...@@ -9500,7 +9530,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 220 "__id__": 221
}, },
"asset": { "asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747" "__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
...@@ -9513,17 +9543,17 @@ ...@@ -9513,17 +9543,17 @@
"_name": "aniNode3", "_name": "aniNode3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 222
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 232 "__id__": 233
} }
], ],
"_prefab": { "_prefab": {
"__id__": 233 "__id__": 234
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -9577,7 +9607,7 @@ ...@@ -9577,7 +9607,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 231 "__id__": 232
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9615,7 +9645,7 @@ ...@@ -9615,7 +9645,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 220 "__id__": 221
}, },
"asset": { "asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747" "__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
...@@ -9626,7 +9656,7 @@ ...@@ -9626,7 +9656,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 220 "__id__": 221
}, },
"asset": { "asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747" "__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
...@@ -9639,17 +9669,17 @@ ...@@ -9639,17 +9669,17 @@
"_name": "res", "_name": "res",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 220 "__id__": 221
}, },
"_children": [ "_children": [
{ {
"__id__": 236 "__id__": 237
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 239 "__id__": 240
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -9703,17 +9733,17 @@ ...@@ -9703,17 +9733,17 @@
"_name": "coin", "_name": "coin",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 235 "__id__": 236
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 237 "__id__": 238
} }
], ],
"_prefab": { "_prefab": {
"__id__": 238 "__id__": 239
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -9767,7 +9797,7 @@ ...@@ -9767,7 +9797,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 236 "__id__": 237
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -9784,7 +9814,7 @@ ...@@ -9784,7 +9814,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 220 "__id__": 221
}, },
"asset": { "asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747" "__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
...@@ -9795,7 +9825,7 @@ ...@@ -9795,7 +9825,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 220 "__id__": 221
}, },
"asset": { "asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747" "__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
...@@ -9808,7 +9838,7 @@ ...@@ -9808,7 +9838,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 220 "__id__": 221
}, },
"_enabled": true, "_enabled": true,
"_id": "8eV1QXijRFRIKyIa4yP1P9" "_id": "8eV1QXijRFRIKyIa4yP1P9"
...@@ -9816,7 +9846,7 @@ ...@@ -9816,7 +9846,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 220 "__id__": 221
}, },
"asset": { "asset": {
"__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747" "__uuid__": "a9b135f6-de46-4257-8be2-55dc863ce747"
...@@ -9833,20 +9863,20 @@ ...@@ -9833,20 +9863,20 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 243 "__id__": 244
}, },
{ {
"__id__": 274 "__id__": 275
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 279 "__id__": 280
} }
], ],
"_prefab": { "_prefab": {
"__id__": 280 "__id__": 281
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -9900,35 +9930,35 @@ ...@@ -9900,35 +9930,35 @@
"_name": "layer_center", "_name": "layer_center",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 242 "__id__": 243
}, },
"_children": [ "_children": [
{ {
"__id__": 244 "__id__": 245
}, },
{ {
"__id__": 247 "__id__": 248
}, },
{ {
"__id__": 249 "__id__": 250
}, },
{ {
"__id__": 252 "__id__": 253
}, },
{ {
"__id__": 255 "__id__": 256
}, },
{ {
"__id__": 258 "__id__": 259
}, },
{ {
"__id__": 261 "__id__": 262
} }
], ],
"_active": false, "_active": false,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 273 "__id__": 274
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -9982,17 +10012,17 @@ ...@@ -9982,17 +10012,17 @@
"_name": "gray_cover", "_name": "gray_cover",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 243 "__id__": 244
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 245 "__id__": 246
} }
], ],
"_prefab": { "_prefab": {
"__id__": 246 "__id__": 247
}, },
"_opacity": 102, "_opacity": 102,
"_color": { "_color": {
...@@ -10046,7 +10076,7 @@ ...@@ -10046,7 +10076,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 244 "__id__": 245
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10076,7 +10106,7 @@ ...@@ -10076,7 +10106,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
...@@ -10089,13 +10119,13 @@ ...@@ -10089,13 +10119,13 @@
"_name": "layer_middle", "_name": "layer_middle",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 243 "__id__": 244
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 248 "__id__": 249
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -10147,7 +10177,7 @@ ...@@ -10147,7 +10177,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
...@@ -10160,17 +10190,17 @@ ...@@ -10160,17 +10190,17 @@
"_name": "replay_btn", "_name": "replay_btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 243 "__id__": 244
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 250 "__id__": 251
} }
], ],
"_prefab": { "_prefab": {
"__id__": 251 "__id__": 252
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -10224,7 +10254,7 @@ ...@@ -10224,7 +10254,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 249 "__id__": 250
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10254,7 +10284,7 @@ ...@@ -10254,7 +10284,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
...@@ -10267,17 +10297,17 @@ ...@@ -10267,17 +10297,17 @@
"_name": "bg_light", "_name": "bg_light",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 243 "__id__": 244
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 253 "__id__": 254
} }
], ],
"_prefab": { "_prefab": {
"__id__": 254 "__id__": 255
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -10331,7 +10361,7 @@ ...@@ -10331,7 +10361,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 252 "__id__": 253
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10361,7 +10391,7 @@ ...@@ -10361,7 +10391,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
...@@ -10374,17 +10404,17 @@ ...@@ -10374,17 +10404,17 @@
"_name": "finish_cat", "_name": "finish_cat",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 243 "__id__": 244
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 256 "__id__": 257
} }
], ],
"_prefab": { "_prefab": {
"__id__": 257 "__id__": 258
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -10438,7 +10468,7 @@ ...@@ -10438,7 +10468,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 255 "__id__": 256
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10476,7 +10506,7 @@ ...@@ -10476,7 +10506,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
...@@ -10489,17 +10519,17 @@ ...@@ -10489,17 +10519,17 @@
"_name": "next_btn", "_name": "next_btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 243 "__id__": 244
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 259 "__id__": 260
} }
], ],
"_prefab": { "_prefab": {
"__id__": 260 "__id__": 261
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -10553,7 +10583,7 @@ ...@@ -10553,7 +10583,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 258 "__id__": 259
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10583,7 +10613,7 @@ ...@@ -10583,7 +10613,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
...@@ -10596,27 +10626,27 @@ ...@@ -10596,27 +10626,27 @@
"_name": "finish_box", "_name": "finish_box",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 243 "__id__": 244
}, },
"_children": [ "_children": [
{ {
"__id__": 262 "__id__": 263
}, },
{ {
"__id__": 265 "__id__": 266
}, },
{ {
"__id__": 268 "__id__": 269
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 271 "__id__": 272
} }
], ],
"_prefab": { "_prefab": {
"__id__": 272 "__id__": 273
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -10670,17 +10700,17 @@ ...@@ -10670,17 +10700,17 @@
"_name": "result_text", "_name": "result_text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 261 "__id__": 262
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 263 "__id__": 264
} }
], ],
"_prefab": { "_prefab": {
"__id__": 264 "__id__": 265
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -10734,7 +10764,7 @@ ...@@ -10734,7 +10764,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 262 "__id__": 263
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10765,7 +10795,7 @@ ...@@ -10765,7 +10795,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
...@@ -10778,17 +10808,17 @@ ...@@ -10778,17 +10808,17 @@
"_name": "coin", "_name": "coin",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 261 "__id__": 262
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 266 "__id__": 267
} }
], ],
"_prefab": { "_prefab": {
"__id__": 267 "__id__": 268
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -10842,7 +10872,7 @@ ...@@ -10842,7 +10872,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 265 "__id__": 266
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10872,7 +10902,7 @@ ...@@ -10872,7 +10902,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
...@@ -10885,17 +10915,17 @@ ...@@ -10885,17 +10915,17 @@
"_name": "coin_num", "_name": "coin_num",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 261 "__id__": 262
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 269 "__id__": 270
} }
], ],
"_prefab": { "_prefab": {
"__id__": 270 "__id__": 271
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -10949,7 +10979,7 @@ ...@@ -10949,7 +10979,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 268 "__id__": 269
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10980,7 +11010,7 @@ ...@@ -10980,7 +11010,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
...@@ -10993,7 +11023,7 @@ ...@@ -10993,7 +11023,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 261 "__id__": 262
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11023,7 +11053,7 @@ ...@@ -11023,7 +11053,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
...@@ -11034,7 +11064,7 @@ ...@@ -11034,7 +11064,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
...@@ -11047,17 +11077,17 @@ ...@@ -11047,17 +11077,17 @@
"_name": "res", "_name": "res",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 242 "__id__": 243
}, },
"_children": [ "_children": [
{ {
"__id__": 275 "__id__": 276
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 278 "__id__": 279
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -11111,17 +11141,17 @@ ...@@ -11111,17 +11141,17 @@
"_name": "ending", "_name": "ending",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 274 "__id__": 275
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 276 "__id__": 277
} }
], ],
"_prefab": { "_prefab": {
"__id__": 277 "__id__": 278
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -11175,7 +11205,7 @@ ...@@ -11175,7 +11205,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 275 "__id__": 276
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -11192,7 +11222,7 @@ ...@@ -11192,7 +11222,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
...@@ -11203,7 +11233,7 @@ ...@@ -11203,7 +11233,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
...@@ -11216,7 +11246,7 @@ ...@@ -11216,7 +11246,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 242 "__id__": 243
}, },
"_enabled": true, "_enabled": true,
"_id": "d7wN6OoxNMurVw8/98828K" "_id": "d7wN6OoxNMurVw8/98828K"
...@@ -11224,7 +11254,7 @@ ...@@ -11224,7 +11254,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 242 "__id__": 243
}, },
"asset": { "asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822" "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
......
...@@ -71,6 +71,7 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent { ...@@ -71,6 +71,7 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
Game.getIns().init(this.data); Game.getIns().init(this.data);
Game.getIns().reset(); Game.getIns().reset();
this.cardBgs = []; this.cardBgs = [];
this.isOver = false;
} }
initView() { initView() {
...@@ -154,6 +155,7 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent { ...@@ -154,6 +155,7 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
desc.active = true; desc.active = true;
let data: any = {}; let data: any = {};
data.text = dt.text; data.text = dt.text;
data.audio = dt.audio_url || "";
data.parent = ch; data.parent = ch;
data.x = desc.x; data.x = desc.x;
data.y = desc.y; data.y = desc.y;
...@@ -257,8 +259,6 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent { ...@@ -257,8 +259,6 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
return; return;
} }
this.playLocalAudio("right");
target.parent = data.parent; target.parent = data.parent;
target.setPosition(data.x, data.y); target.setPosition(data.x, data.y);
target.active = false; target.active = false;
...@@ -269,12 +269,15 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent { ...@@ -269,12 +269,15 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
desc.getComponent(cc.Label).string = data.text; desc.getComponent(cc.Label).string = data.text;
this.playLocalAudio("right").then(async () => {
await asyncDelay(0.3);
if (this.checkRoundEnd()) { pg.audio.playAudioByUrl(data.audio).then(async () => {
pg.event.emit("gameOver"); if (this.checkRoundEnd()) {
} await asyncDelay(0.5);
pg.event.emit("gameOver");
}
});
});
} }
private cleanLayoutSort() { private cleanLayoutSort() {
this.cardBgs.forEach((item) => { this.cardBgs.forEach((item) => {
...@@ -300,8 +303,10 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent { ...@@ -300,8 +303,10 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
if (this.currentCards.length != this.cards.length) return false; if (this.currentCards.length != this.cards.length) return false;
return this.currentCards.every(card => !!card); return this.currentCards.every(card => !!card);
} }
private isOver = false;
gameOver() { gameOver() {
if (this.isOver) return;
this.isOver = true;
this.log("over ~~~~~~~~~~~~~~") this.log("over ~~~~~~~~~~~~~~")
pg.event.once('layer_right_show_excellent_end', () => { pg.event.once('layer_right_show_excellent_end', () => {
pg.event.emit('layer_coin_show_coin', 3) //1 2 3硬币数量 pg.event.emit('layer_coin_show_coin', 3) //1 2 3硬币数量
......
...@@ -261,9 +261,9 @@ let pg = { ...@@ -261,9 +261,9 @@ let pg = {
if (w && h && custom) { if (w && h && custom) {
let scaleX = w / nw; let scaleX = w / nw;
let scaleY = h / nh; let scaleY = h / nh;
// let scale = scaleX <= scaleY ? scaleX : scaleY; let scale = scaleX <= scaleY ? scaleX : scaleY;
node.width = nw * scaleX; node.width = nw * scale;
node.height = nh * scaleY; node.height = nh * scale;
} }
node.active = true; node.active = true;
resolve({ w: nw, h: nh }); resolve({ w: nw, h: nh });
......
...@@ -2,31 +2,31 @@ export const defaultData = { ...@@ -2,31 +2,31 @@ export const defaultData = {
"points": "", "points": "",
"questionScore": 0, "questionScore": 0,
"questions": [{ "questions": [{
"options": [{ "options": [{
"type": "img", "type": "img",
"image": "", "image": "",
"audio": "", "audio": "",
"text": "", "text": "",
"time": "", "time": "",
"right": false "right": false
}, { }, {
"type": "img", "type": "img",
"image": "", "image": "",
"audio": "", "audio": "",
"text": "", "text": "",
"time": "", "time": "",
"right": false "right": false
}, { }, {
"type": "img", "type": "img",
"image": "", "image": "",
"audio": "", "audio": "",
"text": "", "text": "",
"time": "", "time": "",
"right": false "right": false
}
],
"type": "img"
} }
],
"type": "img"
}
], ],
"bgItem": { "bgItem": {
"url": "http://staging-teach.cdn.ireadabc.com/933163fae966edff0633a0bb97e5c5bc.jpg", "url": "http://staging-teach.cdn.ireadabc.com/933163fae966edff0633a0bb97e5c5bc.jpg",
...@@ -38,106 +38,111 @@ export const defaultData = { ...@@ -38,106 +38,111 @@ export const defaultData = {
} }
}, },
"hotZoneItemArr": [{ "hotZoneItemArr": [{
"id": "1687246796178", "id": "1687246796178",
"index": 0, "index": 0,
"text": "low collar", "text": "low collar",
"itemType": "text", "audio_url": "http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8_l.mp3",
"fontScale": 0.70625, "itemType": "text",
"imgScale": 1, "fontScale": 0.70625,
"imgSizeW": 0, "imgScale": 1,
"imgSizeH": 0, "imgSizeW": 0,
"mapScale": 0.70625, "imgSizeH": 0,
"dragDot": { "mapScale": 0.70625,
"x": 452, "dragDot": {
"y": 346 "x": 452,
}, "y": 346
"gIdx": "0", },
"fontSize": 50, "gIdx": "0",
"fontName": "ahronbd-1", "fontSize": 50,
"ontColor": "#8f3758", "fontName": "ahronbd-1",
"rect": { "ontColor": "#8f3758",
"width": 162.12, "rect": {
"height": 35.31, "width": 162.12,
"x": 466.94, "height": 35.31,
"y": 104.71 "x": 466.94,
} "y": 104.71
}, { }
"id": "1687246797020", }, {
"index": 1, "id": "1687246797020",
"text": " high collar", "index": 1,
"itemType": "text", "text": " high collar",
"fontScale": 0.70625, "audio_url": "http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8_l.mp3",
"imgScale": 1, "itemType": "text",
"imgSizeW": 0, "fontScale": 0.70625,
"imgSizeH": 0, "imgScale": 1,
"mapScale": 0.70625, "imgSizeW": 0,
"dragDot": { "imgSizeH": 0,
"x": 452, "mapScale": 0.70625,
"y": 346 "dragDot": {
}, "x": 452,
"gIdx": "0", "y": 346
"fontSize": 50, },
"fontName": "ahronbd-1", "gIdx": "0",
"ontColor": "#8f3758", "fontSize": 50,
"rect": { "fontName": "ahronbd-1",
"width": 188.31, "ontColor": "#8f3758",
"height": 35.31, "rect": {
"x": 22.85, "width": 188.31,
"y": 67.71 "height": 35.31,
} "x": 22.85,
}, { "y": 67.71
"id": "1687246797521", }
"index": 2, }, {
"text": "long sleeve", "id": "1687246797521",
"itemType": "text", "index": 2,
"fontScale": 0.70625, "text": "long sleeve",
"imgScale": 1, "audio_url": "http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8_l.mp3",
"imgSizeW": 0, "itemType": "text",
"imgSizeH": 0, "fontScale": 0.70625,
"mapScale": 0.70625, "imgScale": 1,
"dragDot": { "imgSizeW": 0,
"x": 452, "imgSizeH": 0,
"y": 346 "mapScale": 0.70625,
}, "dragDot": {
"gIdx": "0", "x": 452,
"fontSize": 50, "y": 346
"fontName": "ahronbd-1", },
"ontColor": "#8f3758", "gIdx": "0",
"rect": { "fontSize": 50,
"width": 190.79, "fontName": "ahronbd-1",
"height": 35.31, "ontColor": "#8f3758",
"x": 24.6, "rect": {
"y": 197.71 "width": 190.79,
} "height": 35.31,
}, { "x": 24.6,
"id": "1687246798099", "y": 197.71
"index": 3, }
"text": "short sleeve", }, {
"itemType": "text", "id": "1687246798099",
"fontScale": 0.70625, "index": 3,
"imgScale": 1, "text": "short sleeve",
"imgSizeW": 0, "audio_url": "http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8_l.mp3",
"imgSizeH": 0, "itemType": "text",
"mapScale": 0.70625, "fontScale": 0.70625,
"dragDot": { "imgScale": 1,
"x": 452, "imgSizeW": 0,
"y": 346 "imgSizeH": 0,
}, "mapScale": 0.70625,
"gIdx": "0", "dragDot": {
"fontSize": 50, "x": 452,
"fontName": "ahronbd-1", "y": 346
"ontColor": "#8f3758", },
"rect": { "gIdx": "0",
"width": 202.88, "fontSize": 50,
"height": 35.31, "fontName": "ahronbd-1",
"x": 446.56, "ontColor": "#8f3758",
"y": 190.71 "rect": {
} "width": 202.88,
"height": 35.31,
"x": 446.56,
"y": 190.71
} }
}
], ],
"questionText": "", "questionText": "",
"npcTitle": "may", "npcTitle": "may",
"npcAudio": "http://staging-teach.cdn.ireadabc.com/36067f9e2415d59fa37c3795a3929087_l.mp3", "npcAudio": "",
// "npcAudio": "http://staging-teach.cdn.ireadabc.com/36067f9e2415d59fa37c3795a3929087_l.mp3",
"npcAudioName": "bear_3.mp3" "npcAudioName": "bear_3.mp3"
} }
......
...@@ -41,6 +41,7 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O ...@@ -41,6 +41,7 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O
{ {
name: '文本', name: '文本',
text: true, text: true,
audio: true,
// action: { // action: {
// type: 'text', // type: 'text',
// option: [ // option: [
......
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