Commit 19c93dcc authored by Tt's avatar Tt

解决触摸问题,及页面适配问题

parent e5fd1484
...@@ -84,31 +84,31 @@ ...@@ -84,31 +84,31 @@
"__id__": 11 "__id__": 11
}, },
{ {
"__id__": 25 "__id__": 26
}, },
{ {
"__id__": 61 "__id__": 65
}, },
{ {
"__id__": 70 "__id__": 74
}, },
{ {
"__id__": 72 "__id__": 76
}, },
{ {
"__id__": 92 "__id__": 96
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 112 "__id__": 116
}, },
{ {
"__id__": 113 "__id__": 117
}, },
{ {
"__id__": 114 "__id__": 118
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -282,8 +282,8 @@ ...@@ -282,8 +282,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 1920,
"height": 0 "height": 1080
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -330,10 +330,10 @@ ...@@ -330,10 +330,10 @@
"alignMode": 2, "alignMode": 2,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": 960, "_left": 0,
"_right": 960, "_right": 0,
"_top": 540, "_top": 0,
"_bottom": 540, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -540,16 +540,16 @@ ...@@ -540,16 +540,16 @@
"__id__": 18 "__id__": 18
}, },
{ {
"__id__": 20 "__id__": 21
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 23 "__id__": 24
}, },
{ {
"__id__": 24 "__id__": 25
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -860,6 +860,9 @@ ...@@ -860,6 +860,9 @@
"_components": [ "_components": [
{ {
"__id__": 19 "__id__": 19
},
{
"__id__": 20
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -942,6 +945,33 @@ ...@@ -942,6 +945,33 @@
"_atlas": null, "_atlas": null,
"_id": "acr+XkT8xLY4NfdgTcinZE" "_id": "acr+XkT8xLY4NfdgTcinZE"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 12,
"_left": 1274.635,
"_right": 0,
"_top": 0,
"_bottom": 75.95299999999997,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "4cya0liv5OW41Uwb/e7nsv"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_wall", "_name": "bg_wall",
...@@ -953,10 +983,10 @@ ...@@ -953,10 +983,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 21 "__id__": 22
}, },
{ {
"__id__": 22 "__id__": 23
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1012,7 +1042,7 @@ ...@@ -1012,7 +1042,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 20 "__id__": 21
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1044,16 +1074,16 @@ ...@@ -1044,16 +1074,16 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 20 "__id__": 21
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 0, "_alignFlags": 13,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 41,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -1063,7 +1093,7 @@ ...@@ -1063,7 +1093,7 @@
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 0,
"_originalHeight": 0, "_originalHeight": 1039,
"_id": "8ferYZUeVPAbewmu0SBfEy" "_id": "8ferYZUeVPAbewmu0SBfEy"
}, },
{ {
...@@ -1134,25 +1164,22 @@ ...@@ -1134,25 +1164,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 26 "__id__": 27
},
{
"__id__": 28
}, },
{ {
"__id__": 32 "__id__": 30
}, },
{ {
"__id__": 34 "__id__": 35
}, },
{ {
"__id__": 36 "__id__": 38
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 60 "__id__": 64
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1166,8 +1193,8 @@ ...@@ -1166,8 +1193,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 1920,
"height": 0 "height": 1080
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1208,13 +1235,16 @@ ...@@ -1208,13 +1235,16 @@
"_name": "question_img", "_name": "question_img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 25 "__id__": 26
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 27 "__id__": 28
},
{
"__id__": 29
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1270,7 +1300,7 @@ ...@@ -1270,7 +1300,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 26 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1297,22 +1327,52 @@ ...@@ -1297,22 +1327,52 @@
"_atlas": null, "_atlas": null,
"_id": "d9NPgj5NFALZAQrQO5YVQF" "_id": "d9NPgj5NFALZAQrQO5YVQF"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 8,
"_left": 185.45299999999997,
"_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": "019GAG+jFEuZglRG6ZpTxo"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img_kuang", "_name": "img_kuang",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 25 "__id__": 26
}, },
"_children": [ "_children": [
{ {
"__id__": 29 "__id__": 31
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 31 "__id__": 33
},
{
"__id__": 34
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1338,7 +1398,7 @@ ...@@ -1338,7 +1398,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-258.199, -258.19900000000007,
93.985, 93.985,
0, 0,
0, 0,
...@@ -1368,13 +1428,13 @@ ...@@ -1368,13 +1428,13 @@
"_name": "img_deng", "_name": "img_deng",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 28 "__id__": 30
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 30 "__id__": 32
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1430,7 +1490,7 @@ ...@@ -1430,7 +1490,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 29 "__id__": 31
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1462,7 +1522,7 @@ ...@@ -1462,7 +1522,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 28 "__id__": 30
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1489,18 +1549,48 @@ ...@@ -1489,18 +1549,48 @@
"_atlas": null, "_atlas": null,
"_id": "d0P0EAgddCLYD3GgyGwFcL" "_id": "d0P0EAgddCLYD3GgyGwFcL"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 8,
"_left": 144.80099999999993,
"_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": "53RSeGGdtHDbvqmXeLp20+"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "label_title", "_name": "label_title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 25 "__id__": 26
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 36
},
{
"__id__": 37
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1526,7 +1616,7 @@ ...@@ -1526,7 +1616,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-62.593, -62.593000000000075,
-191.291, -191.291,
0, 0,
0, 0,
...@@ -1556,7 +1646,7 @@ ...@@ -1556,7 +1646,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 32 "__id__": 35
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1584,18 +1674,67 @@ ...@@ -1584,18 +1674,67 @@
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "84Fjg8lBlGvax8Gy+7UAnc" "_id": "84Fjg8lBlGvax8Gy+7UAnc"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 8,
"_left": 597.4069999999999,
"_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": "33cPZcg31AkKFw6fUkzXAj"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img_question", "_name": "layout_record",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 25 "__id__": 26
}, },
"_children": [], "_children": [
{
"__id__": 39
},
{
"__id__": 41
},
{
"__id__": 46
},
{
"__id__": 48
},
{
"__id__": 53
},
{
"__id__": 55
},
{
"__id__": 57
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 63
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1609,8 +1748,8 @@ ...@@ -1609,8 +1748,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1065, "width": 0,
"height": 129 "height": 0
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1621,8 +1760,8 @@ ...@@ -1621,8 +1760,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-240.62099999999998, -762.645,
-393.014, -398.618,
0, 0,
0, 0,
0, 0,
...@@ -1644,71 +1783,20 @@ ...@@ -1644,71 +1783,20 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "60MsKAQFJJYKJajxMKLkx3" "_id": "00XMxwg7NIOJvf2n/Cchnu"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "4e53666b-ee48-43de-9e7e-c9644ddf82a3"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d3Ja9pgO1JEaGFNiecBqEg"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "layout_record", "_name": "img_question",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 25 "__id__": 38
},
"_children": [
{
"__id__": 37
},
{
"__id__": 42
},
{
"__id__": 44
},
{
"__id__": 49
},
{
"__id__": 51
}, },
{ "_children": [],
"__id__": 53
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 40
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1722,8 +1810,8 @@ ...@@ -1722,8 +1810,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 1065,
"height": 0 "height": 129
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1734,8 +1822,8 @@ ...@@ -1734,8 +1822,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-762.645, 522.024,
-398.618, 5.604,
0, 0,
0, 0,
0, 0,
...@@ -1757,21 +1845,53 @@ ...@@ -1757,21 +1845,53 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "00XMxwg7NIOJvf2n/Cchnu" "_id": "60MsKAQFJJYKJajxMKLkx3"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "4e53666b-ee48-43de-9e7e-c9644ddf82a3"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d3Ja9pgO1JEaGFNiecBqEg"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "btn_restart", "_name": "btn_restart",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 36 "__id__": 38
}, },
"_children": [ "_children": [
{ {
"__id__": 38 "__id__": 42
}, },
{ {
"__id__": 40 "__id__": 44
} }
], ],
"_active": true, "_active": true,
...@@ -1829,13 +1949,13 @@ ...@@ -1829,13 +1949,13 @@
"_name": "btn_restart", "_name": "btn_restart",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 37 "__id__": 41
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 39 "__id__": 43
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1891,7 +2011,7 @@ ...@@ -1891,7 +2011,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 38 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1923,13 +2043,13 @@ ...@@ -1923,13 +2043,13 @@
"_name": "New Label", "_name": "New Label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 37 "__id__": 41
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 41 "__id__": 45
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1985,7 +2105,7 @@ ...@@ -1985,7 +2105,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2018,13 +2138,13 @@ ...@@ -2018,13 +2138,13 @@
"_name": "btn_vioce", "_name": "btn_vioce",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 36 "__id__": 38
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 47
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2080,7 +2200,7 @@ ...@@ -2080,7 +2200,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 46
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2112,14 +2232,14 @@ ...@@ -2112,14 +2232,14 @@
"_name": "btn_vioce_ing", "_name": "btn_vioce_ing",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 36 "__id__": 38
}, },
"_children": [ "_children": [
{ {
"__id__": 45 "__id__": 49
}, },
{ {
"__id__": 47 "__id__": 51
} }
], ],
"_active": true, "_active": true,
...@@ -2177,13 +2297,13 @@ ...@@ -2177,13 +2297,13 @@
"_name": "img_stop", "_name": "img_stop",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 44 "__id__": 48
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 50
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2239,7 +2359,7 @@ ...@@ -2239,7 +2359,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 45 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2271,13 +2391,13 @@ ...@@ -2271,13 +2391,13 @@
"_name": "img_ing", "_name": "img_ing",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 44 "__id__": 48
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 48 "__id__": 52
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2333,7 +2453,7 @@ ...@@ -2333,7 +2453,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 47 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2365,13 +2485,13 @@ ...@@ -2365,13 +2485,13 @@
"_name": "label_tip_wait", "_name": "label_tip_wait",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 36 "__id__": 38
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 50 "__id__": 54
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2427,7 +2547,7 @@ ...@@ -2427,7 +2547,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 49 "__id__": 53
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2460,13 +2580,13 @@ ...@@ -2460,13 +2580,13 @@
"_name": "label_tip_ing", "_name": "label_tip_ing",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 36 "__id__": 38
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 52 "__id__": 56
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2522,7 +2642,7 @@ ...@@ -2522,7 +2642,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2555,20 +2675,20 @@ ...@@ -2555,20 +2675,20 @@
"_name": "rich_content", "_name": "rich_content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 36 "__id__": 38
}, },
"_children": [ "_children": [
{ {
"__id__": 54 "__id__": 58
}, },
{ {
"__id__": 56 "__id__": 60
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 58 "__id__": 62
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2624,13 +2744,13 @@ ...@@ -2624,13 +2744,13 @@
"_name": "RICHTEXT_CHILD", "_name": "RICHTEXT_CHILD",
"_objFlags": 1024, "_objFlags": 1024,
"_parent": { "_parent": {
"__id__": 53 "__id__": 57
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 55 "__id__": 59
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2687,7 +2807,7 @@ ...@@ -2687,7 +2807,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 54 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2720,13 +2840,13 @@ ...@@ -2720,13 +2840,13 @@
"_name": "RICHTEXT_CHILD", "_name": "RICHTEXT_CHILD",
"_objFlags": 1024, "_objFlags": 1024,
"_parent": { "_parent": {
"__id__": 53 "__id__": 57
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 57 "__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2783,7 +2903,7 @@ ...@@ -2783,7 +2903,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2816,7 +2936,7 @@ ...@@ -2816,7 +2936,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 53 "__id__": 57
}, },
"_enabled": true, "_enabled": true,
"_fontFamily": "Arial", "_fontFamily": "Arial",
...@@ -2837,16 +2957,16 @@ ...@@ -2837,16 +2957,16 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 36 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 12,
"_left": -762.645, "_left": 197.35500000000002,
"_right": 762.645, "_right": 1722.645,
"_top": 398.618, "_top": 938.6179999999999,
"_bottom": -398.618, "_bottom": 141.382,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -2864,13 +2984,13 @@ ...@@ -2864,13 +2984,13 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 25 "__id__": 26
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 8, "_alignFlags": 45,
"_left": 960, "_left": 0,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
...@@ -2882,8 +3002,8 @@ ...@@ -2882,8 +3002,8 @@
"_isAbsBottom": true, "_isAbsBottom": true,
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 1920,
"_originalHeight": 0, "_originalHeight": 1080,
"_id": "6czEKQ3xxNN6X4QGVJHIKQ" "_id": "6czEKQ3xxNN6X4QGVJHIKQ"
}, },
{ {
...@@ -2895,19 +3015,19 @@ ...@@ -2895,19 +3015,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 62 "__id__": 66
}, },
{ {
"__id__": 64 "__id__": 68
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 68 "__id__": 72
}, },
{ {
"__id__": 69 "__id__": 73
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2963,13 +3083,13 @@ ...@@ -2963,13 +3083,13 @@
"_name": "ani", "_name": "ani",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 61 "__id__": 65
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 63 "__id__": 67
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3025,7 +3145,7 @@ ...@@ -3025,7 +3145,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 62 "__id__": 66
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3065,17 +3185,17 @@ ...@@ -3065,17 +3185,17 @@
"_name": "btn_go", "_name": "btn_go",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 61 "__id__": 65
}, },
"_children": [ "_children": [
{ {
"__id__": 65 "__id__": 69
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 67 "__id__": 71
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3131,13 +3251,13 @@ ...@@ -3131,13 +3251,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 68
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 66 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3193,7 +3313,7 @@ ...@@ -3193,7 +3313,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 65 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3226,7 +3346,7 @@ ...@@ -3226,7 +3346,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 64 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3258,11 +3378,11 @@ ...@@ -3258,11 +3378,11 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 61 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"aniRole": { "aniRole": {
"__id__": 62 "__id__": 66
}, },
"_id": "e4RrOXSNJGd68Mq3UTYY0p" "_id": "e4RrOXSNJGd68Mq3UTYY0p"
}, },
...@@ -3271,7 +3391,7 @@ ...@@ -3271,7 +3391,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 61 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -3304,7 +3424,7 @@ ...@@ -3304,7 +3424,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 71 "__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3360,7 +3480,7 @@ ...@@ -3360,7 +3480,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 70 "__id__": 74
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3396,7 +3516,7 @@ ...@@ -3396,7 +3516,7 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 73 "__id__": 77
} }
], ],
"_active": true, "_active": true,
...@@ -3454,11 +3574,11 @@ ...@@ -3454,11 +3574,11 @@
"_name": "Controls", "_name": "Controls",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 72 "__id__": 76
}, },
"_children": [ "_children": [
{ {
"__id__": 74 "__id__": 78
} }
], ],
"_active": true, "_active": true,
...@@ -3516,32 +3636,32 @@ ...@@ -3516,32 +3636,32 @@
"_name": "ProgressBar", "_name": "ProgressBar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 73 "__id__": 77
}, },
"_children": [ "_children": [
{
"__id__": 75
},
{ {
"__id__": 79 "__id__": 79
}, },
{ {
"__id__": 81 "__id__": 83
}, },
{ {
"__id__": 83 "__id__": 85
}, },
{ {
"__id__": 87 "__id__": 87
},
{
"__id__": 91
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 94
}, },
{ {
"__id__": 91 "__id__": 95
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3597,17 +3717,17 @@ ...@@ -3597,17 +3717,17 @@
"_name": "bar", "_name": "bar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 78
}, },
"_children": [ "_children": [
{ {
"__id__": 76 "__id__": 80
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 78 "__id__": 82
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3663,13 +3783,13 @@ ...@@ -3663,13 +3783,13 @@
"_name": "bar_tag", "_name": "bar_tag",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 79
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 77 "__id__": 81
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3725,7 +3845,7 @@ ...@@ -3725,7 +3845,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 76 "__id__": 80
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3757,7 +3877,7 @@ ...@@ -3757,7 +3877,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 75 "__id__": 79
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3789,13 +3909,13 @@ ...@@ -3789,13 +3909,13 @@
"_name": "Play", "_name": "Play",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 78
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 80 "__id__": 84
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3851,7 +3971,7 @@ ...@@ -3851,7 +3971,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 79 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3883,13 +4003,13 @@ ...@@ -3883,13 +4003,13 @@
"_name": "Pause", "_name": "Pause",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 78
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 82 "__id__": 86
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3945,7 +4065,7 @@ ...@@ -3945,7 +4065,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 81 "__id__": 85
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3977,19 +4097,19 @@ ...@@ -3977,19 +4097,19 @@
"_name": "CurrentLabel", "_name": "CurrentLabel",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 78
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 88
}, },
{ {
"__id__": 85 "__id__": 89
}, },
{ {
"__id__": 86 "__id__": 90
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4045,7 +4165,7 @@ ...@@ -4045,7 +4165,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4078,7 +4198,7 @@ ...@@ -4078,7 +4198,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 87
}, },
"_enabled": false, "_enabled": false,
"_color": { "_color": {
...@@ -4096,7 +4216,7 @@ ...@@ -4096,7 +4216,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4123,16 +4243,16 @@ ...@@ -4123,16 +4243,16 @@
"_name": "TimeLabel", "_name": "TimeLabel",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 78
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 88 "__id__": 92
}, },
{ {
"__id__": 89 "__id__": 93
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4188,7 +4308,7 @@ ...@@ -4188,7 +4308,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 87 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4221,7 +4341,7 @@ ...@@ -4221,7 +4341,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 87 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4248,7 +4368,7 @@ ...@@ -4248,7 +4368,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 74 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4280,12 +4400,12 @@ ...@@ -4280,12 +4400,12 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 74 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"_N$totalLength": 1, "_N$totalLength": 1,
"_N$barSprite": { "_N$barSprite": {
"__id__": 78 "__id__": 82
}, },
"_N$mode": 2, "_N$mode": 2,
"_N$progress": 0, "_N$progress": 0,
...@@ -4301,13 +4421,13 @@ ...@@ -4301,13 +4421,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 93 "__id__": 97
}, },
{ {
"__id__": 96 "__id__": 100
}, },
{ {
"__id__": 97 "__id__": 101
} }
], ],
"_active": false, "_active": false,
...@@ -4365,11 +4485,11 @@ ...@@ -4365,11 +4485,11 @@
"_name": "font", "_name": "font",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 92 "__id__": 96
}, },
"_children": [ "_children": [
{ {
"__id__": 94 "__id__": 98
} }
], ],
"_active": true, "_active": true,
...@@ -4427,13 +4547,13 @@ ...@@ -4427,13 +4547,13 @@
"_name": "BRLNSDB", "_name": "BRLNSDB",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 93 "__id__": 97
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 95 "__id__": 99
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4489,7 +4609,7 @@ ...@@ -4489,7 +4609,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 94 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4524,7 +4644,7 @@ ...@@ -4524,7 +4644,7 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 92 "__id__": 96
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -4582,15 +4702,9 @@ ...@@ -4582,15 +4702,9 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 92 "__id__": 96
}, },
"_children": [ "_children": [
{
"__id__": 98
},
{
"__id__": 100
},
{ {
"__id__": 102 "__id__": 102
}, },
...@@ -4605,6 +4719,12 @@ ...@@ -4605,6 +4719,12 @@
}, },
{ {
"__id__": 110 "__id__": 110
},
{
"__id__": 112
},
{
"__id__": 114
} }
], ],
"_active": true, "_active": true,
...@@ -4662,13 +4782,13 @@ ...@@ -4662,13 +4782,13 @@
"_name": "btn", "_name": "btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 97 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 103
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4724,7 +4844,7 @@ ...@@ -4724,7 +4844,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 98 "__id__": 102
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4743,13 +4863,13 @@ ...@@ -4743,13 +4863,13 @@
"_name": "right", "_name": "right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 97 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 105
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4805,7 +4925,7 @@ ...@@ -4805,7 +4925,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 100 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4824,13 +4944,13 @@ ...@@ -4824,13 +4944,13 @@
"_name": "bettery", "_name": "bettery",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 97 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 103 "__id__": 107
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4886,7 +5006,7 @@ ...@@ -4886,7 +5006,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4905,13 +5025,13 @@ ...@@ -4905,13 +5025,13 @@
"_name": "error", "_name": "error",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 97 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 105 "__id__": 109
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4967,7 +5087,7 @@ ...@@ -4967,7 +5087,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 104 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4986,13 +5106,13 @@ ...@@ -4986,13 +5106,13 @@
"_name": "bgm", "_name": "bgm",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 97 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 107 "__id__": 111
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5048,7 +5168,7 @@ ...@@ -5048,7 +5168,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 106 "__id__": 110
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5067,13 +5187,13 @@ ...@@ -5067,13 +5187,13 @@
"_name": "opendoor", "_name": "opendoor",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 97 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 109 "__id__": 113
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5129,7 +5249,7 @@ ...@@ -5129,7 +5249,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 108 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5148,13 +5268,13 @@ ...@@ -5148,13 +5268,13 @@
"_name": "light", "_name": "light",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 97 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 115
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5210,7 +5330,7 @@ ...@@ -5210,7 +5330,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5277,58 +5397,58 @@ ...@@ -5277,58 +5397,58 @@
}, },
"_enabled": true, "_enabled": true,
"xiaodi": { "xiaodi": {
"__id__": 68 "__id__": 72
}, },
"question_img": { "question_img": {
"__id__": 26 "__id__": 27
}, },
"label_title": { "label_title": {
"__id__": 32 "__id__": 35
}, },
"btn_vioce": { "btn_vioce": {
"__id__": 42 "__id__": 46
}, },
"btn_vioce_ing": { "btn_vioce_ing": {
"__id__": 44 "__id__": 48
}, },
"btn_restart": { "btn_restart": {
"__id__": 37 "__id__": 41
}, },
"label_tip_wait": { "label_tip_wait": {
"__id__": 49 "__id__": 53
}, },
"label_tip_ing": { "label_tip_ing": {
"__id__": 51 "__id__": 55
}, },
"rich_content": { "rich_content": {
"__id__": 53 "__id__": 57
}, },
"btn_go": { "btn_go": {
"__id__": 64 "__id__": 68
}, },
"barTag": { "barTag": {
"__id__": 76 "__id__": 80
}, },
"ProgressBar": { "ProgressBar": {
"__id__": 74 "__id__": 78
}, },
"videoPlayer": { "videoPlayer": {
"__id__": 8 "__id__": 8
}, },
"currentTimeLabel": { "currentTimeLabel": {
"__id__": 84 "__id__": 88
}, },
"layout_video": { "layout_video": {
"__id__": 72 "__id__": 76
}, },
"videoControls": { "videoControls": {
"__id__": 73 "__id__": 77
}, },
"pauseButton": { "pauseButton": {
"__id__": 81 "__id__": 85
}, },
"playButton": { "playButton": {
"__id__": 79 "__id__": 83
}, },
"video_canvas": { "video_canvas": {
"__id__": 5 "__id__": 5
......
...@@ -96,6 +96,9 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -96,6 +96,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
//5. 视频播放 //5. 视频播放
nextStage() { nextStage() {
this.rich_content.active = false;
const richText = this.rich_content.getComponent(cc.RichText);
richText.string = "";
// 处理下一个数 // 处理下一个数
if (!this.nextQuestion) { if (!this.nextQuestion) {
this.gameOver(); this.gameOver();
...@@ -190,7 +193,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -190,7 +193,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.recording = false; this.recording = false;
this.showTimeEnd(); this.showTimeEnd();
let testData = { let testData = {
"text": "Hello every one my name is world", "text": "yes i can blue whales qiant pandas endangered",
"audio": "https://staging-teach.cdn.ireadabc.com/6ee3ccaa831a884f02c6a75c6f647cb5.wav" "audio": "https://staging-teach.cdn.ireadabc.com/6ee3ccaa831a884f02c6a75c6f647cb5.wav"
} }
if (!courseware) { if (!courseware) {
...@@ -209,7 +212,10 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -209,7 +212,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
});//结束录音 });//结束录音
} }
recordEnd(data) { recordEnd(data) {
const keyTextArr = this.currentQuestion.keyword.split(","); let keyTextArr = this.currentQuestion.keyword.split(",");
keyTextArr = keyTextArr.map(key => {
return key.trim();
})
const dataTextArr = data.text.split(" "); const dataTextArr = data.text.split(" ");
let colorNormal = '#313131'; let colorNormal = '#313131';
...@@ -261,7 +267,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -261,7 +267,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
console.log('next') console.log('next')
if (this.recording) return; if (this.recording) return;
if (!this.nextQuestion) { if (!this.nextQuestion) {
pg.view.find(this, 'layout_game/img_question').active = false; pg.view.find(this, 'layout_game/layout_record/img_question').active = false;
this.btn_vioce.active = false; this.btn_vioce.active = false;
this.label_tip_wait.active = false; this.label_tip_wait.active = false;
this.label_tip_ing.active = false; this.label_tip_ing.active = false;
......
export const defaultData = export const defaultData =
{ {"npcAudioText":"去看影像","npcAudio":"","npcAudioName":"","npcAudioEnd":"http://teach.cdn.ireadabc.com/51cf798ecb6d6503b568650119756323_l.mp3","npcAudioEndName":"","video":"http://teach.cdn.ireadabc.com/dd6c6a4d86af226e3d4cf3c86233889c.mp4","questions":[{"img":"http://teach.cdn.ireadabc.com/22bd5eb379682e6577d7c4865ffb06f8.png","title":"The pictures show some endangered animals.Can you name any other endangered animals?","keyword":"Yes, I can, Blue whales, giant pandas, endangered","startAudio":"http://teach.cdn.ireadabc.com/7b060c020cbc36cf6d1e1c50f569df18_l.mp3","startAudioName":"","rightAudio":"http://teach.cdn.ireadabc.com/e3ab2de0acd00ccc9dc7c895d30a0f7b_l.mp3","rightAudioName":"","errorAudio":"http://teach.cdn.ireadabc.com/acd02042b5e43fafc99784efc11beae0_l.mp3","errorAudioName":"","audioName":""},{"img":"http://teach.cdn.ireadabc.com/9ff8046fa6e17f42e850e15d2de7ea56.png","title":"7545437567456","keyword":"dig, head, circle, glass, short hair","startAudio":"http://teach.cdn.ireadabc.com/9fadff1fae6245b15217aa70de36eb37_l.mp3","startAudioName":"","rightAudio":"http://teach.cdn.ireadabc.com/d41d8cd98f00b204e9800998ecf8427e_l.mp3","rightAudioName":"","errorAudio":"http://teach.cdn.ireadabc.com/acd02042b5e43fafc99784efc11beae0_l.mp3","errorAudioName":"","audioName":""}],"questionText":"","audioName":""}
let a = {
"npcTitle": "exit", "npcTitle": "exit",
"npcAudio": "", "npcAudio": "",
"npcAudioName": "", "npcAudioName": "",
......
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