Commit f92c3243 authored by Tt's avatar Tt

1

parent 5f50bcfe
...@@ -84,46 +84,40 @@ ...@@ -84,46 +84,40 @@
"__id__": 11 "__id__": 11
}, },
{ {
"__id__": 13 "__id__": 19
},
{
"__id__": 15
},
{
"__id__": 23
}, },
{ {
"__id__": 26 "__id__": 22
}, },
{ {
"__id__": 77 "__id__": 77
}, },
{ {
"__id__": 100 "__id__": 104
}, },
{ {
"__id__": 122 "__id__": 126
}, },
{ {
"__id__": 151 "__id__": 155
}, },
{ {
"__id__": 159 "__id__": 163
}, },
{ {
"__id__": 160 "__id__": 164
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 178 "__id__": 182
}, },
{ {
"__id__": 179 "__id__": 183
}, },
{ {
"__id__": 180 "__id__": 184
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -366,100 +360,6 @@ ...@@ -366,100 +360,6 @@
"_atlas": null, "_atlas": null,
"_id": "21FfYOJDxGWKFPs7q98BhO" "_id": "21FfYOJDxGWKFPs7q98BhO"
}, },
{
"__type__": "cc.Node",
"_name": "bg_mic_bg",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 8
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 316,
"height": 187
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-1327.085,
-407.058,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "2b3uhy2ZpAlZ5a6zZ2zaVn"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "3700f0c8-fae1-4af8-be4c-7d9c1e50ce47"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "0fbtt7dFlF+oQ/0+nGSJmS"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_nopageturns", "_name": "bg_nopageturns",
...@@ -471,7 +371,7 @@ ...@@ -471,7 +371,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 10 "__id__": 8
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -527,7 +427,7 @@ ...@@ -527,7 +427,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 9 "__id__": 7
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -565,7 +465,7 @@ ...@@ -565,7 +465,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 12 "__id__": 10
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -621,7 +521,7 @@ ...@@ -621,7 +521,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 11 "__id__": 9
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -648,100 +548,6 @@ ...@@ -648,100 +548,6 @@
"_atlas": null, "_atlas": null,
"_id": "bchjXSabNCQZlDXvj6rFgY" "_id": "bchjXSabNCQZlDXvj6rFgY"
}, },
{
"__type__": "cc.Node",
"_name": "v",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 14
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1920,
"height": 1080
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "88TK9ODDpJYL6CWlshkQSH"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "c2745cc1-2fd1-4b86-a6f7-2409c8b37883"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "7bS2aTQ7pKXr0m3PikqUXf"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg", "_name": "bg",
...@@ -751,16 +557,16 @@ ...@@ -751,16 +557,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 16 "__id__": 12
}, },
{ {
"__id__": 19 "__id__": 15
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 22 "__id__": 18
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -816,16 +622,16 @@ ...@@ -816,16 +622,16 @@
"_name": "bg_wall", "_name": "bg_wall",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 15 "__id__": 11
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 17 "__id__": 13
}, },
{ {
"__id__": 18 "__id__": 14
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -881,7 +687,7 @@ ...@@ -881,7 +687,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 16 "__id__": 12
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -913,7 +719,7 @@ ...@@ -913,7 +719,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 16 "__id__": 12
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -940,16 +746,16 @@ ...@@ -940,16 +746,16 @@
"_name": "bg_bottom", "_name": "bg_bottom",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 15 "__id__": 11
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 20 "__id__": 16
}, },
{ {
"__id__": 21 "__id__": 17
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1005,7 +811,7 @@ ...@@ -1005,7 +811,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 19 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1037,7 +843,7 @@ ...@@ -1037,7 +843,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 19 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -1064,7 +870,7 @@ ...@@ -1064,7 +870,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 15 "__id__": 11
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -1097,10 +903,10 @@ ...@@ -1097,10 +903,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 24 "__id__": 20
}, },
{ {
"__id__": 25 "__id__": 21
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1156,7 +962,7 @@ ...@@ -1156,7 +962,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 23 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -1183,7 +989,7 @@ ...@@ -1183,7 +989,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 23 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1244,7 +1050,7 @@ ...@@ -1244,7 +1050,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 23 "__id__": 19
}, },
"_id": "49gKv9YnNGGb71uG9nSzID" "_id": "49gKv9YnNGGb71uG9nSzID"
}, },
...@@ -1257,13 +1063,13 @@ ...@@ -1257,13 +1063,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 27 "__id__": 23
}, },
{ {
"__id__": 34 "__id__": 24
}, },
{ {
"__id__": 36 "__id__": 26
}, },
{ {
"__id__": 40 "__id__": 40
...@@ -1343,19 +1149,9 @@ ...@@ -1343,19 +1149,9 @@
"_name": "img_board", "_name": "img_board",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 22
},
"_children": [
{
"__id__": 28
},
{
"__id__": 30
}, },
{ "_children": [],
"__id__": 32
}
],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": null, "_prefab": null,
...@@ -1408,16 +1204,16 @@ ...@@ -1408,16 +1204,16 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_1", "_name": "layout_item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 22
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 29 "__id__": 25
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1431,8 +1227,8 @@ ...@@ -1431,8 +1227,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1065, "width": 1920,
"height": 778 "height": 1080
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1444,7 +1240,7 @@ ...@@ -1444,7 +1240,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
31.903, 27,
0, 0,
0, 0,
0, 0,
...@@ -1466,52 +1262,50 @@ ...@@ -1466,52 +1262,50 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "8aCqMZ+PFBPJ2LzZcAuFzB" "_id": "c1gx0gxQhFZ4tR/hlGdIyk"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Mask",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 28 "__id__": 24
}, },
"_enabled": true, "_enabled": false,
"_materials": [ "_materials": [
{ {
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_spriteFrame": null,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "c19d6a60-c159-4423-af82-cdce227607ca"
},
"_type": 0, "_type": 0,
"_sizeMode": 1, "_segments": 64,
"_fillType": 0, "_N$alphaThreshold": 0.1,
"_fillCenter": { "_N$inverted": false,
"__type__": "cc.Vec2", "_id": "c5quOPLnNLXrlRQoc58xbz"
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b0F7tvU8pO9oSoKsRYEaHm"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_2", "_name": "item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 22
},
"_children": [
{
"__id__": 27 "__id__": 27
}, },
"_children": [], {
"__id__": 31
},
{
"__id__": 35
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 31 "__id__": 39
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1525,8 +1319,8 @@ ...@@ -1525,8 +1319,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1372, "width": 1330,
"height": 685 "height": 655
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1538,7 +1332,7 @@ ...@@ -1538,7 +1332,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-12.27, 27,
0, 0,
0, 0,
0, 0,
...@@ -1560,52 +1354,24 @@ ...@@ -1560,52 +1354,24 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "7ecnOJsSpASo17kRgv3auc" "_id": "e3A0fzaCtDt7CfTAS6EjYx"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Node",
"_name": "", "_name": "bg_1",
"_objFlags": 0, "_objFlags": 0,
"node": { "_parent": {
"__id__": 30 "__id__": 26
}, },
"_enabled": true, "_children": [
"_materials": [
{ {
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__id__": 28
} }
], ],
"_srcBlendFactor": 770, "_active": true,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a4fb18b1-2944-4f15-a54b-79ca52fb9cf1"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "e1vlKw8BNPhLDdAkGI7+Id"
},
{
"__type__": "cc.Node",
"_name": "bg_3",
"_objFlags": 0,
"_parent": {
"__id__": 27
},
"_children": [],
"_active": false,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1619,8 +1385,8 @@ ...@@ -1619,8 +1385,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1270, "width": 1065,
"height": 713 "height": 778
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1631,8 +1397,8 @@ ...@@ -1631,8 +1397,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, -2.297,
2.454, 29.11,
0, 0,
0, 0,
0, 0,
...@@ -1654,52 +1420,20 @@ ...@@ -1654,52 +1420,20 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "a1fuxlDv1A9I8fZov+NDmw" "_id": "8aCqMZ+PFBPJ2LzZcAuFzB"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a63ca1d6-5884-4a8d-a181-f69eb0b8ae7e"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "bc9bTjYRxHybr8cfJ168a7"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "layout_item", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 27
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 29
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1713,8 +1447,8 @@ ...@@ -1713,8 +1447,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1330, "width": 960,
"height": 655 "height": 720
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1725,8 +1459,8 @@ ...@@ -1725,8 +1459,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 2.297,
19.089, 7.446,
0, 0,
0, 0,
0, 0,
...@@ -1748,14 +1482,14 @@ ...@@ -1748,14 +1482,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "c1gx0gxQhFZ4tR/hlGdIyk" "_id": "c61Ekn7RpGLYou3CsmOaJJ"
}, },
{ {
"__type__": "cc.Mask", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 28
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1763,29 +1497,73 @@ ...@@ -1763,29 +1497,73 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_spriteFrame": null, "_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0, "_type": 0,
"_segments": 64, "_sizeMode": 0,
"_N$alphaThreshold": 0.1, "_fillType": 0,
"_N$inverted": false, "_fillCenter": {
"_id": "c5quOPLnNLXrlRQoc58xbz" "__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "a5Jq3om9hJKqYTtQ1AxapC"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "c19d6a60-c159-4423-af82-cdce227607ca"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b0F7tvU8pO9oSoKsRYEaHm"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "item", "_name": "bg_2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 26
}, },
"_children": [ "_children": [
{ {
"__id__": 37 "__id__": 32
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 39 "__id__": 34
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1799,8 +1577,8 @@ ...@@ -1799,8 +1577,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1330, "width": 1270,
"height": 655 "height": 713
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1811,8 +1589,8 @@ ...@@ -1811,8 +1589,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, -2.297,
19.089, 64.65,
0, 0,
0, 0,
0, 0,
...@@ -1834,20 +1612,20 @@ ...@@ -1834,20 +1612,20 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "e3A0fzaCtDt7CfTAS6EjYx" "_id": "a1fuxlDv1A9I8fZov+NDmw"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 36 "__id__": 31
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 38 "__id__": 33
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1861,8 +1639,8 @@ ...@@ -1861,8 +1639,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1330, "width": 1164,
"height": 655 "height": 656
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1873,8 +1651,8 @@ ...@@ -1873,8 +1651,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 4.594,
0, 7.785,
0, 0,
0, 0,
0, 0,
...@@ -1896,14 +1674,14 @@ ...@@ -1896,14 +1674,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "c61Ekn7RpGLYou3CsmOaJJ" "_id": "ec0M1OVWhISI3y1Pg6opWv"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 37 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1928,7 +1706,167 @@ ...@@ -1928,7 +1706,167 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "a5Jq3om9hJKqYTtQ1AxapC" "_id": "51dZp1QvpKq4zryL26FPXK"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a63ca1d6-5884-4a8d-a181-f69eb0b8ae7e"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "bc9bTjYRxHybr8cfJ168a7"
},
{
"__type__": "cc.Node",
"_name": "bg_3",
"_objFlags": 0,
"_parent": {
"__id__": 26
},
"_children": [
{
"__id__": 36
}
],
"_active": false,
"_components": [
{
"__id__": 38
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1372,
"height": 685
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-2.297,
77.923,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "7ecnOJsSpASo17kRgv3auc"
},
{
"__type__": "cc.Node",
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 35
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 37
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1246,
"height": 624
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
2.297,
6.85,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "034RjjfmRFcK49wd+UI4Q0"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -1937,6 +1875,70 @@ ...@@ -1937,6 +1875,70 @@
"node": { "node": {
"__id__": 36 "__id__": 36
}, },
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "49HzfSlfpMYJzTDNUn+X3+"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a4fb18b1-2944-4f15-a54b-79ca52fb9cf1"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "e1vlKw8BNPhLDdAkGI7+Id"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
},
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
{ {
...@@ -1967,7 +1969,7 @@ ...@@ -1967,7 +1969,7 @@
"_name": "item_little", "_name": "item_little",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 22
}, },
"_children": [ "_children": [
{ {
...@@ -2003,8 +2005,8 @@ ...@@ -2003,8 +2005,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
1391.687, -1818.156,
19.089, 27,
0, 0,
0, 0,
0, 0,
...@@ -2159,7 +2161,7 @@ ...@@ -2159,7 +2161,7 @@
"_name": "bg_number", "_name": "bg_number",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 22
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -2192,7 +2194,7 @@ ...@@ -2192,7 +2194,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-69.389, -69.389,
381.257, 482.528,
0, 0,
0, 0,
0, 0,
...@@ -2253,7 +2255,7 @@ ...@@ -2253,7 +2255,7 @@
"_name": "label_round", "_name": "label_round",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 22
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -2286,7 +2288,7 @@ ...@@ -2286,7 +2288,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-75.191, -75.191,
381.754, 483.025,
0, 0,
0, 0,
0, 0,
...@@ -2348,7 +2350,7 @@ ...@@ -2348,7 +2350,7 @@
"_name": "label_title", "_name": "label_title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 22
}, },
"_children": [ "_children": [
{ {
...@@ -2381,7 +2383,7 @@ ...@@ -2381,7 +2383,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-406.981, -305.71,
0, 0,
0, 0,
0, 0,
...@@ -2456,7 +2458,7 @@ ...@@ -2456,7 +2458,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
63.406000000000006, 63.406000000000006,
786.929, 784.412,
0, 0,
0, 0,
0, 0,
...@@ -2687,7 +2689,7 @@ ...@@ -2687,7 +2689,7 @@
"__id__": 57 "__id__": 57
} }
], ],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 59
...@@ -2976,7 +2978,7 @@ ...@@ -2976,7 +2978,7 @@
"__id__": 63 "__id__": 63
} }
], ],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 65 "__id__": 65
...@@ -3292,7 +3294,7 @@ ...@@ -3292,7 +3294,7 @@
"_name": "btn_last", "_name": "btn_last",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 22
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -3331,7 +3333,7 @@ ...@@ -3331,7 +3333,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-835, -835,
0, 123,
0, 0,
0, 0,
0, 0,
...@@ -3487,7 +3489,7 @@ ...@@ -3487,7 +3489,7 @@
"_name": "btn_next", "_name": "btn_next",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 22
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -3526,7 +3528,7 @@ ...@@ -3526,7 +3528,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
835, 835,
0, 123,
0, 0,
0, 0,
0, 0,
...@@ -3682,7 +3684,7 @@ ...@@ -3682,7 +3684,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 26 "__id__": 22
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -3714,21 +3716,12 @@ ...@@ -3714,21 +3716,12 @@
"_children": [ "_children": [
{ {
"__id__": 78 "__id__": 78
},
{
"__id__": 93
},
{
"__id__": 95
},
{
"__id__": 97
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 103
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3794,7 +3787,7 @@ ...@@ -3794,7 +3787,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 92 "__id__": 102
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3857,16 +3850,16 @@ ...@@ -3857,16 +3850,16 @@
"__id__": 80 "__id__": 80
}, },
{ {
"__id__": 82 "__id__": 90
}, },
{ {
"__id__": 89 "__id__": 94
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 91 "__id__": 101
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3880,7 +3873,7 @@ ...@@ -3880,7 +3873,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 300, "width": 200,
"height": 400 "height": 400
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -3892,7 +3885,7 @@ ...@@ -3892,7 +3885,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
66.012, -9.658,
-127.966, -127.966,
0, 0,
0, 0,
...@@ -3919,16 +3912,20 @@ ...@@ -3919,16 +3912,20 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "p1", "_name": "mask",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 79
}, },
"_children": [], "_children": [
{
"__id__": 81
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 81 "__id__": 89
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3942,20 +3939,20 @@ ...@@ -3942,20 +3939,20 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 187, "width": 350,
"height": 191 "height": 200
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5, "x": 0,
"y": 0.5 "y": 0.5
}, },
"_trs": { "_trs": {
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-69, -5.08,
53, 52.6,
0, 0,
0, 0,
0, 0,
...@@ -3977,50 +3974,18 @@ ...@@ -3977,50 +3974,18 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "40i0XmOhxAt4MEZracszf8" "_id": "5eH7+6945AsZD4kvCmI2Jo"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "49ca0e50-030e-4c6e-a6a1-dd379cbca6e2"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "49k0aHrO1BPIf1zVqh/uPt"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img_voice", "_name": "layout_btns",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 80
}, },
"_children": [ "_children": [
{ {
"__id__": 83 "__id__": 82
}, },
{ {
"__id__": 84 "__id__": 84
...@@ -4046,8 +4011,8 @@ ...@@ -4046,8 +4011,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 30, "width": 316,
"height": 30 "height": 187
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4058,8 +4023,8 @@ ...@@ -4058,8 +4023,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-47.116, -160,
145.815, 0,
0, 0,
0, 0,
0, 0,
...@@ -4081,18 +4046,22 @@ ...@@ -4081,18 +4046,22 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "fc6RU9nARLYZ4VygyGq3Bt" "_id": "2b3uhy2ZpAlZ5a6zZ2zaVn"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "p1", "_name": "btn_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 82 "__id__": 81
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [], "_components": [
{
"__id__": 83
}
],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4104,8 +4073,8 @@ ...@@ -4104,8 +4073,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 42, "width": 106,
"height": 23 "height": 82
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4116,8 +4085,8 @@ ...@@ -4116,8 +4085,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
6.655, 33.928,
12.21, 0,
0, 0,
0, 0,
0, 0,
...@@ -4139,17 +4108,49 @@ ...@@ -4139,17 +4108,49 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "dfkybMM+BIPYdE7RrCQmLy" "_id": "f4a0Ef0Z1DNZwwTPGrKWFC"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "f4547c38-0ea1-468b-b8aa-fcc55fc6ce4c"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "becdnPjp5HLZ9I5ZkDAfQ1"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "p2", "_name": "btn_play",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 82 "__id__": 81
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 85 "__id__": 85
...@@ -4166,8 +4167,8 @@ ...@@ -4166,8 +4167,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 42, "width": 77,
"height": 23 "height": 84
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4178,8 +4179,8 @@ ...@@ -4178,8 +4179,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
4.569, 33.928,
12.21, 0,
0, 0,
0, 0,
0, 0,
...@@ -4201,7 +4202,7 @@ ...@@ -4201,7 +4202,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "c1ctCl8yBFwqF6yO45DFx9" "_id": "a9Ijl3nqlKXJGhiVOFpyX1"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -4219,7 +4220,7 @@ ...@@ -4219,7 +4220,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "0ae356d1-a198-4b35-bb0e-82f49b539b36" "__uuid__": "8292d102-bb55-4479-8fd7-6334f1ca51e8"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4233,17 +4234,17 @@ ...@@ -4233,17 +4234,17 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "0e354ERXlJcZdpkMrgBUN1" "_id": "a4OkOP4BlPo4DNrUFZKTej"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "p3", "_name": "btn_stop",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 82 "__id__": 81
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 87 "__id__": 87
...@@ -4260,8 +4261,8 @@ ...@@ -4260,8 +4261,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 59, "width": 88,
"height": 47 "height": 86
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4272,8 +4273,8 @@ ...@@ -4272,8 +4273,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
8.063, 33.928,
24.344, 0,
0, 0,
0, 0,
0, 0,
...@@ -4295,7 +4296,7 @@ ...@@ -4295,7 +4296,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "2696cwne5IrIc1WjvIWS4H" "_id": "91j9K2pa5JrZkKtp2yggGf"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -4313,7 +4314,7 @@ ...@@ -4313,7 +4314,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "2e09d276-5660-400d-a7d8-516e0b958870" "__uuid__": "810e4b16-1beb-4bd9-a700-71e244d7f9a8"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4327,30 +4328,138 @@ ...@@ -4327,30 +4328,138 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "57E1+x3TdG5YAXCv+8iMCV" "_id": "1bKVIYi2VKzJe+R1twAYeE"
}, },
{ {
"__type__": "bbdca8pYpRNDq6TTkfAK9cA", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 82 "__id__": 81
}, },
"_enabled": true, "_enabled": true,
"_id": "1b37Xp6IVLg6RciXLxM7OU" "_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "3700f0c8-fae1-4af8-be4c-7d9c1e50ce47"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "0fbtt7dFlF+oQ/0+nGSJmS"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_spriteFrame": null,
"_type": 0,
"_segments": 64,
"_N$alphaThreshold": 0.1,
"_N$inverted": false,
"_id": "47to5rp15ChI6m++PlmOmD"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "label_time", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 79
}, },
"_children": [
{
"__id__": 91
}
],
"_active": true,
"_components": [
{
"__id__": 93
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 187,
"height": 191
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-11.989,
53,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "40i0XmOhxAt4MEZracszf8"
},
{
"__type__": "cc.Node",
"_name": "ani",
"_objFlags": 0,
"_parent": {
"__id__": 90
},
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 92
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4358,14 +4467,14 @@ ...@@ -4358,14 +4467,14 @@
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
"g": 106, "g": 255,
"b": 0, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 54.5, "width": 205.95685028701524,
"height": 112.14 "height": 204
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4376,8 +4485,8 @@ ...@@ -4376,8 +4485,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-36.218, 42.049,
65.83, -30.196,
0, 0,
0, 0,
0, 0,
...@@ -4399,14 +4508,14 @@ ...@@ -4399,14 +4508,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "24GdOSuk5GJJMEF9STHgPY" "_id": "b3XMESkg5FA52GRGxr3xaT"
}, },
{ {
"__type__": "cc.Label", "__type__": "dragonBones.ArmatureDisplay",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4414,92 +4523,87 @@ ...@@ -4414,92 +4523,87 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_armatureName": "Armature",
"_dstBlendFactor": 771, "_animationName": "newAnimation",
"_string": "5", "_preCacheMode": 0,
"_N$string": "5", "_cacheMode": 0,
"_fontSize": 98, "playTimes": -1,
"_lineHeight": 89, "premultipliedAlpha": false,
"_enableWrapText": true, "_armatureKey": "1594c645-2b30-46a0-9be0-2f23242866d6#16f8a132-c440-452c-a5bc-d451e5d8a200",
"_N$file": null, "_accTime": 0,
"_isSystemFontUsed": true, "_playCount": 0,
"_spacingX": 0, "_frameCache": null,
"_batchAsBitmap": false, "_curFrame": null,
"_styleFlags": 0, "_playing": false,
"_underlineHeight": 0, "_armatureCache": null,
"_N$horizontalAlign": 1, "_N$dragonAsset": {
"_N$verticalAlign": 1, "__uuid__": "1594c645-2b30-46a0-9be0-2f23242866d6"
"_N$fontFamily": "Arial", },
"_N$overflow": 0, "_N$dragonAtlasAsset": {
"_N$cacheMode": 0, "__uuid__": "16f8a132-c440-452c-a5bc-d451e5d8a200"
"_id": "8bFgHpXDxN/Zls/c1MQgjK" },
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "d4+y3SH21BnIUihQoB7w/n"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 79 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "_materials": [
"_target": null,
"_alignFlags": 8,
"_left": 66.012,
"_right": 0,
"_top": 938.845,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "1d1+0Jm+FIbqavL7ymoCxE"
},
{ {
"__type__": "cc.Widget", "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
"_name": "", }
"_objFlags": 0, ],
"node": { "_srcBlendFactor": 770,
"__id__": 78 "_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "49ca0e50-030e-4c6e-a6a1-dd379cbca6e2"
}, },
"_enabled": true, "_type": 0,
"alignMode": 1, "_sizeMode": 1,
"_target": null, "_fillType": 0,
"_alignFlags": 12, "_fillCenter": {
"_left": 0, "__type__": "cc.Vec2",
"_right": 0, "x": 0,
"_top": 0, "y": 0
"_bottom": 0, },
"_verticalCenter": 0, "_fillStart": 0,
"_horizontalCenter": 0, "_fillRange": 0,
"_isAbsLeft": true, "_isTrimmedMode": true,
"_isAbsRight": true, "_atlas": null,
"_isAbsTop": true, "_id": "49k0aHrO1BPIf1zVqh/uPt"
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 300,
"_originalHeight": 0,
"_id": "cdmzl6xOlBL7F8q5YZehyk"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "btn_recorddone", "_name": "img_voice",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 77 "__id__": 79
}, },
"_children": [], "_children": [
"_active": true, {
"__id__": 95
},
{
"__id__": 96
},
{
"__id__": 98
}
],
"_active": false,
"_components": [ "_components": [
{ {
"__id__": 94 "__id__": 100
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4513,8 +4617,8 @@ ...@@ -4513,8 +4617,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 106, "width": 30,
"height": 82 "height": 30
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4525,8 +4629,8 @@ ...@@ -4525,8 +4629,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-1278.176, 9.895,
-397.754, 145.815,
0, 0,
0, 0,
0, 0,
...@@ -4548,52 +4652,78 @@ ...@@ -4548,52 +4652,78 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "f4a0Ef0Z1DNZwwTPGrKWFC" "_id": "fc6RU9nARLYZ4VygyGq3Bt"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Node",
"_name": "", "_name": "p1",
"_objFlags": 0, "_objFlags": 0,
"node": { "_parent": {
"__id__": 93 "__id__": 94
}, },
"_enabled": true, "_children": [],
"_materials": [ "_active": true,
{ "_components": [],
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "_prefab": null,
} "_opacity": 255,
], "_color": {
"_srcBlendFactor": 770, "__type__": "cc.Color",
"_dstBlendFactor": 771, "r": 255,
"_spriteFrame": { "g": 255,
"__uuid__": "f4547c38-0ea1-468b-b8aa-fcc55fc6ce4c" "b": 255,
"a": 255
}, },
"_type": 0, "_contentSize": {
"_sizeMode": 1, "__type__": "cc.Size",
"_fillType": 0, "width": 42,
"_fillCenter": { "height": 23
},
"_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
6.655,
12.21,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0 "y": 0,
"z": 0
}, },
"_fillStart": 0, "_skewX": 0,
"_fillRange": 0, "_skewY": 0,
"_isTrimmedMode": true, "_is3DNode": false,
"_atlas": null, "_groupIndex": 0,
"_id": "becdnPjp5HLZ9I5ZkDAfQ1" "groupIndex": 0,
"_id": "dfkybMM+BIPYdE7RrCQmLy"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "btn_play", "_name": "p2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 77 "__id__": 94
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 97
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4607,8 +4737,8 @@ ...@@ -4607,8 +4737,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 77, "width": 42,
"height": 84 "height": 23
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4619,8 +4749,8 @@ ...@@ -4619,8 +4749,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-1376.498, 4.569,
-429.038, 12.21,
0, 0,
0, 0,
0, 0,
...@@ -4642,14 +4772,14 @@ ...@@ -4642,14 +4772,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "a9Ijl3nqlKXJGhiVOFpyX1" "_id": "c1ctCl8yBFwqF6yO45DFx9"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4660,7 +4790,7 @@ ...@@ -4660,7 +4790,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8292d102-bb55-4479-8fd7-6334f1ca51e8" "__uuid__": "0ae356d1-a198-4b35-bb0e-82f49b539b36"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4674,20 +4804,20 @@ ...@@ -4674,20 +4804,20 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "a4OkOP4BlPo4DNrUFZKTej" "_id": "0e354ERXlJcZdpkMrgBUN1"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "btn_stop", "_name": "p3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 77 "__id__": 94
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 98 "__id__": 99
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4701,8 +4831,8 @@ ...@@ -4701,8 +4831,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 88, "width": 59,
"height": 86 "height": 47
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4713,8 +4843,8 @@ ...@@ -4713,8 +4843,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-1269.238, 8.063,
-460.322, 24.344,
0, 0,
0, 0,
0, 0,
...@@ -4736,14 +4866,14 @@ ...@@ -4736,14 +4866,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "91j9K2pa5JrZkKtp2yggGf" "_id": "2696cwne5IrIc1WjvIWS4H"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 97 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4754,7 +4884,7 @@ ...@@ -4754,7 +4884,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "810e4b16-1beb-4bd9-a700-71e244d7f9a8" "__uuid__": "2e09d276-5660-400d-a7d8-516e0b958870"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4768,7 +4898,71 @@ ...@@ -4768,7 +4898,71 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "1bKVIYi2VKzJe+R1twAYeE" "_id": "57E1+x3TdG5YAXCv+8iMCV"
},
{
"__type__": "bbdca8pYpRNDq6TTkfAK9cA",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
},
"_enabled": true,
"_id": "1b37Xp6IVLg6RciXLxM7OU"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 0,
"_left": 66.012,
"_right": 0,
"_top": 938.845,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "1d1+0Jm+FIbqavL7ymoCxE"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 12,
"_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": 300,
"_originalHeight": 0,
"_id": "cdmzl6xOlBL7F8q5YZehyk"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
...@@ -4806,19 +5000,19 @@ ...@@ -4806,19 +5000,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 101 "__id__": 105
}, },
{ {
"__id__": 109 "__id__": 113
}, },
{ {
"__id__": 119 "__id__": 123
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 121 "__id__": 125
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4874,26 +5068,26 @@ ...@@ -4874,26 +5068,26 @@
"_name": "btn_auto", "_name": "btn_auto",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 104
}, },
"_children": [ "_children": [
{ {
"__id__": 102 "__id__": 106
}, },
{ {
"__id__": 104 "__id__": 108
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 106 "__id__": 110
}, },
{ {
"__id__": 107 "__id__": 111
}, },
{ {
"__id__": 108 "__id__": 112
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4949,13 +5143,13 @@ ...@@ -4949,13 +5143,13 @@
"_name": "icon_hand", "_name": "icon_hand",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 105
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 103 "__id__": 107
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5011,7 +5205,7 @@ ...@@ -5011,7 +5205,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5043,13 +5237,13 @@ ...@@ -5043,13 +5237,13 @@
"_name": "icon_auto", "_name": "icon_auto",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 105
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 105 "__id__": 109
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5105,7 +5299,7 @@ ...@@ -5105,7 +5299,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 104 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5137,7 +5331,7 @@ ...@@ -5137,7 +5331,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 105
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -5169,7 +5363,7 @@ ...@@ -5169,7 +5363,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5230,7 +5424,7 @@ ...@@ -5230,7 +5424,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 101 "__id__": 105
}, },
"_id": "51UogickFEr4hnpotYEgB+" "_id": "51UogickFEr4hnpotYEgB+"
}, },
...@@ -5239,7 +5433,7 @@ ...@@ -5239,7 +5433,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5266,20 +5460,20 @@ ...@@ -5266,20 +5460,20 @@
"_name": "layout_auto", "_name": "layout_auto",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 104
}, },
"_children": [ "_children": [
{ {
"__id__": 110 "__id__": 114
}, },
{ {
"__id__": 114 "__id__": 118
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 118 "__id__": 122
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5335,17 +5529,17 @@ ...@@ -5335,17 +5529,17 @@
"_name": "layout_unauto", "_name": "layout_unauto",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 113
}, },
"_children": [ "_children": [
{ {
"__id__": 111 "__id__": 115
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 117
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5401,13 +5595,13 @@ ...@@ -5401,13 +5595,13 @@
"_name": "New Label", "_name": "New Label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 110 "__id__": 114
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 112 "__id__": 116
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5463,7 +5657,7 @@ ...@@ -5463,7 +5657,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 111 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5496,7 +5690,7 @@ ...@@ -5496,7 +5690,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5528,17 +5722,17 @@ ...@@ -5528,17 +5722,17 @@
"_name": "layout_auto", "_name": "layout_auto",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 113
}, },
"_children": [ "_children": [
{ {
"__id__": 115 "__id__": 119
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 121
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5594,13 +5788,13 @@ ...@@ -5594,13 +5788,13 @@
"_name": "New Label", "_name": "New Label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 114 "__id__": 118
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 116 "__id__": 120
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5656,7 +5850,7 @@ ...@@ -5656,7 +5850,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 115 "__id__": 119
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5689,7 +5883,7 @@ ...@@ -5689,7 +5883,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 114 "__id__": 118
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5721,7 +5915,7 @@ ...@@ -5721,7 +5915,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 109 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5748,13 +5942,13 @@ ...@@ -5748,13 +5942,13 @@
"_name": "pos_tip", "_name": "pos_tip",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 104
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 120 "__id__": 124
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5810,7 +6004,7 @@ ...@@ -5810,7 +6004,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 119 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5837,7 +6031,7 @@ ...@@ -5837,7 +6031,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 100 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5868,25 +6062,25 @@ ...@@ -5868,25 +6062,25 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 123 "__id__": 127
}, },
{ {
"__id__": 127 "__id__": 131
}, },
{ {
"__id__": 138 "__id__": 142
}, },
{ {
"__id__": 141 "__id__": 145
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 149 "__id__": 153
}, },
{ {
"__id__": 150 "__id__": 154
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5942,19 +6136,19 @@ ...@@ -5942,19 +6136,19 @@
"_name": "gray", "_name": "gray",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 122 "__id__": 126
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 124 "__id__": 128
}, },
{ {
"__id__": 125 "__id__": 129
}, },
{ {
"__id__": 126 "__id__": 130
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6010,7 +6204,7 @@ ...@@ -6010,7 +6204,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 127
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6042,7 +6236,7 @@ ...@@ -6042,7 +6236,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 127
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6069,7 +6263,7 @@ ...@@ -6069,7 +6263,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 127
}, },
"_enabled": true, "_enabled": true,
"_id": "49KF+i84NCQb2GCqvgzSGE" "_id": "49KF+i84NCQb2GCqvgzSGE"
...@@ -6079,23 +6273,23 @@ ...@@ -6079,23 +6273,23 @@
"_name": "layout_bg", "_name": "layout_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 122 "__id__": 126
}, },
"_children": [ "_children": [
{ {
"__id__": 128 "__id__": 132
}, },
{ {
"__id__": 130 "__id__": 134
}, },
{ {
"__id__": 132 "__id__": 136
}, },
{ {
"__id__": 134 "__id__": 138
}, },
{ {
"__id__": 136 "__id__": 140
} }
], ],
"_active": true, "_active": true,
...@@ -6153,13 +6347,13 @@ ...@@ -6153,13 +6347,13 @@
"_name": "img_wrong", "_name": "img_wrong",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 127 "__id__": 131
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 129 "__id__": 133
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6215,7 +6409,7 @@ ...@@ -6215,7 +6409,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 128 "__id__": 132
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6247,13 +6441,13 @@ ...@@ -6247,13 +6441,13 @@
"_name": "img_right", "_name": "img_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 127 "__id__": 131
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 131 "__id__": 135
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6309,7 +6503,7 @@ ...@@ -6309,7 +6503,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 130 "__id__": 134
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6341,13 +6535,13 @@ ...@@ -6341,13 +6535,13 @@
"_name": "img_excellent", "_name": "img_excellent",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 127 "__id__": 131
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 133 "__id__": 137
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6403,7 +6597,7 @@ ...@@ -6403,7 +6597,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 132 "__id__": 136
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6435,13 +6629,13 @@ ...@@ -6435,13 +6629,13 @@
"_name": "img_good", "_name": "img_good",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 127 "__id__": 131
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 135 "__id__": 139
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6497,7 +6691,7 @@ ...@@ -6497,7 +6691,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 134 "__id__": 138
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6529,13 +6723,13 @@ ...@@ -6529,13 +6723,13 @@
"_name": "img_tryagain", "_name": "img_tryagain",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 127 "__id__": 131
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 137 "__id__": 141
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6591,7 +6785,7 @@ ...@@ -6591,7 +6785,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 136 "__id__": 140
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6623,16 +6817,16 @@ ...@@ -6623,16 +6817,16 @@
"_name": "btn_close", "_name": "btn_close",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 122 "__id__": 126
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 139 "__id__": 143
}, },
{ {
"__id__": 140 "__id__": 144
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6688,7 +6882,7 @@ ...@@ -6688,7 +6882,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 138 "__id__": 142
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6720,7 +6914,7 @@ ...@@ -6720,7 +6914,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 138 "__id__": 142
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -6788,23 +6982,23 @@ ...@@ -6788,23 +6982,23 @@
"_name": "label_rich", "_name": "label_rich",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 122 "__id__": 126
}, },
"_children": [ "_children": [
{ {
"__id__": 142 "__id__": 146
}, },
{ {
"__id__": 144 "__id__": 148
}, },
{ {
"__id__": 146 "__id__": 150
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 148 "__id__": 152
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6860,13 +7054,13 @@ ...@@ -6860,13 +7054,13 @@
"_name": "RICHTEXT_CHILD", "_name": "RICHTEXT_CHILD",
"_objFlags": 1024, "_objFlags": 1024,
"_parent": { "_parent": {
"__id__": 141 "__id__": 145
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 143 "__id__": 147
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6923,7 +7117,7 @@ ...@@ -6923,7 +7117,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 142 "__id__": 146
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6956,13 +7150,13 @@ ...@@ -6956,13 +7150,13 @@
"_name": "RICHTEXT_CHILD", "_name": "RICHTEXT_CHILD",
"_objFlags": 1024, "_objFlags": 1024,
"_parent": { "_parent": {
"__id__": 141 "__id__": 145
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 145 "__id__": 149
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7019,7 +7213,7 @@ ...@@ -7019,7 +7213,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 144 "__id__": 148
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7052,13 +7246,13 @@ ...@@ -7052,13 +7246,13 @@
"_name": "RICHTEXT_CHILD", "_name": "RICHTEXT_CHILD",
"_objFlags": 1024, "_objFlags": 1024,
"_parent": { "_parent": {
"__id__": 141 "__id__": 145
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 147 "__id__": 151
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7115,7 +7309,7 @@ ...@@ -7115,7 +7309,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 150
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7148,7 +7342,7 @@ ...@@ -7148,7 +7342,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 145
}, },
"_enabled": true, "_enabled": true,
"_fontFamily": "Arial", "_fontFamily": "Arial",
...@@ -7169,7 +7363,7 @@ ...@@ -7169,7 +7363,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 122 "__id__": 126
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -7196,29 +7390,29 @@ ...@@ -7196,29 +7390,29 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 122 "__id__": 126
}, },
"_enabled": true, "_enabled": true,
"img_wrong": { "img_wrong": {
"__id__": 128 "__id__": 132
}, },
"img_right": { "img_right": {
"__id__": 130 "__id__": 134
}, },
"img_excellent": { "img_excellent": {
"__id__": 132 "__id__": 136
}, },
"img_good": { "img_good": {
"__id__": 134 "__id__": 138
}, },
"img_tryagain": { "img_tryagain": {
"__id__": 136 "__id__": 140
}, },
"btn_close": { "btn_close": {
"__id__": 138 "__id__": 142
}, },
"label_rich": { "label_rich": {
"__id__": 141 "__id__": 145
}, },
"_id": "21yeiQSYNL+4fKBi8JDm4u" "_id": "21yeiQSYNL+4fKBi8JDm4u"
}, },
...@@ -7231,19 +7425,19 @@ ...@@ -7231,19 +7425,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 152 "__id__": 156
}, },
{ {
"__id__": 154 "__id__": 158
}, },
{ {
"__id__": 156 "__id__": 160
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 158 "__id__": 162
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7299,13 +7493,13 @@ ...@@ -7299,13 +7493,13 @@
"_name": "img_good", "_name": "img_good",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 151 "__id__": 155
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 153 "__id__": 157
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7361,7 +7555,7 @@ ...@@ -7361,7 +7555,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 152 "__id__": 156
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7393,13 +7587,13 @@ ...@@ -7393,13 +7587,13 @@
"_name": "img_tryagain", "_name": "img_tryagain",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 151 "__id__": 155
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 155 "__id__": 159
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7455,7 +7649,7 @@ ...@@ -7455,7 +7649,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 158
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7487,13 +7681,13 @@ ...@@ -7487,13 +7681,13 @@
"_name": "img_excellent", "_name": "img_excellent",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 151 "__id__": 155
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 157 "__id__": 161
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7549,7 +7743,7 @@ ...@@ -7549,7 +7743,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 156 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7581,7 +7775,7 @@ ...@@ -7581,7 +7775,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 151 "__id__": 155
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -7670,13 +7864,13 @@ ...@@ -7670,13 +7864,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 161 "__id__": 165
}, },
{ {
"__id__": 164 "__id__": 168
}, },
{ {
"__id__": 167 "__id__": 171
} }
], ],
"_active": false, "_active": false,
...@@ -7734,11 +7928,11 @@ ...@@ -7734,11 +7928,11 @@
"_name": "font", "_name": "font",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 160 "__id__": 164
}, },
"_children": [ "_children": [
{ {
"__id__": 162 "__id__": 166
} }
], ],
"_active": true, "_active": true,
...@@ -7796,13 +7990,13 @@ ...@@ -7796,13 +7990,13 @@
"_name": "BRLNSDB", "_name": "BRLNSDB",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 161 "__id__": 165
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 163 "__id__": 167
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7858,7 +8052,7 @@ ...@@ -7858,7 +8052,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 162 "__id__": 166
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -7889,11 +8083,11 @@ ...@@ -7889,11 +8083,11 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 160 "__id__": 164
}, },
"_children": [ "_children": [
{ {
"__id__": 165 "__id__": 169
} }
], ],
"_active": true, "_active": true,
...@@ -7951,13 +8145,13 @@ ...@@ -7951,13 +8145,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 164 "__id__": 168
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 166 "__id__": 170
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8013,7 +8207,7 @@ ...@@ -8013,7 +8207,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 165 "__id__": 169
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -8041,23 +8235,23 @@ ...@@ -8041,23 +8235,23 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 160 "__id__": 164
}, },
"_children": [ "_children": [
{ {
"__id__": 168 "__id__": 172
}, },
{ {
"__id__": 170 "__id__": 174
}, },
{ {
"__id__": 172 "__id__": 176
}, },
{ {
"__id__": 174 "__id__": 178
}, },
{ {
"__id__": 176 "__id__": 180
} }
], ],
"_active": true, "_active": true,
...@@ -8115,13 +8309,13 @@ ...@@ -8115,13 +8309,13 @@
"_name": "btn", "_name": "btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 167 "__id__": 171
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 169 "__id__": 173
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8177,7 +8371,7 @@ ...@@ -8177,7 +8371,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 168 "__id__": 172
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -8196,13 +8390,13 @@ ...@@ -8196,13 +8390,13 @@
"_name": "tip", "_name": "tip",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 167 "__id__": 171
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 171 "__id__": 175
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8258,7 +8452,7 @@ ...@@ -8258,7 +8452,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 170 "__id__": 174
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -8277,13 +8471,13 @@ ...@@ -8277,13 +8471,13 @@
"_name": "tosmall", "_name": "tosmall",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 167 "__id__": 171
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 173 "__id__": 177
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8339,7 +8533,7 @@ ...@@ -8339,7 +8533,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 172 "__id__": 176
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -8358,13 +8552,13 @@ ...@@ -8358,13 +8552,13 @@
"_name": "pagenext", "_name": "pagenext",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 167 "__id__": 171
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 175 "__id__": 179
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8420,7 +8614,7 @@ ...@@ -8420,7 +8614,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 174 "__id__": 178
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -8439,13 +8633,13 @@ ...@@ -8439,13 +8633,13 @@
"_name": "right", "_name": "right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 167 "__id__": 171
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 177 "__id__": 181
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8501,7 +8695,7 @@ ...@@ -8501,7 +8695,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 176 "__id__": 180
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -8568,40 +8762,37 @@ ...@@ -8568,40 +8762,37 @@
}, },
"_enabled": true, "_enabled": true,
"layout_item": { "layout_item": {
"__id__": 34 "__id__": 24
}, },
"layer_item": { "layer_item": {
"__id__": 36 "__id__": 26
}, },
"layer_item_little": { "layer_item_little": {
"__id__": 40 "__id__": 40
}, },
"layer_tip": { "layer_tip": {
"__id__": 122 "__id__": 126
}, },
"btn_auto": { "btn_auto": {
"__id__": 101 "__id__": 105
}, },
"layout_unauto": { "layout_unauto": {
"__id__": 110
},
"layout_auto": {
"__id__": 114 "__id__": 114
}, },
"label_time": { "layout_auto": {
"__id__": 89 "__id__": 118
}, },
"btn_record": { "btn_record": {
"__id__": 79 "__id__": 79
}, },
"item_ani": { "item_ani": {
"__id__": 151 "__id__": 155
}, },
"layout_ani": { "layout_ani": {
"__id__": 159 "__id__": 163
}, },
"pos_tip": { "pos_tip": {
"__id__": 119 "__id__": 123
}, },
"label_round": { "label_round": {
"__id__": 46 "__id__": 46
......
...@@ -103,6 +103,15 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -103,6 +103,15 @@ export default class SceneComponent extends MyCocosSceneComponent {
pg.view.touchOn(this.btn_last, this.preLayer, this); pg.view.touchOn(this.btn_last, this.preLayer, this);
pg.view.touchOn(this.btn_next, this.nextLayer, this); pg.view.touchOn(this.btn_next, this.nextLayer, this);
pg.view.touchOn(this.btn_voice, this.onTouchVoice, this); pg.view.touchOn(this.btn_voice, this.onTouchVoice, this);
pg.view.touchOn(this.btn_record, this.onTouchRecord, this);
let layout_btns = pg.view.find(this.btn_record, "mask/layout_btns");
let btn_right = pg.view.find(layout_btns, 'btn_right')
let btn_play = pg.view.find(layout_btns, 'btn_play')
let btn_stop = pg.view.find(layout_btns, 'btn_stop')
pg.view.touchOn(btn_right, this.onTouchRecordRight, this);
pg.view.touchOn(btn_play, this.onTouchRecordPlay, this);
pg.view.touchOn(btn_stop, this.onTouchRecordStop, this);
} }
private get LastData() { private get LastData() {
...@@ -161,7 +170,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -161,7 +170,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.letter = this.CurrentData.content; this.letter = this.CurrentData.content;
this.targetTime = this.CurrentData.duration; this.targetTime = this.CurrentData.duration;
this.scheduleOnce(() => { this.scheduleOnce(() => {
this.onTouchRecord(); this.showRecordWait();
}, 1) }, 1)
}, (audioId) => { }, (audioId) => {
this.currentAudioId = audioId; this.currentAudioId = audioId;
...@@ -203,8 +212,6 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -203,8 +212,6 @@ export default class SceneComponent extends MyCocosSceneComponent {
update() { update() {
if (!this.list) return; if (!this.list) return;
this.updateBtns(); this.updateBtns();
// this.updateCountdown(dt);
this.showTimeUpdate();
} }
//--------------------------------Record----------------------------- //--------------------------------Record-----------------------------
private letter: string; private letter: string;
...@@ -215,50 +222,68 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -215,50 +222,68 @@ export default class SceneComponent extends MyCocosSceneComponent {
private microPhoneChange: boolean; private microPhoneChange: boolean;
@property(cc.Node)
public label_time: cc.Node = null;
@property(cc.Node) @property(cc.Node)
public btn_record: cc.Node = null; public btn_record: cc.Node = null;
showTimeStart() { log(str) {
if (!this.targetTime) return; const node = cc.find('middleLayer');
let nowTime = new Date().getTime(); if (node) {
this.startTime = nowTime; node.getComponent('middleLayer').log(str);
} else {
console.log(str);
}
} }
showTimeUpdate() {
if (!this.startTime) return;
let nowTime = new Date().getTime();
let subTime = this.targetTime - (nowTime - this.startTime) / 1000 + 1;
if (subTime < 0) subTime = 0;
pg.view.setString(this.label_time, `${Math.floor(subTime)}`) // 展示点击效果
if (subTime == 0) { async showRecordWait() {
this.onTouchRecordEnd(false); pg.view.find(this.btn_record, 'bg/ani').active = true;
} }
async showRecordWaitEnd() {
pg.view.find(this.btn_record, 'bg/ani').active = false;
} }
showTimeEnd() {
this.startTime = null;
async showRecordIng() {
let img_voice = pg.view.find(this.btn_record, "img_voice");
img_voice.active = true;
img_voice.getComponent(ImgAuto).playVoiceStart();
// 按钮区域显示 显示对应的对错
let layout_btns = pg.view.find(this.btn_record, "mask/layout_btns");
layout_btns.x = -160
cc.tween(layout_btns).to(0.5, { x: 160 }).start();
let btn_right = pg.view.find(layout_btns, 'btn_right')
let btn_play = pg.view.find(layout_btns, 'btn_play')
let btn_stop = pg.view.find(layout_btns, 'btn_stop')
btn_right.active = true;
btn_play.active = false;
btn_stop.active = false;
} }
showVoiceFlash() { async showRecordEnd() {
pg.view.visible(this.btn_record, true) let img_voice = pg.view.find(this.btn_record, "img_voice");
this.btn_record.y = -550; img_voice.active = false;
cc.tween(this.btn_record).to(0.3, { y: 0 }).start(); img_voice.getComponent(ImgAuto).playVoiceEnd();
let com = this.btn_record.getChildByName("img_voice").getComponent(ImgAuto); // 按钮区域显示
com.playVoiceStart(); let layout_btns = pg.view.find(this.btn_record, "mask/layout_btns");
let btn_right = pg.view.find(layout_btns, 'btn_right')
let btn_play = pg.view.find(layout_btns, 'btn_play')
let btn_stop = pg.view.find(layout_btns, 'btn_stop')
btn_right.active = false;
btn_play.active = false;
btn_stop.active = false;
} }
hideVoiceFlash() {
pg.view.visible(this.btn_record, false) // 停止录音
let com = this.btn_record.getChildByName("img_voice").getComponent(ImgAuto); onTouchRecordRight() {
com.playVoiceEnd(); this.onTouchRecordEnd(false);
} }
// 停止播放录音
onTouchRecordStop() {
log(str) {
const node = cc.find('middleLayer');
if (node) {
node.getComponent('middleLayer').log(str);
} else {
console.log(str);
} }
// 手动播放录音
onTouchRecordPlay() {
} }
//按钮触发,使用的方法 //按钮触发,使用的方法
...@@ -268,8 +293,8 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -268,8 +293,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.recording = true; this.recording = true;
this.recordAudio = ''; this.recordAudio = '';
this.voiceTouchForbid = true; this.voiceTouchForbid = true;
this.showTimeStart(); this.showRecordWaitEnd();
this.showVoiceFlash(); this.showRecordIng();
this.log("-----------------------startTest") this.log("-----------------------startTest")
cc.audioEngine.stopAllEffects(); cc.audioEngine.stopAllEffects();
...@@ -277,8 +302,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -277,8 +302,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
async onTouchRecordEnd(isClear) { async onTouchRecordEnd(isClear) {
if (!this.recording) return; if (!this.recording) return;
this.showTimeEnd(); this.showRecordEnd();
this.hideVoiceFlash();
let testData = { let testData = {
"audioUrl": "https://staging-teach.cdn.ireadabc.com/bea0ba87bcf8bc09815f34b4790ffac9.mp3", "audioUrl": "https://staging-teach.cdn.ireadabc.com/bea0ba87bcf8bc09815f34b4790ffac9.mp3",
"eof": 1, "file": "/storage/emulated/0/Android/data/com.example.oxford/cache/shengtong/gradeVoice.mp3", "eof": 1, "file": "/storage/emulated/0/Android/data/com.example.oxford/cache/shengtong/gradeVoice.mp3",
...@@ -313,7 +337,6 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -313,7 +337,6 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
async recrodEnd(isClear, data) { async recrodEnd(isClear, data) {
this.voiceTouchForbid = false; this.voiceTouchForbid = false;
this.hideVoiceFlash();
let score = data.result.overall; let score = data.result.overall;
this.log("---------------recrodEnd score:" + score) this.log("---------------recrodEnd score:" + score)
this.recording = false; this.recording = false;
...@@ -508,6 +531,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -508,6 +531,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
createLayer() { createLayer() {
this.layer_item.active = false;
let layer = pg.view.clone(this.layer_item); let layer = pg.view.clone(this.layer_item);
layer.active = true; layer.active = true;
this.layout_item.addChild(layer) this.layout_item.addChild(layer)
...@@ -534,11 +558,28 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -534,11 +558,28 @@ export default class SceneComponent extends MyCocosSceneComponent {
public btn_voice: cc.Node = null; public btn_voice: cc.Node = null;
updateLayer(layer, data) { updateLayer(layer, data) {
// 根据数据来渲染 // 根据数据来渲染
let img = pg.view.find(layer, 'img'); let itemBg1 = pg.view.find(layer, 'bg_1')
let itemBg2 = pg.view.find(layer, 'bg_2')
let itemBg3 = pg.view.find(layer, 'bg_3')
let item = null;
let wh = [];
if (data.imageBig == 1) {
item = itemBg1;
wh = [960, 720]
} else if (data.imageBig == 2) {
item = itemBg2;
wh = [1164, 656]
} else {
item = itemBg3;
wh = [1246, 624]
}
itemBg1.active = false;
itemBg2.active = false;
itemBg3.active = false;
item.active = true;
let img = pg.view.find(item, 'img');
img.active = true; img.active = true;
// 需要根据图片设定的类型来动态的识别对应的图片大小 和不同的背景图 pg.view.setNetImg(img, data.image, { w: wh[0], h: wh[1] })
pg.view.setNetImg(img, data.image, { w: 1330, h: 655 })
} }
onTouchVoice(e) { onTouchVoice(e) {
......
...@@ -17,12 +17,14 @@ export const defaultData = ...@@ -17,12 +17,14 @@ export const defaultData =
"duration": 5, "duration": 5,
"content": "yes,It is Annie's apple tree.", "content": "yes,It is Annie's apple tree.",
"right": false, "right": false,
"imageBig": 1, "imageBig": 3,
"audioName": "btn_hy01_danci.mp3" "audioName": "btn_hy01_danci.mp3"
}, { }, {
"type": "img_txt_audio", "image": "http://staging-teach.cdn.ireadabc.com/befdc1801d93fd95b3a8ee7c7a2d2d05.png", "audio": "http://staging-teach.cdn.ireadabc.com/43839adb578c7e01456748b8a176a0c3_l.mp3", "text": "clound in air", "duration": 10, "content": "clound is cloud", "right": false, "audioName": "敲碎蛋的声音.mp3", "imageBig": 2 "type": "img_txt_audio",
"image": "http://staging-teach.cdn.ireadabc.com/befdc1801d93fd95b3a8ee7c7a2d2d05.png", "audio": "http://staging-teach.cdn.ireadabc.com/43839adb578c7e01456748b8a176a0c3_l.mp3", "text": "clound in air", "duration": 10,
"content": "clound is cloud", "right": false, "audioName": "敲碎蛋的声音.mp3", "imageBig": 2
}, { }, {
"type": "img_txt_audio", "imageBig": 3, "image": "http://staging-teach.cdn.ireadabc.com/ef1e6f871b37ad482e268809e91d20b7.png", "audio": "http://staging-teach.cdn.ireadabc.com/5f4e4c72671607bb35d1ecd1d291f238_l.mp3", "text": "", "duration": 10, "content": "", "right": false, "audioName": "excellent_dg10_ty.mp3" "type": "img_txt_audio", "imageBig": 1, "image": "http://staging-teach.cdn.ireadabc.com/ef1e6f871b37ad482e268809e91d20b7.png", "audio": "http://staging-teach.cdn.ireadabc.com/5f4e4c72671607bb35d1ecd1d291f238_l.mp3", "text": "", "duration": 10, "content": "", "right": false, "audioName": "excellent_dg10_ty.mp3"
}] }]
}], }],
"bgAudio": "", "bgAudioName": "", "audioName": "", "npcTitle": "test", "bgAudio": "", "bgAudioName": "", "audioName": "", "npcTitle": "test",
......
...@@ -125,13 +125,13 @@ ...@@ -125,13 +125,13 @@
<div style="margin-top: 5px;"> <div style="margin-top: 5px;">
<nz-radio-group [(ngModel)]="option.imageBig" (ngModelChange)="ngChange(i,j)"> <nz-radio-group [(ngModel)]="option.imageBig" (ngModelChange)="ngChange(i,j)">
<label nz-radio [nzValue]="1"> <label nz-radio [nzValue]="1">
<span [style]="{color:option.imageBig== 1 ? '#169BD5':'#000'}">大图片</span> <span [style]="{color:option.imageBig== 3 ? '#169BD5':'#000'}">大图片</span>
</label> </label>
<label nz-radio [nzValue]="2"> <label nz-radio [nzValue]="2">
<span [style]="{color:option.imageBig== 2 ? '#169BD5':'#000'}">中图片</span> <span [style]="{color:option.imageBig== 2 ? '#169BD5':'#000'}">中图片</span>
</label> </label>
<label nz-radio [nzValue]="3"> <label nz-radio [nzValue]="3">
<span [style]="{color:option.imageBig== 3 ? '#169BD5':'#000'}">小图片</span> <span [style]="{color:option.imageBig== 1 ? '#169BD5':'#000'}">小图片</span>
</label> </label>
</nz-radio-group> </nz-radio-group>
</div> </div>
......
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