Commit e5fd1484 authored by Tt's avatar Tt

上传修改内容

parent ae5fa172
......@@ -81,31 +81,34 @@
"__id__": 9
},
{
"__id__": 23
"__id__": 11
},
{
"__id__": 59
"__id__": 25
},
{
"__id__": 68
"__id__": 61
},
{
"__id__": 70
},
{
"__id__": 90
"__id__": 72
},
{
"__id__": 92
}
],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 112
},
{
"__id__": 111
"__id__": 113
},
{
"__id__": 112
"__id__": 114
}
],
"_prefab": null,
......@@ -256,7 +259,7 @@
},
{
"__type__": "cc.Node",
"_name": "video_node",
"_name": "video_canvas",
"_objFlags": 0,
"_parent": {
"__id__": 2
......@@ -279,8 +282,97 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1920,
"height": 1080
"width": 0,
"height": 0
},
"_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": "e1tZOr9ztF9q7NWJebrQCR"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 45,
"_left": 960,
"_right": 960,
"_top": 540,
"_bottom": 540,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "8dZzMZjEhGaIHJ9FEuUrjj"
},
{
"__type__": "cc.Node",
"_name": "video_node",
"_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": 200,
"height": 200
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -321,7 +413,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
"__id__": 7
},
"_enabled": true,
"_resourceType": 0,
......@@ -347,7 +439,7 @@
"_active": true,
"_components": [
{
"__id__": 8
"__id__": 10
}
],
"_prefab": null,
......@@ -403,7 +495,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
"__id__": 9
},
"_enabled": true,
"_materials": [
......@@ -439,25 +531,25 @@
},
"_children": [
{
"__id__": 10
"__id__": 12
},
{
"__id__": 13
"__id__": 15
},
{
"__id__": 16
"__id__": 18
},
{
"__id__": 18
"__id__": 20
}
],
"_active": true,
"_components": [
{
"__id__": 21
"__id__": 23
},
{
"__id__": 22
"__id__": 24
}
],
"_prefab": null,
......@@ -513,16 +605,16 @@
"_name": "bg_flood",
"_objFlags": 0,
"_parent": {
"__id__": 9
"__id__": 11
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 11
"__id__": 13
},
{
"__id__": 12
"__id__": 14
}
],
"_prefab": null,
......@@ -578,7 +670,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 10
"__id__": 12
},
"_enabled": true,
"_materials": [
......@@ -610,7 +702,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 10
"__id__": 12
},
"_enabled": true,
"alignMode": 1,
......@@ -637,16 +729,16 @@
"_name": "img_pic",
"_objFlags": 0,
"_parent": {
"__id__": 9
"__id__": 11
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 14
"__id__": 16
},
{
"__id__": 15
"__id__": 17
}
],
"_prefab": null,
......@@ -702,7 +794,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
"__id__": 15
},
"_enabled": true,
"_materials": [
......@@ -734,7 +826,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
"__id__": 15
},
"_enabled": true,
"alignMode": 1,
......@@ -761,13 +853,13 @@
"_name": "img_vase",
"_objFlags": 0,
"_parent": {
"__id__": 9
"__id__": 11
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 17
"__id__": 19
}
],
"_prefab": null,
......@@ -823,7 +915,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 18
},
"_enabled": true,
"_materials": [
......@@ -855,16 +947,16 @@
"_name": "bg_wall",
"_objFlags": 0,
"_parent": {
"__id__": 9
"__id__": 11
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 19
"__id__": 21
},
{
"__id__": 20
"__id__": 22
}
],
"_prefab": null,
......@@ -920,7 +1012,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 20
},
"_enabled": true,
"_materials": [
......@@ -952,12 +1044,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 20
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_alignFlags": 0,
"_left": 0,
"_right": 0,
"_top": 0,
......@@ -979,7 +1071,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 9
"__id__": 11
},
"_enabled": true,
"_materials": [
......@@ -1011,7 +1103,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 9
"__id__": 11
},
"_enabled": true,
"alignMode": 1,
......@@ -1041,26 +1133,26 @@
"__id__": 2
},
"_children": [
{
"__id__": 24
},
{
"__id__": 26
},
{
"__id__": 30
"__id__": 28
},
{
"__id__": 32
},
{
"__id__": 34
},
{
"__id__": 36
}
],
"_active": true,
"_components": [
{
"__id__": 58
"__id__": 60
}
],
"_prefab": null,
......@@ -1116,13 +1208,13 @@
"_name": "question_img",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 25
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 27
}
],
"_prefab": null,
......@@ -1178,7 +1270,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 26
},
"_enabled": true,
"_materials": [
......@@ -1210,17 +1302,17 @@
"_name": "img_kuang",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 25
},
"_children": [
{
"__id__": 27
"__id__": 29
}
],
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 31
}
],
"_prefab": null,
......@@ -1276,13 +1368,13 @@
"_name": "img_deng",
"_objFlags": 0,
"_parent": {
"__id__": 26
"__id__": 28
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 28
"__id__": 30
}
],
"_prefab": null,
......@@ -1338,7 +1430,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 29
},
"_enabled": true,
"_materials": [
......@@ -1370,7 +1462,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
"__id__": 28
},
"_enabled": true,
"_materials": [
......@@ -1402,13 +1494,13 @@
"_name": "label_title",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 25
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 31
"__id__": 33
}
],
"_prefab": null,
......@@ -1464,7 +1556,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
"__id__": 32
},
"_enabled": true,
"_materials": [
......@@ -1497,13 +1589,13 @@
"_name": "img_question",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 25
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 35
}
],
"_prefab": null,
......@@ -1559,7 +1651,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 34
},
"_enabled": true,
"_materials": [
......@@ -1591,29 +1683,32 @@
"_name": "layout_record",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 25
},
"_children": [
{
"__id__": 35
"__id__": 37
},
{
"__id__": 40
"__id__": 42
},
{
"__id__": 47
"__id__": 44
},
{
"__id__": 49
},
{
"__id__": 51
},
{
"__id__": 53
}
],
"_active": true,
"_components": [
{
"__id__": 57
"__id__": 59
}
],
"_prefab": null,
......@@ -1669,14 +1764,14 @@
"_name": "btn_restart",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 36
},
"_children": [
{
"__id__": 36
"__id__": 38
},
{
"__id__": 38
"__id__": 40
}
],
"_active": true,
......@@ -1734,13 +1829,13 @@
"_name": "btn_restart",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 37
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 37
"__id__": 39
}
],
"_prefab": null,
......@@ -1796,7 +1891,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 38
},
"_enabled": true,
"_materials": [
......@@ -1828,13 +1923,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 37
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 41
}
],
"_prefab": null,
......@@ -1890,7 +1985,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 40
},
"_enabled": true,
"_materials": [
......@@ -1923,20 +2018,13 @@
"_name": "btn_vioce",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 36
},
"_children": [
{
"__id__": 41
},
{
"__id__": 43
}
],
"_children": [],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 43
}
],
"_prefab": null,
......@@ -1962,7 +2050,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
4.483,
-7.608,
6.845,
0,
0,
......@@ -1987,20 +2075,55 @@
"groupIndex": 0,
"_id": "a0YV9WCMlB1J1qpWj+U3Mh"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "b3bc5756-e154-4507-9714-45cf77779e85"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "c3VF+UD2lGcI/uuaRRfA63"
},
{
"__type__": "cc.Node",
"_name": "img_stop",
"_name": "btn_vioce_ing",
"_objFlags": 0,
"_parent": {
"__id__": 40
"__id__": 36
},
"_children": [],
"_active": true,
"_components": [
"_children": [
{
"__id__": 42
"__id__": 45
},
{
"__id__": 47
}
],
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -2024,8 +2147,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
-7.608,
6.845,
0,
0,
0,
......@@ -2047,55 +2170,20 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "17/46LsZtKSYAPICbCA2w0"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "ea97ca79-6d89-4d8c-9429-98e79cc60cb8"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "0amy1XdOdK15Jb9/ZdSOyb"
"_id": "2b44IpzPJNfJ86RsckHs5b"
},
{
"__type__": "cc.Node",
"_name": "img_ing",
"_name": "img_stop",
"_objFlags": 0,
"_parent": {
"__id__": 40
"__id__": 44
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 44
},
{
"__id__": 45
"__id__": 46
}
],
"_prefab": null,
......@@ -2121,8 +2209,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0.182,
-0.09,
0,
0,
0,
0,
0,
......@@ -2144,14 +2232,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "de4+F7BwtAt5ow6WrgwyjM"
"_id": "efSmW8Nh9P54FKDDXNUKBu"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 45
},
"_enabled": true,
"_materials": [
......@@ -2162,98 +2250,90 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "51c85556-93eb-4774-8d44-0c6bbf044bda"
"__uuid__": "ea97ca79-6d89-4d8c-9429-98e79cc60cb8"
},
"_type": 3,
"_sizeMode": 0,
"_fillType": 2,
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
"x": 0,
"y": 0
},
"_fillStart": 0.25,
"_fillRange": 1,
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "85HncTZY5AToqFa9LwH7//"
"_id": "97HTzwsslJ/KABJ6HRbvcp"
},
{
"__type__": "cc.Button",
"_name": "",
"__type__": "cc.Node",
"_name": "img_ing",
"_objFlags": 0,
"node": {
"__id__": 43
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
"_parent": {
"__id__": 44
},
"hoverColor": {
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
"_contentSize": {
"__type__": "cc.Size",
"width": 158,
"height": 158
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0.182,
-0.09,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 43
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": "ecrPqC/gZDobH2MQs86M5z"
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "b3Anh/LAJMboIYhyci4U+7"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 47
},
"_enabled": true,
"_materials": [
......@@ -2264,34 +2344,34 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "b3bc5756-e154-4507-9714-45cf77779e85"
"__uuid__": "51c85556-93eb-4774-8d44-0c6bbf044bda"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_type": 3,
"_sizeMode": 0,
"_fillType": 2,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
"x": 0.5,
"y": 0.5
},
"_fillStart": 0,
"_fillRange": 0,
"_fillStart": 0.25,
"_fillRange": 1,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "c3VF+UD2lGcI/uuaRRfA63"
"_id": "96JDCvTaZET7rtQctmLvAu"
},
{
"__type__": "cc.Node",
"_name": "label_tip_wait",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 36
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 48
"__id__": 50
}
],
"_prefab": null,
......@@ -2347,7 +2427,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -2380,13 +2460,13 @@
"_name": "label_tip_ing",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 36
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 50
"__id__": 52
}
],
"_prefab": null,
......@@ -2442,7 +2522,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2475,20 +2555,20 @@
"_name": "rich_content",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 36
},
"_children": [
{
"__id__": 52
"__id__": 54
},
{
"__id__": 54
"__id__": 56
}
],
"_active": false,
"_components": [
{
"__id__": 56
"__id__": 58
}
],
"_prefab": null,
......@@ -2544,13 +2624,13 @@
"_name": "RICHTEXT_CHILD",
"_objFlags": 1024,
"_parent": {
"__id__": 51
"__id__": 53
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 53
"__id__": 55
}
],
"_prefab": null,
......@@ -2607,7 +2687,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 54
},
"_enabled": true,
"_materials": [
......@@ -2640,13 +2720,13 @@
"_name": "RICHTEXT_CHILD",
"_objFlags": 1024,
"_parent": {
"__id__": 51
"__id__": 53
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 55
"__id__": 57
}
],
"_prefab": null,
......@@ -2703,7 +2783,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 56
},
"_enabled": true,
"_materials": [
......@@ -2736,7 +2816,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 53
},
"_enabled": true,
"_fontFamily": "Arial",
......@@ -2749,7 +2829,7 @@
"_N$maxWidth": 900,
"_N$lineHeight": 60,
"_N$imageAtlas": null,
"_N$handleTouchEvent": true,
"_N$handleTouchEvent": false,
"_id": "81gZVF6wpG8ZYp8wKdAMKS"
},
{
......@@ -2757,7 +2837,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 36
},
"_enabled": true,
"alignMode": 1,
......@@ -2784,7 +2864,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 25
},
"_enabled": true,
"alignMode": 1,
......@@ -2815,19 +2895,19 @@
},
"_children": [
{
"__id__": 60
"__id__": 62
},
{
"__id__": 62
"__id__": 64
}
],
"_active": true,
"_components": [
{
"__id__": 66
"__id__": 68
},
{
"__id__": 67
"__id__": 69
}
],
"_prefab": null,
......@@ -2883,13 +2963,13 @@
"_name": "ani",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 61
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 63
}
],
"_prefab": null,
......@@ -2945,7 +3025,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 62
},
"_enabled": true,
"_materials": [
......@@ -2985,17 +3065,17 @@
"_name": "btn_go",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 61
},
"_children": [
{
"__id__": 63
"__id__": 65
}
],
"_active": false,
"_components": [
{
"__id__": 65
"__id__": 67
}
],
"_prefab": null,
......@@ -3051,13 +3131,13 @@
"_name": "text",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 66
}
],
"_prefab": null,
......@@ -3113,7 +3193,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -3146,7 +3226,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -3178,11 +3258,11 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
"__id__": 61
},
"_enabled": true,
"aniRole": {
"__id__": 60
"__id__": 62
},
"_id": "e4RrOXSNJGd68Mq3UTYY0p"
},
......@@ -3191,7 +3271,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
"__id__": 61
},
"_enabled": true,
"alignMode": 1,
......@@ -3224,7 +3304,7 @@
"_active": false,
"_components": [
{
"__id__": 69
"__id__": 71
}
],
"_prefab": null,
......@@ -3280,7 +3360,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 70
},
"_enabled": true,
"_materials": [
......@@ -3316,7 +3396,7 @@
},
"_children": [
{
"__id__": 71
"__id__": 73
}
],
"_active": true,
......@@ -3374,11 +3454,11 @@
"_name": "Controls",
"_objFlags": 0,
"_parent": {
"__id__": 70
"__id__": 72
},
"_children": [
{
"__id__": 72
"__id__": 74
}
],
"_active": true,
......@@ -3436,14 +3516,11 @@
"_name": "ProgressBar",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 73
},
"_children": [
{
"__id__": 73
},
{
"__id__": 77
"__id__": 75
},
{
"__id__": 79
......@@ -3452,16 +3529,19 @@
"__id__": 81
},
{
"__id__": 85
"__id__": 83
},
{
"__id__": 87
}
],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 90
},
{
"__id__": 89
"__id__": 91
}
],
"_prefab": null,
......@@ -3517,17 +3597,17 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 74
},
"_children": [
{
"__id__": 74
"__id__": 76
}
],
"_active": true,
"_components": [
{
"__id__": 76
"__id__": 78
}
],
"_prefab": null,
......@@ -3583,13 +3663,13 @@
"_name": "bar_tag",
"_objFlags": 0,
"_parent": {
"__id__": 73
"__id__": 75
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 77
}
],
"_prefab": null,
......@@ -3645,7 +3725,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 76
},
"_enabled": true,
"_materials": [
......@@ -3677,7 +3757,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 75
},
"_enabled": true,
"_materials": [
......@@ -3709,13 +3789,13 @@
"_name": "Play",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 74
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 78
"__id__": 80
}
],
"_prefab": null,
......@@ -3771,7 +3851,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 79
},
"_enabled": true,
"_materials": [
......@@ -3803,13 +3883,13 @@
"_name": "Pause",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 74
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 82
}
],
"_prefab": null,
......@@ -3865,7 +3945,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 81
},
"_enabled": true,
"_materials": [
......@@ -3897,19 +3977,19 @@
"_name": "CurrentLabel",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 74
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 84
},
{
"__id__": 83
"__id__": 85
},
{
"__id__": 84
"__id__": 86
}
],
"_prefab": null,
......@@ -3965,7 +4045,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 83
},
"_enabled": true,
"_materials": [
......@@ -3998,7 +4078,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 83
},
"_enabled": false,
"_color": {
......@@ -4016,7 +4096,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 83
},
"_enabled": true,
"alignMode": 1,
......@@ -4043,16 +4123,16 @@
"_name": "TimeLabel",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 74
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 86
"__id__": 88
},
{
"__id__": 87
"__id__": 89
}
],
"_prefab": null,
......@@ -4108,7 +4188,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 87
},
"_enabled": true,
"_materials": [
......@@ -4141,7 +4221,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 87
},
"_enabled": true,
"alignMode": 1,
......@@ -4168,7 +4248,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 74
},
"_enabled": true,
"_materials": [
......@@ -4200,12 +4280,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 74
},
"_enabled": true,
"_N$totalLength": 1,
"_N$barSprite": {
"__id__": 76
"__id__": 78
},
"_N$mode": 2,
"_N$progress": 0,
......@@ -4221,13 +4301,13 @@
},
"_children": [
{
"__id__": 91
"__id__": 93
},
{
"__id__": 94
"__id__": 96
},
{
"__id__": 95
"__id__": 97
}
],
"_active": false,
......@@ -4285,11 +4365,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 90
"__id__": 92
},
"_children": [
{
"__id__": 92
"__id__": 94
}
],
"_active": true,
......@@ -4347,13 +4427,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 93
"__id__": 95
}
],
"_prefab": null,
......@@ -4409,7 +4489,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4444,7 +4524,7 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 90
"__id__": 92
},
"_children": [],
"_active": true,
......@@ -4502,12 +4582,9 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 90
"__id__": 92
},
"_children": [
{
"__id__": 96
},
{
"__id__": 98
},
......@@ -4525,6 +4602,9 @@
},
{
"__id__": 108
},
{
"__id__": 110
}
],
"_active": true,
......@@ -4582,13 +4662,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 95
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 97
"__id__": 99
}
],
"_prefab": null,
......@@ -4644,7 +4724,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 98
},
"_enabled": true,
"_clip": {
......@@ -4663,13 +4743,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 95
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 99
"__id__": 101
}
],
"_prefab": null,
......@@ -4725,7 +4805,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 100
},
"_enabled": true,
"_clip": {
......@@ -4744,13 +4824,13 @@
"_name": "bettery",
"_objFlags": 0,
"_parent": {
"__id__": 95
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 101
"__id__": 103
}
],
"_prefab": null,
......@@ -4806,7 +4886,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
"__id__": 102
},
"_enabled": true,
"_clip": {
......@@ -4825,13 +4905,13 @@
"_name": "error",
"_objFlags": 0,
"_parent": {
"__id__": 95
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 105
}
],
"_prefab": null,
......@@ -4887,7 +4967,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 104
},
"_enabled": true,
"_clip": {
......@@ -4906,13 +4986,13 @@
"_name": "bgm",
"_objFlags": 0,
"_parent": {
"__id__": 95
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 105
"__id__": 107
}
],
"_prefab": null,
......@@ -4968,7 +5048,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
"__id__": 106
},
"_enabled": true,
"_clip": {
......@@ -4987,13 +5067,13 @@
"_name": "opendoor",
"_objFlags": 0,
"_parent": {
"__id__": 95
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 107
"__id__": 109
}
],
"_prefab": null,
......@@ -5049,7 +5129,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 108
},
"_enabled": true,
"_clip": {
......@@ -5068,13 +5148,13 @@
"_name": "light",
"_objFlags": 0,
"_parent": {
"__id__": 95
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 111
}
],
"_prefab": null,
......@@ -5130,7 +5210,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 110
},
"_enabled": true,
"_clip": {
......@@ -5197,55 +5277,61 @@
},
"_enabled": true,
"xiaodi": {
"__id__": 66
"__id__": 68
},
"question_img": {
"__id__": 24
"__id__": 26
},
"label_title": {
"__id__": 30
"__id__": 32
},
"btn_vioce": {
"__id__": 40
"__id__": 42
},
"btn_vioce_ing": {
"__id__": 44
},
"btn_restart": {
"__id__": 35
"__id__": 37
},
"label_tip_wait": {
"__id__": 47
"__id__": 49
},
"label_tip_ing": {
"__id__": 49
"__id__": 51
},
"rich_content": {
"__id__": 51
"__id__": 53
},
"btn_go": {
"__id__": 62
"__id__": 64
},
"barTag": {
"__id__": 74
"__id__": 76
},
"ProgressBar": {
"__id__": 72
"__id__": 74
},
"videoPlayer": {
"__id__": 6
"__id__": 8
},
"currentTimeLabel": {
"__id__": 82
"__id__": 84
},
"layout_video": {
"__id__": 70
"__id__": 72
},
"videoControls": {
"__id__": 71
"__id__": 73
},
"pauseButton": {
"__id__": 79
"__id__": 81
},
"playButton": {
"__id__": 77
"__id__": 79
},
"video_canvas": {
"__id__": 5
},
"_id": "6eW7M4ET1L4KOTzIOVRmf8"
}
......
......@@ -63,6 +63,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
@property(cc.Node) question_img: cc.Node = null;
@property(cc.Node) label_title: cc.Node = null;
@property(cc.Node) btn_vioce: cc.Node = null;
@property(cc.Node) btn_vioce_ing: cc.Node = null;
@property(cc.Node) btn_restart: cc.Node = null;
@property(cc.Node) label_tip_wait: cc.Node = null;
@property(cc.Node) label_tip_ing: cc.Node = null;
......@@ -72,6 +73,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
// 初始化页面
initView() {
this.btn_vioce.active = false;
this.btn_vioce_ing.active = false;
this.btn_restart.active = false;
this.label_tip_wait.active = false;
this.label_tip_ing.active = false;
......@@ -83,7 +85,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
pg.view.touchOn(this.btn_go, this.onTouchNext, this);
pg.view.touchOn(this.btn_restart, this.onTouchRestart, this);
pg.view.touchOn(this.btn_vioce, this.onTouchRecord, this);
pg.view.touchOn(pg.view.find(this.btn_vioce, 'img_ing'), this.onTouchRecordEnd, this);
pg.view.touchOn(this.btn_vioce_ing, this.onTouchRecordEnd, this);
}
// 初始化游戏
initGame() {
......@@ -110,8 +112,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
pg.view.setString(this.label_title, this.currentQuestion.title);
this.btn_vioce.active = true;
pg.view.visible(pg.view.find(this.btn_vioce, 'img_ing'), false)
pg.view.visible(pg.view.find(this.btn_vioce, 'img_stop'), false)
pg.view.visible(this.btn_vioce_ing, false)
this.label_tip_wait.active = true;
// 展示下一题
......@@ -125,7 +126,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this._cantouch = false;
if (this.current == 0) {
this.xiaodi.playEnter(this.data.startAudio).then(() => {
this.xiaodi.playEnter(this.currentQuestion.startAudio).then(() => {
this._cantouch = true;
})
} else {
......@@ -158,9 +159,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.label_tip_wait.active = false
this.label_tip_ing.active = true;
pg.view.visible(pg.view.find(this.btn_vioce, 'img_ing'), true)
pg.view.visible(pg.view.find(this.btn_vioce, 'img_stop'), true)
let img_ing = pg.view.find(this.btn_vioce, 'img_ing')
pg.view.visible(this.btn_vioce_ing, true)
let img_ing = pg.view.find(this.btn_vioce_ing, 'img_ing')
img_ing.getComponent(cc.Sprite).fillRange = subTime / this.targetTime;
if (subTime == 0) {
this.onTouchRecordEnd();
......@@ -170,8 +170,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.startTime = null;
this.label_tip_wait.active = false
this.label_tip_ing.active = false;
pg.view.visible(pg.view.find(this.btn_vioce, 'img_ing'), false)
pg.view.visible(pg.view.find(this.btn_vioce, 'img_stop'), false)
pg.view.visible(this.btn_vioce_ing, false)
}
async onTouchRecord() {
if (!this._cantouch) return;
......@@ -188,6 +187,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
async onTouchRecordEnd() {
if (!this.recording) return;
this.recording = false;
this.showTimeEnd();
let testData = {
"text": "Hello every one my name is world",
......@@ -258,6 +258,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
})
}
onTouchNext() {
console.log('next')
if (this.recording) return;
if (!this.nextQuestion) {
pg.view.find(this, 'layout_game/img_question').active = false;
......@@ -305,11 +306,24 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.xiaodi.hideAll();
}
showVideoPlayer() {
@property(cc.Node) video_canvas: cc.Node = null;
hideVideoPlayer() {
this.layout_video.active = true;
this.videoPlayer.stayOnBottom = true;
this.videoPlayer.node.x = 0;
this.videoPlayer.node.y = 0;
this.videoPlayer.node.width = 100;
this.videoPlayer.node.height = 100;
}
showVideoPlayer() {
this.layout_video.active = true;
this.videoPlayer.stayOnBottom = true;
this.videoPlayer.node.x = this.video_canvas.x;
this.videoPlayer.node.y = this.video_canvas.y;
this.videoPlayer.node.width = this.video_canvas.width;
this.videoPlayer.node.height = this.video_canvas.height;
if (!this._isReadyToPlay) {
//首次播放
this._isReadyToPlay = false;
......
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