Commit ef269320 authored by 章红平's avatar 章红平

提交

parent a96c0c79
...@@ -78,19 +78,19 @@ ...@@ -78,19 +78,19 @@
"__id__": 9 "__id__": 9
}, },
{ {
"__id__": 115 "__id__": 117
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 139 "__id__": 141
}, },
{ {
"__id__": 140 "__id__": 142
}, },
{ {
"__id__": 141 "__id__": 143
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -443,22 +443,22 @@ ...@@ -443,22 +443,22 @@
"__id__": 10 "__id__": 10
}, },
{ {
"__id__": 29 "__id__": 31
}, },
{ {
"__id__": 85 "__id__": 87
}, },
{ {
"__id__": 87 "__id__": 89
}, },
{ {
"__id__": 100 "__id__": 102
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 114 "__id__": 116
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -527,13 +527,13 @@ ...@@ -527,13 +527,13 @@
"__id__": 24 "__id__": 24
}, },
{ {
"__id__": 26 "__id__": 27
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1246,6 +1246,9 @@ ...@@ -1246,6 +1246,9 @@
"_components": [ "_components": [
{ {
"__id__": 25 "__id__": 25
},
{
"__id__": 26
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1328,6 +1331,35 @@ ...@@ -1328,6 +1331,35 @@
"_atlas": null, "_atlas": null,
"_id": "8cTouH9nVPN7PUyD+esZ4V" "_id": "8cTouH9nVPN7PUyD+esZ4V"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
},
"_enabled": true,
"alignMode": 1,
"_target": {
"__id__": 2
},
"_alignFlags": 9,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "1eMnK9sURMVbzNmGZPW10D"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_right", "_name": "bg_right",
...@@ -1339,7 +1371,10 @@ ...@@ -1339,7 +1371,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 27 "__id__": 28
},
{
"__id__": 29
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1395,7 +1430,7 @@ ...@@ -1395,7 +1430,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 26 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1422,6 +1457,35 @@ ...@@ -1422,6 +1457,35 @@
"_atlas": null, "_atlas": null,
"_id": "ab8y+TqwNJZaAZ1ItrKbF9" "_id": "ab8y+TqwNJZaAZ1ItrKbF9"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
},
"_enabled": true,
"alignMode": 1,
"_target": {
"__id__": 2
},
"_alignFlags": 33,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 656,
"_originalHeight": 0,
"_id": "7adgi3qitA/bZzWNT7xQrq"
},
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
"_name": "", "_name": "",
...@@ -1460,19 +1524,19 @@ ...@@ -1460,19 +1524,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 30 "__id__": 32
}, },
{ {
"__id__": 41 "__id__": 43
}, },
{ {
"__id__": 52 "__id__": 54
}, },
{ {
"__id__": 63 "__id__": 65
}, },
{ {
"__id__": 74 "__id__": 76
} }
], ],
"_active": true, "_active": true,
...@@ -1530,23 +1594,23 @@ ...@@ -1530,23 +1594,23 @@
"_name": "card", "_name": "card",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 29 "__id__": 31
}, },
"_children": [ "_children": [
{ {
"__id__": 31 "__id__": 33
}, },
{ {
"__id__": 34 "__id__": 36
}, },
{ {
"__id__": 37 "__id__": 39
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 40 "__id__": 42
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -1600,17 +1664,17 @@ ...@@ -1600,17 +1664,17 @@
"_name": "bg_card", "_name": "bg_card",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 30 "__id__": 32
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 32 "__id__": 34
} }
], ],
"_prefab": { "_prefab": {
"__id__": 33 "__id__": 35
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -1664,7 +1728,7 @@ ...@@ -1664,7 +1728,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 31 "__id__": 33
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1694,7 +1758,7 @@ ...@@ -1694,7 +1758,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 30 "__id__": 32
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -1707,17 +1771,17 @@ ...@@ -1707,17 +1771,17 @@
"_name": "bg_crad-back", "_name": "bg_crad-back",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 30 "__id__": 32
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 37
} }
], ],
"_prefab": { "_prefab": {
"__id__": 36 "__id__": 38
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -1771,7 +1835,7 @@ ...@@ -1771,7 +1835,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1801,7 +1865,7 @@ ...@@ -1801,7 +1865,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 30 "__id__": 32
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -1814,17 +1878,17 @@ ...@@ -1814,17 +1878,17 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 30 "__id__": 32
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 38 "__id__": 40
} }
], ],
"_prefab": { "_prefab": {
"__id__": 39 "__id__": 41
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -1878,7 +1942,7 @@ ...@@ -1878,7 +1942,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 37 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1906,7 +1970,7 @@ ...@@ -1906,7 +1970,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 30 "__id__": 32
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -1917,7 +1981,7 @@ ...@@ -1917,7 +1981,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 30 "__id__": 32
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -1930,23 +1994,23 @@ ...@@ -1930,23 +1994,23 @@
"_name": "card", "_name": "card",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 31
}, },
"_children": [ "_children": [
{ {
"__id__": 42 "__id__": 44
}, },
{ {
"__id__": 45 "__id__": 47
}, },
{ {
"__id__": 48 "__id__": 50
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 51 "__id__": 53
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2000,17 +2064,17 @@ ...@@ -2000,17 +2064,17 @@
"_name": "bg_card", "_name": "bg_card",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 41 "__id__": 43
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 45
} }
], ],
"_prefab": { "_prefab": {
"__id__": 44 "__id__": 46
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2064,7 +2128,7 @@ ...@@ -2064,7 +2128,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2094,7 +2158,7 @@ ...@@ -2094,7 +2158,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 41 "__id__": 43
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -2107,17 +2171,17 @@ ...@@ -2107,17 +2171,17 @@
"_name": "bg_crad-back", "_name": "bg_crad-back",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 41 "__id__": 43
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 48
} }
], ],
"_prefab": { "_prefab": {
"__id__": 47 "__id__": 49
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2171,7 +2235,7 @@ ...@@ -2171,7 +2235,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 45 "__id__": 47
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2201,7 +2265,7 @@ ...@@ -2201,7 +2265,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 41 "__id__": 43
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -2214,17 +2278,17 @@ ...@@ -2214,17 +2278,17 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 41 "__id__": 43
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 49 "__id__": 51
} }
], ],
"_prefab": { "_prefab": {
"__id__": 50 "__id__": 52
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2278,7 +2342,7 @@ ...@@ -2278,7 +2342,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 48 "__id__": 50
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2306,7 +2370,7 @@ ...@@ -2306,7 +2370,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 41 "__id__": 43
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -2317,7 +2381,7 @@ ...@@ -2317,7 +2381,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 41 "__id__": 43
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -2330,23 +2394,23 @@ ...@@ -2330,23 +2394,23 @@
"_name": "card", "_name": "card",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 31
}, },
"_children": [ "_children": [
{ {
"__id__": 53 "__id__": 55
}, },
{ {
"__id__": 56 "__id__": 58
}, },
{ {
"__id__": 59 "__id__": 61
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 62 "__id__": 64
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2400,17 +2464,17 @@ ...@@ -2400,17 +2464,17 @@
"_name": "bg_card", "_name": "bg_card",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 52 "__id__": 54
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 54 "__id__": 56
} }
], ],
"_prefab": { "_prefab": {
"__id__": 55 "__id__": 57
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2464,7 +2528,7 @@ ...@@ -2464,7 +2528,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 53 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2494,7 +2558,7 @@ ...@@ -2494,7 +2558,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 52 "__id__": 54
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -2507,17 +2571,17 @@ ...@@ -2507,17 +2571,17 @@
"_name": "bg_crad-back", "_name": "bg_crad-back",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 52 "__id__": 54
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 57 "__id__": 59
} }
], ],
"_prefab": { "_prefab": {
"__id__": 58 "__id__": 60
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2571,7 +2635,7 @@ ...@@ -2571,7 +2635,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2601,7 +2665,7 @@ ...@@ -2601,7 +2665,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 52 "__id__": 54
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -2614,17 +2678,17 @@ ...@@ -2614,17 +2678,17 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 52 "__id__": 54
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 60 "__id__": 62
} }
], ],
"_prefab": { "_prefab": {
"__id__": 61 "__id__": 63
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2678,7 +2742,7 @@ ...@@ -2678,7 +2742,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 59 "__id__": 61
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2706,7 +2770,7 @@ ...@@ -2706,7 +2770,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 52 "__id__": 54
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -2717,7 +2781,7 @@ ...@@ -2717,7 +2781,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 52 "__id__": 54
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -2730,23 +2794,23 @@ ...@@ -2730,23 +2794,23 @@
"_name": "card", "_name": "card",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 31
}, },
"_children": [ "_children": [
{ {
"__id__": 64 "__id__": 66
}, },
{ {
"__id__": 67 "__id__": 69
}, },
{ {
"__id__": 70 "__id__": 72
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 73 "__id__": 75
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2800,17 +2864,17 @@ ...@@ -2800,17 +2864,17 @@
"_name": "bg_card", "_name": "bg_card",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 63 "__id__": 65
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 65 "__id__": 67
} }
], ],
"_prefab": { "_prefab": {
"__id__": 66 "__id__": 68
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2864,7 +2928,7 @@ ...@@ -2864,7 +2928,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 64 "__id__": 66
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2894,7 +2958,7 @@ ...@@ -2894,7 +2958,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 63 "__id__": 65
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -2907,17 +2971,17 @@ ...@@ -2907,17 +2971,17 @@
"_name": "bg_crad-back", "_name": "bg_crad-back",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 63 "__id__": 65
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 68 "__id__": 70
} }
], ],
"_prefab": { "_prefab": {
"__id__": 69 "__id__": 71
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2971,7 +3035,7 @@ ...@@ -2971,7 +3035,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3001,7 +3065,7 @@ ...@@ -3001,7 +3065,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 63 "__id__": 65
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -3014,17 +3078,17 @@ ...@@ -3014,17 +3078,17 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 63 "__id__": 65
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 71 "__id__": 73
} }
], ],
"_prefab": { "_prefab": {
"__id__": 72 "__id__": 74
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3078,7 +3142,7 @@ ...@@ -3078,7 +3142,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 70 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3106,7 +3170,7 @@ ...@@ -3106,7 +3170,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 63 "__id__": 65
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -3117,7 +3181,7 @@ ...@@ -3117,7 +3181,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 63 "__id__": 65
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -3130,23 +3194,23 @@ ...@@ -3130,23 +3194,23 @@
"_name": "card", "_name": "card",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 31
}, },
"_children": [ "_children": [
{ {
"__id__": 75 "__id__": 77
}, },
{ {
"__id__": 78 "__id__": 80
}, },
{ {
"__id__": 81 "__id__": 83
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 84 "__id__": 86
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3200,17 +3264,17 @@ ...@@ -3200,17 +3264,17 @@
"_name": "bg_card", "_name": "bg_card",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 76
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 76 "__id__": 78
} }
], ],
"_prefab": { "_prefab": {
"__id__": 77 "__id__": 79
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3264,7 +3328,7 @@ ...@@ -3264,7 +3328,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 75 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3294,7 +3358,7 @@ ...@@ -3294,7 +3358,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 74 "__id__": 76
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -3307,17 +3371,17 @@ ...@@ -3307,17 +3371,17 @@
"_name": "bg_crad-back", "_name": "bg_crad-back",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 76
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 81
} }
], ],
"_prefab": { "_prefab": {
"__id__": 80 "__id__": 82
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3371,7 +3435,7 @@ ...@@ -3371,7 +3435,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 80
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3401,7 +3465,7 @@ ...@@ -3401,7 +3465,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 74 "__id__": 76
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -3414,17 +3478,17 @@ ...@@ -3414,17 +3478,17 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 76
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 82 "__id__": 84
} }
], ],
"_prefab": { "_prefab": {
"__id__": 83 "__id__": 85
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3478,7 +3542,7 @@ ...@@ -3478,7 +3542,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 81 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3506,7 +3570,7 @@ ...@@ -3506,7 +3570,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 74 "__id__": 76
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -3517,7 +3581,7 @@ ...@@ -3517,7 +3581,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 74 "__id__": 76
}, },
"asset": { "asset": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -3536,7 +3600,7 @@ ...@@ -3536,7 +3600,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 86 "__id__": 88
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3592,7 +3656,7 @@ ...@@ -3592,7 +3656,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3626,19 +3690,19 @@ ...@@ -3626,19 +3690,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 88 "__id__": 90
}, },
{ {
"__id__": 91 "__id__": 93
}, },
{ {
"__id__": 95 "__id__": 97
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 101
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3694,16 +3758,16 @@ ...@@ -3694,16 +3758,16 @@
"_name": "bg", "_name": "bg",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 87 "__id__": 89
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 89 "__id__": 91
}, },
{ {
"__id__": 90 "__id__": 92
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3759,7 +3823,7 @@ ...@@ -3759,7 +3823,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 88 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3791,7 +3855,7 @@ ...@@ -3791,7 +3855,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 88 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_id": "dbATiTrMtJfJI7qTlsBhf7" "_id": "dbATiTrMtJfJI7qTlsBhf7"
...@@ -3801,17 +3865,17 @@ ...@@ -3801,17 +3865,17 @@
"_name": "bg_tip", "_name": "bg_tip",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 87 "__id__": 89
}, },
"_children": [ "_children": [
{ {
"__id__": 92 "__id__": 94
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 94 "__id__": 96
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3867,13 +3931,13 @@ ...@@ -3867,13 +3931,13 @@
"_name": "New Label", "_name": "New Label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 91 "__id__": 93
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 93 "__id__": 95
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3929,7 +3993,7 @@ ...@@ -3929,7 +3993,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3964,7 +4028,7 @@ ...@@ -3964,7 +4028,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 91 "__id__": 93
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3996,16 +4060,16 @@ ...@@ -3996,16 +4060,16 @@
"_name": "btn_start", "_name": "btn_start",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 87 "__id__": 89
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 98
}, },
{ {
"__id__": 97 "__id__": 99
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4061,7 +4125,7 @@ ...@@ -4061,7 +4125,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4093,7 +4157,7 @@ ...@@ -4093,7 +4157,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4102,7 +4166,7 @@ ...@@ -4102,7 +4166,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 98 "__id__": 100
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -4175,7 +4239,7 @@ ...@@ -4175,7 +4239,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 87 "__id__": 89
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -4206,13 +4270,13 @@ ...@@ -4206,13 +4270,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 101 "__id__": 103
}, },
{ {
"__id__": 104 "__id__": 106
}, },
{ {
"__id__": 109 "__id__": 111
} }
], ],
"_active": false, "_active": false,
...@@ -4270,16 +4334,16 @@ ...@@ -4270,16 +4334,16 @@
"_name": "bg", "_name": "bg",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 100 "__id__": 102
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 102 "__id__": 104
}, },
{ {
"__id__": 103 "__id__": 105
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4335,7 +4399,7 @@ ...@@ -4335,7 +4399,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 103
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4367,7 +4431,7 @@ ...@@ -4367,7 +4431,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 103
}, },
"_enabled": true, "_enabled": true,
"_id": "15/ewr6k9J4oXRIG0miG27" "_id": "15/ewr6k9J4oXRIG0miG27"
...@@ -4377,11 +4441,11 @@ ...@@ -4377,11 +4441,11 @@
"_name": "suc", "_name": "suc",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 102
}, },
"_children": [ "_children": [
{ {
"__id__": 105 "__id__": 107
} }
], ],
"_active": true, "_active": true,
...@@ -4439,16 +4503,16 @@ ...@@ -4439,16 +4503,16 @@
"_name": "btn_restart", "_name": "btn_restart",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 104 "__id__": 106
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 106 "__id__": 108
}, },
{ {
"__id__": 107 "__id__": 109
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4504,7 +4568,7 @@ ...@@ -4504,7 +4568,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4536,7 +4600,7 @@ ...@@ -4536,7 +4600,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4545,7 +4609,7 @@ ...@@ -4545,7 +4609,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 108 "__id__": 110
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -4618,11 +4682,11 @@ ...@@ -4618,11 +4682,11 @@
"_name": "fail", "_name": "fail",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 102
}, },
"_children": [ "_children": [
{ {
"__id__": 110 "__id__": 112
} }
], ],
"_active": true, "_active": true,
...@@ -4680,16 +4744,16 @@ ...@@ -4680,16 +4744,16 @@
"_name": "btn_restart", "_name": "btn_restart",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 111
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 113
}, },
{ {
"__id__": 112 "__id__": 114
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4745,7 +4809,7 @@ ...@@ -4745,7 +4809,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4777,7 +4841,7 @@ ...@@ -4777,7 +4841,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4786,7 +4850,7 @@ ...@@ -4786,7 +4850,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 113 "__id__": 115
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -4883,13 +4947,13 @@ ...@@ -4883,13 +4947,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 116 "__id__": 118
}, },
{ {
"__id__": 119 "__id__": 121
}, },
{ {
"__id__": 126 "__id__": 128
} }
], ],
"_active": false, "_active": false,
...@@ -4947,11 +5011,11 @@ ...@@ -4947,11 +5011,11 @@
"_name": "font", "_name": "font",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 117
}, },
"_children": [ "_children": [
{ {
"__id__": 117 "__id__": 119
} }
], ],
"_active": true, "_active": true,
...@@ -5009,13 +5073,13 @@ ...@@ -5009,13 +5073,13 @@
"_name": "BRLNSDB", "_name": "BRLNSDB",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 116 "__id__": 118
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 118 "__id__": 120
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5071,7 +5135,7 @@ ...@@ -5071,7 +5135,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 117 "__id__": 119
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -5102,17 +5166,17 @@ ...@@ -5102,17 +5166,17 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 117
}, },
"_children": [ "_children": [
{
"__id__": 120
},
{ {
"__id__": 122 "__id__": 122
}, },
{ {
"__id__": 124 "__id__": 124
},
{
"__id__": 126
} }
], ],
"_active": true, "_active": true,
...@@ -5170,13 +5234,13 @@ ...@@ -5170,13 +5234,13 @@
"_name": "1", "_name": "1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 119 "__id__": 121
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 121 "__id__": 123
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5232,7 +5296,7 @@ ...@@ -5232,7 +5296,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 120 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -5260,13 +5324,13 @@ ...@@ -5260,13 +5324,13 @@
"_name": "2", "_name": "2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 119 "__id__": 121
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 123 "__id__": 125
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5322,7 +5386,7 @@ ...@@ -5322,7 +5386,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 122 "__id__": 124
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -5350,13 +5414,13 @@ ...@@ -5350,13 +5414,13 @@
"_name": "3", "_name": "3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 119 "__id__": 121
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 125 "__id__": 127
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5412,7 +5476,7 @@ ...@@ -5412,7 +5476,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 124 "__id__": 126
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -5440,12 +5504,9 @@ ...@@ -5440,12 +5504,9 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 117
}, },
"_children": [ "_children": [
{
"__id__": 127
},
{ {
"__id__": 129 "__id__": 129
}, },
...@@ -5460,6 +5521,9 @@ ...@@ -5460,6 +5521,9 @@
}, },
{ {
"__id__": 137 "__id__": 137
},
{
"__id__": 139
} }
], ],
"_active": true, "_active": true,
...@@ -5517,13 +5581,13 @@ ...@@ -5517,13 +5581,13 @@
"_name": "btn", "_name": "btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 128
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 128 "__id__": 130
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5579,7 +5643,7 @@ ...@@ -5579,7 +5643,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 127 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5598,13 +5662,13 @@ ...@@ -5598,13 +5662,13 @@
"_name": "time2", "_name": "time2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 128
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 130 "__id__": 132
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5660,7 +5724,7 @@ ...@@ -5660,7 +5724,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 129 "__id__": 131
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5679,13 +5743,13 @@ ...@@ -5679,13 +5743,13 @@
"_name": "time1", "_name": "time1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 128
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 132 "__id__": 134
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5741,7 +5805,7 @@ ...@@ -5741,7 +5805,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 131 "__id__": 133
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5760,13 +5824,13 @@ ...@@ -5760,13 +5824,13 @@
"_name": "false", "_name": "false",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 128
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 134 "__id__": 136
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5822,7 +5886,7 @@ ...@@ -5822,7 +5886,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 133 "__id__": 135
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5841,13 +5905,13 @@ ...@@ -5841,13 +5905,13 @@
"_name": "true", "_name": "true",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 128
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 136 "__id__": 138
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5903,7 +5967,7 @@ ...@@ -5903,7 +5967,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 135 "__id__": 137
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5922,13 +5986,13 @@ ...@@ -5922,13 +5986,13 @@
"_name": "suc", "_name": "suc",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 128
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 138 "__id__": 140
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5984,7 +6048,7 @@ ...@@ -5984,7 +6048,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 137 "__id__": 139
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -6051,7 +6115,7 @@ ...@@ -6051,7 +6115,7 @@
}, },
"_enabled": true, "_enabled": true,
"cardParentN": { "cardParentN": {
"__id__": 29 "__id__": 31
}, },
"cardP": { "cardP": {
"__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744" "__uuid__": "a6570908-00fe-45b5-8768-2cbe0ea60744"
...@@ -6060,16 +6124,16 @@ ...@@ -6060,16 +6124,16 @@
"__id__": 22 "__id__": 22
}, },
"tipLabel": { "tipLabel": {
"__id__": 93 "__id__": 95
}, },
"tipN": { "tipN": {
"__id__": 87 "__id__": 89
}, },
"countDown": { "countDown": {
"__id__": 85 "__id__": 87
}, },
"overN": { "overN": {
"__id__": 100 "__id__": 102
}, },
"_id": "eaTVUpqahPfZeO9+sUI7RP" "_id": "eaTVUpqahPfZeO9+sUI7RP"
} }
......
...@@ -29,6 +29,15 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -29,6 +29,15 @@ export default class SceneComponent extends MyCocosSceneComponent {
completeNum = 0; completeNum = 0;
@property(cc.Node) @property(cc.Node)
overN:cc.Node overN:cc.Node
resultQuesitons=[];
// resultData = {
// quesitons:[{
// duration: 107,// 用时多久
// rightPairNumber: 5, // 正确的对数
// wrongPairNumber: 3, // 错误的对数
// totalPairNumber: 6,// 总对数
// }]
// }
...@@ -66,6 +75,10 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -66,6 +75,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
initData() { initData() {
this.log('initData:'); this.log('initData:');
// 所有全局变量 默认都是null // 所有全局变量 默认都是null
//
// this.scheduleOnce(()=>{
this.playAudioByUrl(this.data.questionTextAudio)
// },1)
cc.find("Canvas/uiP/bg_tip").active=true; cc.find("Canvas/uiP/bg_tip").active=true;
this.tittleLabel.string = this.data.title; this.tittleLabel.string = this.data.title;
this.tipLabel.string = this.data.questionText; this.tipLabel.string = this.data.questionText;
...@@ -189,13 +202,10 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -189,13 +202,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
timeN.active = false; timeN.active = false;
timeN1.active = true; timeN1.active = true;
// if(this.gameState=="game"){ // if(this.gameState=="game"){
if (numTime <= 1) {
if (numTime == 1) this.playLocalAudio("time1")
} else {
this.playLocalAudio("time2")
}
// }else{ // }else{
if (this.gameState == "watching") { if (this.gameState == "watching") {
if(numTime == 3)this.playLocalAudio("suc")
if (numTime == 1 || numTime == 2 || numTime == 3) { if (numTime == 1 || numTime == 2 || numTime == 3) {
this.countDown.active = true; this.countDown.active = true;
this.countDown.stopAllActions(); this.countDown.stopAllActions();
...@@ -208,6 +218,12 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -208,6 +218,12 @@ export default class SceneComponent extends MyCocosSceneComponent {
}) })
.start() .start()
} }
}else{
if (numTime <= 1) {
if (numTime == 1) this.playLocalAudio("time1")
} else {
this.playLocalAudio("time2")
}
} }
// } // }
...@@ -257,8 +273,18 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -257,8 +273,18 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.gameTime--; this.gameTime--;
console.log("gametime=====", this.gameTime) console.log("gametime=====", this.gameTime)
if (this.gameTime <= 0) { if (this.gameTime <= 0) {
this.gameOver(false);
this.clearntervals(); this.clearntervals();
this.resultQuesitons.push({
duration: this.data.questions[this.questionIndex].gameTime-this.gameTime,// 用时多久
rightPairNumber: this.completeNum, // 正确的对数
wrongPairNumber: this.data.questions[this.questionIndex].options.length / 2-this.completeNum, // 错误的对数
totalPairNumber: this.data.questions[this.questionIndex].options.length / 2,// 总对数
})
if(this.questionIndex<(this.data.questions.length-1)){
this.nextQuestion();
}else{
this.gameOver(true)
}
} }
this.updateTime(); this.updateTime();
...@@ -271,16 +297,18 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -271,16 +297,18 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.clickNode1 = node; this.clickNode1 = node;
this.clickNodeData1 = data; this.clickNodeData1 = data;
this.clickNode1.getComponent("card").asyncDoFlip() this.clickNode1.getComponent("card").asyncDoFlip()
this.playAudioByUrl(this.clickNodeData1.audio); this.asyncPlayAudioByUrl(this.clickNodeData1.audio);
// this.asyncPlayAudioByUrl( this.data.questionTextAudio);
} else { } else {
if (this.clickNode1 == node) { if (this.clickNode1 == node) {
return; return;
// this.playAudioByUrl( this.clickNodeData1.audio); // this.asyncPlayAudioByUrl( this.clickNodeData1.audio);
} else { } else {
this.canTouch = false this.canTouch = false
if (this.clickNodeData1.pairIdx == data.pairIdx) { if (this.clickNodeData1.pairIdx == data.pairIdx) {
Promise Promise
.all([node.getComponent("card").asyncDoFlip(), this.playAudioByUrl(data.audio)]) .all([node.getComponent("card").asyncDoFlip(), this.asyncPlayAudioByUrl(data.audio)])
.then(() => { .then(() => {
Promise.all([node.getComponent("card").playDragon(), this.clickNode1.getComponent("card").playDragon(), this.playLocalAudio("true")]) Promise.all([node.getComponent("card").playDragon(), this.clickNode1.getComponent("card").playDragon(), this.playLocalAudio("true")])
.then(() => { .then(() => {
...@@ -293,18 +321,14 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -293,18 +321,14 @@ export default class SceneComponent extends MyCocosSceneComponent {
if (this.completeNum == this.data.questions[this.questionIndex].options.length / 2) { if (this.completeNum == this.data.questions[this.questionIndex].options.length / 2) {
console.log("allTrue===") console.log("allTrue===")
this.clearntervals(); this.clearntervals();
this.resultQuesitons.push({
duration: this.data.questions[this.questionIndex].gameTime-this.gameTime,// 用时多久
rightPairNumber: this.completeNum, // 正确的对数
wrongPairNumber: this.data.questions[this.questionIndex].options.length / 2-this.completeNum, // 错误的对数
totalPairNumber: this.data.questions[this.questionIndex].options.length / 2,// 总对数
})
if(this.questionIndex<(this.data.questions.length-1)){ if(this.questionIndex<(this.data.questions.length-1)){
this.questionIndex++ this.nextQuestion();
this.overN.active=false;
this.initGameData();
this.initCards();
this.tipN.active = false;
let children = this.cardParentN.children;
for (let i = 0; i < children.length; i++) {
children[i].getComponent("card").asyncDoFlip(() => {
if (i == children.length - 1) this.startWatch();
})
}
}else{ }else{
this.gameOver(true) this.gameOver(true)
} }
...@@ -316,7 +340,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -316,7 +340,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
) )
} else { } else {
Promise Promise
.all([node.getComponent("card").asyncDoFlip(), this.playAudioByUrl(data.audio)]) .all([node.getComponent("card").asyncDoFlip(), this.asyncPlayAudioByUrl(data.audio)])
.then(() => { .then(() => {
Promise.all([this.playLocalAudio("false")]) Promise.all([this.playLocalAudio("false")])
.then(() => { .then(() => {
...@@ -338,6 +362,19 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -338,6 +362,19 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
} }
nextQuestion(){
this.questionIndex++
this.overN.active=false;
this.initGameData();
this.initCards();
this.tipN.active = false;
let children = this.cardParentN.children;
for (let i = 0; i < children.length; i++) {
children[i].getComponent("card").asyncDoFlip(() => {
if (i == children.length - 1) this.startWatch();
})
}
};
clearntervals() { clearntervals() {
// cc.find("Canvas/uiP/top/timeN").active=false; // cc.find("Canvas/uiP/top/timeN").active=false;
if (this.watchInterval) { if (this.watchInterval) {
...@@ -348,21 +385,19 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -348,21 +385,19 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
} }
gameOver(isSuc){ gameOver(isSuc){
this.questionIndex=0;
this.overN.active=true;
let sucN=this.overN.getChildByName("suc")
let failN=this.overN.getChildByName("fail")
if(isSuc){ if(isSuc){
this.questionIndex=0;
this.overN.active=true;
let sucN=this.overN.getChildByName("suc")
let failN=this.overN.getChildByName("fail")
sucN.active=true; sucN.active=true;
failN.active=false; failN.active=false;
this.playAudioByUrl("suc") // this.asyncPlayAudioByUrl("suc")
onHomeworkFinish(); onHomeworkFinish({
}else{ quesitons:this.resultQuesitons
sucN.active=false; });
failN.active=true;
} }
} }
playLocalAudio(audioName) { playLocalAudio(audioName) {
const audio = cc.find(`Canvas/res/audio/${audioName}`).getComponent(cc.AudioSource); const audio = cc.find(`Canvas/res/audio/${audioName}`).getComponent(cc.AudioSource);
...@@ -374,6 +409,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -374,6 +409,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
}) })
} }
onClickRestart(){ onClickRestart(){
this.resultQuesitons=[]
this.overN.active=false; this.overN.active=false;
this.initGameData(); this.initGameData();
this.initCards(); this.initCards();
...@@ -443,7 +479,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -443,7 +479,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
// iconNode.y = iconNode.parent.height / 2 - 10; // iconNode.y = iconNode.parent.height / 2 - 10;
// iconNode.on(cc.Node.EventType.TOUCH_START, () => { // iconNode.on(cc.Node.EventType.TOUCH_START, () => {
// this.playAudioByUrl(this.data.audio_url); // this.asyncPlayAudioByUrl(this.data.audio_url);
// }) // })
// } // }
......
...@@ -167,8 +167,9 @@ export class MyCocosSceneComponent extends cc.Component { ...@@ -167,8 +167,9 @@ export class MyCocosSceneComponent extends cc.Component {
}) })
} }
playAudioByUrl(audio_url, cb = null) { asyncPlayAudioByUrl(audio_url, cb = null) {
if (audio_url) { if (audio_url) {
console.log("audio_url===",audio_url)
return new Promise((resole, reject) => { return new Promise((resole, reject) => {
cc.assetManager.loadRemote(audio_url, (err, audioClip) => { cc.assetManager.loadRemote(audio_url, (err, audioClip) => {
cc.audioEngine.stopAll(); cc.audioEngine.stopAll();
...@@ -185,4 +186,15 @@ export class MyCocosSceneComponent extends cc.Component { ...@@ -185,4 +186,15 @@ export class MyCocosSceneComponent extends cc.Component {
cb && cb(); cb && cb();
} }
} }
playAudioByUrl(audio_url,) {
if (audio_url) {
console.log("audio_url===",audio_url)
cc.assetManager.loadRemote(audio_url, (err, audioClip) => {
cc.audioEngine.stopAll();
console.log("audioClip=====",audioClip)
cc.audioEngine.playEffect(audioClip, false);
console.log("audioClip2=====",audioClip)
})
}
}
} }
\ No newline at end of file
...@@ -410,15 +410,12 @@ export function showTrebleFirework(baseNode, rabbonList) { ...@@ -410,15 +410,12 @@ export function showTrebleFirework(baseNode, rabbonList) {
showFireworks(left); showFireworks(left);
showFireworks(right); showFireworks(right);
} }
export function onHomeworkFinish(data) {
export function onHomeworkFinish() {
const middleLayer = cc.find('middleLayer'); const middleLayer = cc.find('middleLayer');
if (middleLayer) { if (middleLayer) {
const middleLayerComponent = middleLayer.getComponent('middleLayer'); const middleLayerComponent = middleLayer.getComponent('middleLayer');
if (middleLayerComponent.role == 'student') { middleLayerComponent.onHomeworkFinish(() => { }, data);
middleLayerComponent.onHomeworkFinish(() => { });
}
} else { } else {
console.log('onHomeworkFinish'); console.log('onHomeworkFinish:' + JSON.stringify(data));
} }
} }
\ No newline at end of file
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