Commit 9c236c23 authored by Tt's avatar Tt

游戏流程完成

parent f92c3243
......@@ -93,31 +93,34 @@
"__id__": 77
},
{
"__id__": 104
"__id__": 80
},
{
"__id__": 126
"__id__": 114
},
{
"__id__": 155
"__id__": 136
},
{
"__id__": 163
"__id__": 165
},
{
"__id__": 164
"__id__": 173
},
{
"__id__": 174
}
],
"_active": true,
"_components": [
{
"__id__": 182
"__id__": 192
},
{
"__id__": 183
"__id__": 193
},
{
"__id__": 184
"__id__": 194
}
],
"_prefab": null,
......@@ -1240,7 +1243,7 @@
"ctor": "Float64Array",
"array": [
0,
27,
0,
0,
0,
0,
......@@ -1332,7 +1335,7 @@
"ctor": "Float64Array",
"array": [
0,
27,
0,
0,
0,
0,
......@@ -2006,7 +2009,7 @@
"ctor": "Float64Array",
"array": [
-1818.156,
27,
0,
0,
0,
0,
......@@ -3706,6 +3709,179 @@
"_originalHeight": 0,
"_id": "b3SsLnDs9AiqEtPOX2PeZN"
},
{
"__type__": "cc.Node",
"_name": "ani_npc",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 78
},
{
"__id__": 79
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 132,
"height": 143
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
850.23,
442.127,
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": "a3M7o2UZpLfYg7fUh+HjOY"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature",
"_animationName": "",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "81227493-e3d6-4376-8a25-e1e95c59aaa8#810b0618-8d5f-41a7-b988-1ceb6fe3b71b",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "81227493-e3d6-4376-8a25-e1e95c59aaa8"
},
"_N$dragonAtlasAsset": {
"__uuid__": "810b0618-8d5f-41a7-b988-1ceb6fe3b71b"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 0,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "1dNYGSSudChqDgIPr8luQY"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
},
"_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
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "76tvsct3JOJIL8ARG0zm7Z"
},
{
"__type__": "cc.Node",
"_name": "layout_bottom",
......@@ -3715,13 +3891,19 @@
},
"_children": [
{
"__id__": 78
"__id__": 81
},
{
"__id__": 109
},
{
"__id__": 111
}
],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 113
}
],
"_prefab": null,
......@@ -3777,17 +3959,17 @@
"_name": "layout_cover",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 80
},
"_children": [
{
"__id__": 79
"__id__": 82
}
],
"_active": true,
"_components": [
{
"__id__": 102
"__id__": 108
}
],
"_prefab": null,
......@@ -3843,23 +4025,23 @@
"_name": "btn_record",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 81
},
"_children": [
{
"__id__": 80
"__id__": 83
},
{
"__id__": 90
"__id__": 96
},
{
"__id__": 94
"__id__": 100
}
],
"_active": true,
"_components": [
{
"__id__": 101
"__id__": 107
}
],
"_prefab": null,
......@@ -3915,17 +4097,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 82
},
"_children": [
{
"__id__": 81
"__id__": 84
}
],
"_active": true,
"_components": [
{
"__id__": 89
"__id__": 95
}
],
"_prefab": null,
......@@ -3981,23 +4163,23 @@
"_name": "layout_btns",
"_objFlags": 0,
"_parent": {
"__id__": 80
"__id__": 83
},
"_children": [
{
"__id__": 82
"__id__": 85
},
{
"__id__": 84
"__id__": 88
},
{
"__id__": 86
"__id__": 91
}
],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 94
}
],
"_prefab": null,
......@@ -4053,13 +4235,16 @@
"_name": "btn_right",
"_objFlags": 0,
"_parent": {
"__id__": 81
"__id__": 84
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 83
"__id__": 86
},
{
"__id__": 87
}
],
"_prefab": null,
......@@ -4115,7 +4300,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
"__id__": 85
},
"_enabled": true,
"_materials": [
......@@ -4143,29 +4328,100 @@
"_id": "becdnPjp5HLZ9I5ZkDAfQ1"
},
{
"__type__": "cc.Node",
"_name": "btn_play",
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"_parent": {
"__id__": 81
"node": {
"__id__": 85
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 85
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"_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
},
"_contentSize": {
"_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
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "c8E7LX2BVN2bpkiYtawdIF"
},
{
"__type__": "cc.Node",
"_name": "btn_play",
"_objFlags": 0,
"_parent": {
"__id__": 84
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 89
},
{
"__id__": 90
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 77,
"height": 84
......@@ -4209,7 +4465,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -4236,18 +4492,89 @@
"_atlas": null,
"_id": "a4OkOP4BlPo4DNrUFZKTej"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
},
"_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
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "43oPNmMVlOGbE5NR3Gj8+d"
},
{
"__type__": "cc.Node",
"_name": "btn_stop",
"_objFlags": 0,
"_parent": {
"__id__": 81
"__id__": 84
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 87
"__id__": 92
},
{
"__id__": 93
}
],
"_prefab": null,
......@@ -4303,7 +4630,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 91
},
"_enabled": true,
"_materials": [
......@@ -4330,12 +4657,80 @@
"_atlas": null,
"_id": "1bKVIYi2VKzJe+R1twAYeE"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
},
"_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
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "a3Gzx0NYVCp5j6nQd/1eFl"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 84
},
"_enabled": true,
"_materials": [
......@@ -4367,7 +4762,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 83
},
"_enabled": true,
"_materials": [
......@@ -4387,17 +4782,17 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 82
},
"_children": [
{
"__id__": 91
"__id__": 97
}
],
"_active": true,
"_components": [
{
"__id__": 93
"__id__": 99
}
],
"_prefab": null,
......@@ -4453,13 +4848,13 @@
"_name": "ani",
"_objFlags": 0,
"_parent": {
"__id__": 90
"__id__": 96
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 92
"__id__": 98
}
],
"_prefab": null,
......@@ -4515,7 +4910,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
"__id__": 97
},
"_enabled": true,
"_materials": [
......@@ -4555,7 +4950,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 96
},
"_enabled": true,
"_materials": [
......@@ -4587,23 +4982,23 @@
"_name": "img_voice",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 82
},
"_children": [
{
"__id__": 95
"__id__": 101
},
{
"__id__": 96
"__id__": 102
},
{
"__id__": 98
"__id__": 104
}
],
"_active": false,
"_components": [
{
"__id__": 100
"__id__": 106
}
],
"_prefab": null,
......@@ -4659,7 +5054,7 @@
"_name": "p1",
"_objFlags": 0,
"_parent": {
"__id__": 94
"__id__": 100
},
"_children": [],
"_active": true,
......@@ -4717,13 +5112,13 @@
"_name": "p2",
"_objFlags": 0,
"_parent": {
"__id__": 94
"__id__": 100
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 97
"__id__": 103
}
],
"_prefab": null,
......@@ -4779,7 +5174,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 102
},
"_enabled": true,
"_materials": [
......@@ -4811,13 +5206,13 @@
"_name": "p3",
"_objFlags": 0,
"_parent": {
"__id__": 94
"__id__": 100
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 99
"__id__": 105
}
],
"_prefab": null,
......@@ -4873,7 +5268,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 104
},
"_enabled": true,
"_materials": [
......@@ -4905,7 +5300,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
"__id__": 100
},
"_enabled": true,
"_id": "1b37Xp6IVLg6RciXLxM7OU"
......@@ -4915,7 +5310,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 82
},
"_enabled": true,
"alignMode": 2,
......@@ -4942,34 +5337,233 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 81
},
"_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.Node",
"_name": "label_word",
"_objFlags": 0,
"_parent": {
"__id__": 80
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 110
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 181.88,
"height": 100.8
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-457.315,
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": "10tZrGTKtG0rwcIplGD4ad"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "Label",
"_N$string": "Label",
"_fontSize": 80,
"_lineHeight": 80,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "439834f9-fa46-441b-8417-8747859f6526"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "84N8kDaWJInooia+ejqnHR"
},
{
"__type__": "cc.Node",
"_name": "ani_good",
"_objFlags": 0,
"_parent": {
"__id__": 80
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 112
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 211.8058858846178,
"height": 323.11337099735886
},
"_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": "25E/M1yRBL0IdyJ9HFRxyX"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 111
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature",
"_animationName": "newAnimation",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "48404102-474e-41df-8cb1-543091b95dcf#52e5af2e-ac08-4a92-9a3f-d247312ee4bb",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "48404102-474e-41df-8cb1-543091b95dcf"
},
"_N$dragonAtlasAsset": {
"__uuid__": "52e5af2e-ac08-4a92-9a3f-d247312ee4bb"
},
"_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"
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "31A7ggoLVHZ747hCm1OpkV"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 80
},
"_enabled": true,
"alignMode": 1,
......@@ -5000,19 +5594,19 @@
},
"_children": [
{
"__id__": 105
"__id__": 115
},
{
"__id__": 113
"__id__": 123
},
{
"__id__": 123
"__id__": 133
}
],
"_active": false,
"_components": [
{
"__id__": 125
"__id__": 135
}
],
"_prefab": null,
......@@ -5068,26 +5662,26 @@
"_name": "btn_auto",
"_objFlags": 0,
"_parent": {
"__id__": 104
"__id__": 114
},
"_children": [
{
"__id__": 106
"__id__": 116
},
{
"__id__": 108
"__id__": 118
}
],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 120
},
{
"__id__": 111
"__id__": 121
},
{
"__id__": 112
"__id__": 122
}
],
"_prefab": null,
......@@ -5143,13 +5737,13 @@
"_name": "icon_hand",
"_objFlags": 0,
"_parent": {
"__id__": 105
"__id__": 115
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 107
"__id__": 117
}
],
"_prefab": null,
......@@ -5205,7 +5799,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 116
},
"_enabled": true,
"_materials": [
......@@ -5237,13 +5831,13 @@
"_name": "icon_auto",
"_objFlags": 0,
"_parent": {
"__id__": 105
"__id__": 115
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 119
}
],
"_prefab": null,
......@@ -5299,7 +5893,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 118
},
"_enabled": true,
"_materials": [
......@@ -5331,7 +5925,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 115
},
"_enabled": false,
"_materials": [
......@@ -5363,7 +5957,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 115
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5424,7 +6018,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 105
"__id__": 115
},
"_id": "51UogickFEr4hnpotYEgB+"
},
......@@ -5433,7 +6027,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 115
},
"_enabled": true,
"alignMode": 1,
......@@ -5460,20 +6054,20 @@
"_name": "layout_auto",
"_objFlags": 0,
"_parent": {
"__id__": 104
"__id__": 114
},
"_children": [
{
"__id__": 114
"__id__": 124
},
{
"__id__": 118
"__id__": 128
}
],
"_active": true,
"_components": [
{
"__id__": 122
"__id__": 132
}
],
"_prefab": null,
......@@ -5529,17 +6123,17 @@
"_name": "layout_unauto",
"_objFlags": 0,
"_parent": {
"__id__": 113
"__id__": 123
},
"_children": [
{
"__id__": 115
"__id__": 125
}
],
"_active": false,
"_components": [
{
"__id__": 117
"__id__": 127
}
],
"_prefab": null,
......@@ -5595,13 +6189,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 114
"__id__": 124
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 116
"__id__": 126
}
],
"_prefab": null,
......@@ -5657,7 +6251,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
"__id__": 125
},
"_enabled": true,
"_materials": [
......@@ -5690,7 +6284,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 124
},
"_enabled": true,
"_materials": [
......@@ -5722,17 +6316,17 @@
"_name": "layout_auto",
"_objFlags": 0,
"_parent": {
"__id__": 113
"__id__": 123
},
"_children": [
{
"__id__": 119
"__id__": 129
}
],
"_active": false,
"_components": [
{
"__id__": 121
"__id__": 131
}
],
"_prefab": null,
......@@ -5788,13 +6382,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 118
"__id__": 128
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 130
}
],
"_prefab": null,
......@@ -5850,7 +6444,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 129
},
"_enabled": true,
"_materials": [
......@@ -5883,7 +6477,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 128
},
"_enabled": true,
"_materials": [
......@@ -5915,7 +6509,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
"__id__": 123
},
"_enabled": true,
"alignMode": 1,
......@@ -5942,13 +6536,13 @@
"_name": "pos_tip",
"_objFlags": 0,
"_parent": {
"__id__": 104
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 124
"__id__": 134
}
],
"_prefab": null,
......@@ -6004,7 +6598,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 133
},
"_enabled": true,
"alignMode": 1,
......@@ -6031,7 +6625,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
"__id__": 114
},
"_enabled": true,
"alignMode": 1,
......@@ -6062,25 +6656,25 @@
},
"_children": [
{
"__id__": 127
"__id__": 137
},
{
"__id__": 131
"__id__": 141
},
{
"__id__": 142
"__id__": 152
},
{
"__id__": 145
"__id__": 155
}
],
"_active": false,
"_components": [
{
"__id__": 153
"__id__": 163
},
{
"__id__": 154
"__id__": 164
}
],
"_prefab": null,
......@@ -6136,19 +6730,19 @@
"_name": "gray",
"_objFlags": 0,
"_parent": {
"__id__": 126
"__id__": 136
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 128
"__id__": 138
},
{
"__id__": 129
"__id__": 139
},
{
"__id__": 130
"__id__": 140
}
],
"_prefab": null,
......@@ -6204,7 +6798,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 137
},
"_enabled": true,
"_materials": [
......@@ -6236,7 +6830,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 137
},
"_enabled": true,
"alignMode": 1,
......@@ -6263,7 +6857,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 137
},
"_enabled": true,
"_id": "49KF+i84NCQb2GCqvgzSGE"
......@@ -6273,23 +6867,23 @@
"_name": "layout_bg",
"_objFlags": 0,
"_parent": {
"__id__": 126
"__id__": 136
},
"_children": [
{
"__id__": 132
"__id__": 142
},
{
"__id__": 134
"__id__": 144
},
{
"__id__": 136
"__id__": 146
},
{
"__id__": 138
"__id__": 148
},
{
"__id__": 140
"__id__": 150
}
],
"_active": true,
......@@ -6347,13 +6941,13 @@
"_name": "img_wrong",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 141
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 133
"__id__": 143
}
],
"_prefab": null,
......@@ -6409,7 +7003,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 142
},
"_enabled": true,
"_materials": [
......@@ -6441,13 +7035,13 @@
"_name": "img_right",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 141
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 135
"__id__": 145
}
],
"_prefab": null,
......@@ -6503,7 +7097,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 144
},
"_enabled": true,
"_materials": [
......@@ -6535,13 +7129,13 @@
"_name": "img_excellent",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 141
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 137
"__id__": 147
}
],
"_prefab": null,
......@@ -6597,7 +7191,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 136
"__id__": 146
},
"_enabled": true,
"_materials": [
......@@ -6629,13 +7223,13 @@
"_name": "img_good",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 141
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 139
"__id__": 149
}
],
"_prefab": null,
......@@ -6691,7 +7285,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 148
},
"_enabled": true,
"_materials": [
......@@ -6723,13 +7317,13 @@
"_name": "img_tryagain",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 141
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 141
"__id__": 151
}
],
"_prefab": null,
......@@ -6785,7 +7379,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 150
},
"_enabled": true,
"_materials": [
......@@ -6817,16 +7411,16 @@
"_name": "btn_close",
"_objFlags": 0,
"_parent": {
"__id__": 126
"__id__": 136
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 143
"__id__": 153
},
{
"__id__": 144
"__id__": 154
}
],
"_prefab": null,
......@@ -6882,7 +7476,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 152
},
"_enabled": true,
"_materials": [
......@@ -6914,7 +7508,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 152
},
"_enabled": true,
"_normalMaterial": null,
......@@ -6982,23 +7576,23 @@
"_name": "label_rich",
"_objFlags": 0,
"_parent": {
"__id__": 126
"__id__": 136
},
"_children": [
{
"__id__": 146
"__id__": 156
},
{
"__id__": 148
"__id__": 158
},
{
"__id__": 150
"__id__": 160
}
],
"_active": true,
"_components": [
{
"__id__": 152
"__id__": 162
}
],
"_prefab": null,
......@@ -7054,13 +7648,13 @@
"_name": "RICHTEXT_CHILD",
"_objFlags": 1024,
"_parent": {
"__id__": 145
"__id__": 155
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 147
"__id__": 157
}
],
"_prefab": null,
......@@ -7117,7 +7711,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
"__id__": 156
},
"_enabled": true,
"_materials": [
......@@ -7150,13 +7744,13 @@
"_name": "RICHTEXT_CHILD",
"_objFlags": 1024,
"_parent": {
"__id__": 145
"__id__": 155
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 149
"__id__": 159
}
],
"_prefab": null,
......@@ -7213,7 +7807,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
"__id__": 158
},
"_enabled": true,
"_materials": [
......@@ -7246,13 +7840,13 @@
"_name": "RICHTEXT_CHILD",
"_objFlags": 1024,
"_parent": {
"__id__": 145
"__id__": 155
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 151
"__id__": 161
}
],
"_prefab": null,
......@@ -7309,7 +7903,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 160
},
"_enabled": true,
"_materials": [
......@@ -7342,7 +7936,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 155
},
"_enabled": true,
"_fontFamily": "Arial",
......@@ -7363,7 +7957,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 136
},
"_enabled": true,
"alignMode": 1,
......@@ -7390,29 +7984,29 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 136
},
"_enabled": true,
"img_wrong": {
"__id__": 132
"__id__": 142
},
"img_right": {
"__id__": 134
"__id__": 144
},
"img_excellent": {
"__id__": 136
"__id__": 146
},
"img_good": {
"__id__": 138
"__id__": 148
},
"img_tryagain": {
"__id__": 140
"__id__": 150
},
"btn_close": {
"__id__": 142
"__id__": 152
},
"label_rich": {
"__id__": 145
"__id__": 155
},
"_id": "21yeiQSYNL+4fKBi8JDm4u"
},
......@@ -7425,19 +8019,19 @@
},
"_children": [
{
"__id__": 156
"__id__": 166
},
{
"__id__": 158
"__id__": 168
},
{
"__id__": 160
"__id__": 170
}
],
"_active": false,
"_components": [
{
"__id__": 162
"__id__": 172
}
],
"_prefab": null,
......@@ -7493,13 +8087,13 @@
"_name": "img_good",
"_objFlags": 0,
"_parent": {
"__id__": 155
"__id__": 165
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 157
"__id__": 167
}
],
"_prefab": null,
......@@ -7555,7 +8149,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 166
},
"_enabled": true,
"_materials": [
......@@ -7587,13 +8181,13 @@
"_name": "img_tryagain",
"_objFlags": 0,
"_parent": {
"__id__": 155
"__id__": 165
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 159
"__id__": 169
}
],
"_prefab": null,
......@@ -7649,7 +8243,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 158
"__id__": 168
},
"_enabled": true,
"_materials": [
......@@ -7681,13 +8275,13 @@
"_name": "img_excellent",
"_objFlags": 0,
"_parent": {
"__id__": 155
"__id__": 165
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 161
"__id__": 171
}
],
"_prefab": null,
......@@ -7743,7 +8337,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
"__id__": 170
},
"_enabled": true,
"_materials": [
......@@ -7775,7 +8369,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 155
"__id__": 165
},
"_enabled": true,
"alignMode": 1,
......@@ -7864,13 +8458,13 @@
},
"_children": [
{
"__id__": 165
"__id__": 175
},
{
"__id__": 168
"__id__": 178
},
{
"__id__": 171
"__id__": 181
}
],
"_active": false,
......@@ -7928,11 +8522,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 174
},
"_children": [
{
"__id__": 166
"__id__": 176
}
],
"_active": true,
......@@ -7990,13 +8584,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 165
"__id__": 175
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 167
"__id__": 177
}
],
"_prefab": null,
......@@ -8052,7 +8646,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 176
},
"_enabled": true,
"_materials": [],
......@@ -8083,11 +8677,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 174
},
"_children": [
{
"__id__": 169
"__id__": 179
}
],
"_active": true,
......@@ -8145,13 +8739,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 168
"__id__": 178
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 170
"__id__": 180
}
],
"_prefab": null,
......@@ -8207,7 +8801,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 179
},
"_enabled": true,
"_materials": [],
......@@ -8235,23 +8829,23 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 174
},
"_children": [
{
"__id__": 172
"__id__": 182
},
{
"__id__": 174
"__id__": 184
},
{
"__id__": 176
"__id__": 186
},
{
"__id__": 178
"__id__": 188
},
{
"__id__": 180
"__id__": 190
}
],
"_active": true,
......@@ -8309,13 +8903,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 171
"__id__": 181
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 173
"__id__": 183
}
],
"_prefab": null,
......@@ -8371,7 +8965,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 172
"__id__": 182
},
"_enabled": true,
"_clip": {
......@@ -8390,13 +8984,13 @@
"_name": "tip",
"_objFlags": 0,
"_parent": {
"__id__": 171
"__id__": 181
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 175
"__id__": 185
}
],
"_prefab": null,
......@@ -8452,7 +9046,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 174
"__id__": 184
},
"_enabled": true,
"_clip": {
......@@ -8471,13 +9065,13 @@
"_name": "tosmall",
"_objFlags": 0,
"_parent": {
"__id__": 171
"__id__": 181
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 177
"__id__": 187
}
],
"_prefab": null,
......@@ -8533,7 +9127,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 176
"__id__": 186
},
"_enabled": true,
"_clip": {
......@@ -8552,13 +9146,13 @@
"_name": "pagenext",
"_objFlags": 0,
"_parent": {
"__id__": 171
"__id__": 181
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 179
"__id__": 189
}
],
"_prefab": null,
......@@ -8614,7 +9208,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 178
"__id__": 188
},
"_enabled": true,
"_clip": {
......@@ -8633,13 +9227,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 171
"__id__": 181
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 181
"__id__": 191
}
],
"_prefab": null,
......@@ -8695,7 +9289,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 190
},
"_enabled": true,
"_clip": {
......@@ -8771,28 +9365,37 @@
"__id__": 40
},
"layer_tip": {
"__id__": 126
"__id__": 136
},
"btn_auto": {
"__id__": 105
"__id__": 115
},
"layout_unauto": {
"__id__": 114
"__id__": 124
},
"layout_auto": {
"__id__": 118
"__id__": 128
},
"btn_record": {
"__id__": 79
"__id__": 82
},
"label_word": {
"__id__": 109
},
"ani_good": {
"__id__": 111
},
"ani_npc": {
"__id__": 77
},
"item_ani": {
"__id__": 155
"__id__": 165
},
"layout_ani": {
"__id__": 163
"__id__": 173
},
"pos_tip": {
"__id__": 123
"__id__": 133
},
"label_round": {
"__id__": 46
......
......@@ -7,11 +7,6 @@ import ImgAuto4 from "./ImgAuto4_sn17_danci";
import LayoutTip from "./LayoutTip_sn17_danci";
const { ccclass, property } = cc._decorator;
enum Flag {
Listen = 1,
Record = 2,
Check = 3
}
let win: any = window;
let courseware = win.courseware;
@ccclass
......@@ -71,7 +66,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
public layout_auto: cc.Node = null;
_cantouch = null;
private list: Array<{ type, text, right, imgage, duration, content, audio }>;
private list: Array<{ type, text, right, imgage, duration, content, audio, npcAudio }>;
private recordFlag: number;//录音模式
private score: number;
private scoreList: Array<number>;
......@@ -104,6 +99,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
pg.view.touchOn(this.btn_next, this.nextLayer, this);
pg.view.touchOn(this.btn_voice, this.onTouchVoice, this);
pg.view.touchOn(this.btn_record, this.onTouchRecord, this);
pg.view.touchOn(this.ani_npc, this.onPlayNpc, this);
let layout_btns = pg.view.find(this.btn_record, "mask/layout_btns");
let btn_right = pg.view.find(layout_btns, 'btn_right')
......@@ -159,38 +155,19 @@ export default class SceneComponent extends MyCocosSceneComponent {
private currentAudioId: any;
startPlay() {
this.touchForbid = false;
if (this.recordFlag != Flag.Listen) {
let com = this.btn_voice.getComponent(ImgAuto);
com.playVoiceStart();
pg.audio.playAudioByUrl(this.CurrentData.audio, () => {
this.currentAudioId = null;
com.playVoiceEnd();
this.touchForbid = false;
let com = this.btn_voice.getComponent(ImgAuto);
com.playVoiceStart();
pg.audio.playAudioByUrl(this.CurrentData.audio, () => {
this.currentAudioId = null;
com.playVoiceEnd();
this.touchForbid = false;
this.letter = this.CurrentData.content;
this.targetTime = this.CurrentData.duration;
this.scheduleOnce(() => {
this.showRecordWait();
}, 1)
}, (audioId) => {
this.currentAudioId = audioId;
})
} else {
if (this.CurrentData.type.indexOf('audio') > -1) {
let com = this.btn_voice.getComponent(ImgAuto);
com.playVoiceStart();
pg.audio.playAudioByUrl(this.CurrentData.audio, () => {
this.currentAudioId = null;
com.playVoiceEnd();
this.scheduleOnce(() => {
this.touchForbid = false;
if (this.touchAuto) this.nextLayer();
}, 0.5)
}, (audioId) => {
this.currentAudioId = audioId;
})
}
}
this.scheduleOnce(() => {
this.showRecordWait();
}, 1)
}, (audioId) => {
this.currentAudioId = audioId;
})
}
updateBtns() {
......@@ -214,12 +191,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.updateBtns();
}
//--------------------------------Record-----------------------------
private letter: string;
private targetTime: number;
private recordAudio: string;
private startTime: number;
private recording: boolean;
private microPhoneChange: boolean;
@property(cc.Node)
......@@ -272,20 +245,115 @@ export default class SceneComponent extends MyCocosSceneComponent {
btn_play.active = false;
btn_stop.active = false;
}
private recordAudioId: any;
async showRecorAudioPlay() {
if (!this.recordAudio) return;
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 = true;
pg.audio.playAudioByUrl(this.recordAudio, () => {
this.recordAudioId = null;
this.showRecorAudioPlayEnd().then(() => {
this.showNpcAudioPlay().then(() => {
this.showNpcAudioPlayEnd();
this.nextLayer();
})
})
}, audioId => {
this.recordAudioId = audioId;
})
}
showRecorAudioPlayEnd() {
return new Promise((resolve, reject) => {
if (!this.recordAudio) return;
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 = true;
btn_stop.active = false;
if (this.recordAudioId) {
cc.audioEngine.stopEffect(this.recordAudioId)
this.recordAudioId = null;
}
// 播放文字内容
this.label_word.active = true;
pg.view.setString(this.label_word, this.recordAudioWord);
// 播放鼓励
this.ani_good.active = true;
pg.view.playDBAnimation(this.ani_good, 'newAnimation', 1);
this._cantouch = false;
this.scheduleOnce(() => {
this._cantouch = true;
this.ani_good.active = false;
resolve('');
}, 1)
});
}
@property(cc.Node)
label_word: cc.Node = null;
@property(cc.Node)
ani_good: cc.Node = null;
@property(cc.Node)
ani_npc: cc.Node = null;
private npcAudioId: any;
showNpcAudioPlay() {
return new Promise((resolve, reject) => {
pg.view.playDBAnimation(this.ani_npc, 'newAnimation', 0);
pg.audio.playAudioByUrl(this.CurrentData.npcAudio, () => {
pg.view.playDBAnimation(this.ani_npc, 'newAnimation', 1);
this.npcAudioId = null;
resolve('');
}, audioId => {
this.npcAudioId = audioId;
})
});
}
showNpcAudioPlayEnd() {
if (this.npcAudioId) {
cc.audioEngine.stopEffect(this.npcAudioId)
this.npcAudioId = null;
}
}
// 停止录音
onTouchRecordRight() {
this.onTouchRecordEnd(false);
// 开始播放录音音频
}
// 停止播放录音
onTouchRecordStop() {
this.showRecorAudioPlayEnd().then(() => {
this.showNpcAudioPlay().then(() => {
this.showNpcAudioPlayEnd();
this.nextLayer();
})
})
}
// 手动播放录音
onTouchRecordPlay() {
if (!this._cantouch) return;
this.showRecorAudioPlay();
}
onPlayNpc() {
this.showNpcAudioPlayEnd();
this.showNpcAudioPlay().then(() => {
this.showNpcAudioPlayEnd();
this.nextLayer();
})
}
//按钮触发,使用的方法
async onTouchRecord() {
if (this.recording) return;
......@@ -298,7 +366,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.log("-----------------------startTest")
cc.audioEngine.stopAllEffects();
courseware && courseware.startTest(this.letter); //开始录音
courseware && courseware.startTest(''); //开始录音
}
async onTouchRecordEnd(isClear) {
if (!this.recording) return;
......@@ -337,86 +405,37 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
async recrodEnd(isClear, data) {
this.voiceTouchForbid = false;
this.recordAudio = data.audioUrl;
this.showData(data);
let score = data.result.overall;
this.log("---------------recrodEnd score:" + score)
this.recording = false;
if (isClear) return;
this.onRecorScore(score, data);
this.showRecorAudioPlay();
}
private recordAudioWord: string;
showData(data) {
let list = data.result.sentences[0].details;
// 列表处理
let str = "";
for (let i = 0; i < list.length; i++) {
let li = list[i];
let s = "";
s += li.word;
// if (li.overall > 40) {
// s = `<color=#000000>${li.word}</c>`
// } else {
// s = `<color=#FF0000> ${li.word} </c>`
// }
str += s;
}
this.recordAudioWord = str;
}
@property(cc.Node) item_ani: cc.Node = null;
@property(cc.Node) layout_ani: cc.Node = null;
@property(cc.Node) pos_tip: cc.Node = null;
onShowTipAni(score) {
this.onHideTipAni();
return new Promise(resolve => {
let item = pg.view.clone(this.item_ani);
item.active = true;
if (score < 10) {
pg.view.visible(pg.view.find(item, 'img_tryagain'), true)
pg.view.visible(pg.view.find(item, 'img_good'), false)
pg.view.visible(pg.view.find(item, 'img_excellent'), false)
} else if (score < 60) {
pg.view.visible(pg.view.find(item, 'img_tryagain'), false)
pg.view.visible(pg.view.find(item, 'img_good'), true)
pg.view.visible(pg.view.find(item, 'img_excellent'), false)
} else {
pg.view.visible(pg.view.find(item, 'img_tryagain'), false)
pg.view.visible(pg.view.find(item, 'img_good'), false)
pg.view.visible(pg.view.find(item, 'img_excellent'), true)
}
this.layout_ani.addChild(item);
let wordPos = this.pos_tip.convertToWorldSpaceAR(cc.v2(0, 0))
let nodePos = this.layout_ani.convertToNodeSpaceAR(wordPos);
cc.tween(item).to(0.3, { x: nodePos.x, y: nodePos.y })
.delay(0.15)
.call(() => {
resolve('')
}).start();
})
}
onHideTipAni() {
this.layout_ani.removeAllChildren();
}
onRecorScore(score, data) {
this.log("---------------onRecorScore flag|data|touchAuto:" + `${this.recordFlag}|${data}|${this.touchAuto}`)
if (score < 10) {
this.tempCount += 1;
if (this.tempCount == 2) {
this.addScore(1);
this.layer_tip.getComponent(LayoutTip).open(this.recordFlag, data, this.touchAuto).then(() => {
if (!this.touchAuto) return;
this.onShowTipAni(score).then(() => {
this.nextLayer();
})
})
} else {
this.layer_tip.getComponent(LayoutTip).open(this.recordFlag, data, this.touchAuto).then(() => {
this.onShowTipAni(score).then(() => {
this.onTouchRecord();
})
})
}
} else if (score < 60) {
this.addScore(2);
this.layer_tip.getComponent(LayoutTip).open(this.recordFlag, data, this.touchAuto).then(() => {
if (!this.touchAuto) return;
this.onShowTipAni(score).then(() => {
this.nextLayer();
})
})
} else {
this.addScore(3);
this.layer_tip.getComponent(LayoutTip).open(this.recordFlag, data, this.touchAuto).then(() => {
if (!this.touchAuto) return;
this.onShowTipAni(score).then(() => {
this.nextLayer();
})
})
}
}
//----------------------------------------Record-End---------------------------------
addScore(num) {
if (num >= 3 && this.scoreList[this.count] >= 3) {
......@@ -454,7 +473,6 @@ export default class SceneComponent extends MyCocosSceneComponent {
}, 1 / 3)
}
nextLayer() {
this.onHideTipAni();
this.touchForbid = true;
if (!this.NextData) {
this.gameOver();
......
......@@ -18,11 +18,15 @@ export const defaultData =
"content": "yes,It is Annie's apple tree.",
"right": false,
"imageBig": 3,
"audioName": "btn_hy01_danci.mp3"
"audioName": "btn_hy01_danci.mp3",
npcAudio: "http://staging-teach.cdn.ireadabc.com/7f617b30a5eb2a090234920500f9c7ce_l.mp3",
npcAudioName: "right_sn17_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
"content": "clound is cloud", "right": false, "audioName": "敲碎蛋的声音.mp3", "imageBig": 2,
npcAudio: "http://staging-teach.cdn.ireadabc.com/7f617b30a5eb2a090234920500f9c7ce_l.mp3",
npcAudioName: "right_sn17_danci.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"
}]
......
......@@ -147,7 +147,7 @@
</div>
</div>
<div class="option-audio" *ngIf="option.type=='img_audio' || option.type=='img_txt_audio'">
<div class="option-audio">
<span style="font-size: 20px;">题目音频:</span>
<div style="display: flex">
<div>
......@@ -162,6 +162,22 @@
</div>
</div>
</div>
<div class="option-audio">
<span style="font-size: 20px;">NPC音频:</span>
<div style="display: flex">
<div>
<app-audio-recorder [audioUrl]="option.npcAudio"
(audioUploaded)="onAudioUploadSuccess($event,'npcAudio',option,'npcAudioName')">
</app-audio-recorder>
</div>
<div style="margin: 5px">
<span>
{{ option.npcAudioName}}
</span>
</div>
</div>
</div>
<!-- <div class="option-time" *ngIf="item.recordFlag!='1'">
<div class="word-type-option-title">录音倒计时: </div>
<input type="number" nz-input [(ngModel)]="option.duration" (blur)="save()">
......
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