Commit ec2255ab authored by Tt's avatar Tt

app

parent 524f2cd2
......@@ -84,25 +84,25 @@
"__id__": 34
},
{
"__id__": 91
"__id__": 107
},
{
"__id__": 125
"__id__": 142
},
{
"__id__": 139
"__id__": 156
}
],
"_active": true,
"_components": [
{
"__id__": 160
"__id__": 177
},
{
"__id__": 161
"__id__": 178
},
{
"__id__": 162
"__id__": 179
}
],
"_prefab": null,
......@@ -1615,16 +1615,16 @@
"__id__": 35
},
{
"__id__": 65
"__id__": 73
},
{
"__id__": 83
"__id__": 99
}
],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 106
}
],
"_prefab": null,
......@@ -1687,10 +1687,7 @@
"__id__": 36
},
{
"__id__": 38
},
{
"__id__": 40
"__id__": 39
},
{
"__id__": 42
......@@ -1724,12 +1721,24 @@
},
{
"__id__": 62
},
{
"__id__": 64
},
{
"__id__": 66
},
{
"__id__": 68
},
{
"__id__": 70
}
],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 72
}
],
"_prefab": null,
......@@ -1782,7 +1791,7 @@
},
{
"__type__": "cc.Node",
"_name": "bg_build",
"_name": "bg_grass",
"_objFlags": 0,
"_parent": {
"__id__": 35
......@@ -1792,6 +1801,9 @@
"_components": [
{
"__id__": 37
},
{
"__id__": 38
}
],
"_prefab": null,
......@@ -1805,8 +1817,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 638,
"height": 872
"width": 1920,
"height": 136
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1817,8 +1829,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
407.949,
430.109,
0,
0,
0,
0,
0,
......@@ -1840,7 +1852,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "b8mrD4po9ANrdP+9/20ccI"
"_id": "9e2cXLsIxMa76ep8SNVIk8"
},
{
"__type__": "cc.Sprite",
......@@ -1858,7 +1870,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "64d8abe1-5325-4517-b84d-439b054b9a8c"
"__uuid__": "dd1f4e00-0c23-4234-a3aa-02b0c037220f"
},
"_type": 0,
"_sizeMode": 1,
......@@ -1872,11 +1884,38 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "77a5qqUT9A8r8whCQsLXPm"
"_id": "10n2wfFRBPkpKVhh9aH2Rh"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 0,
"_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": 1920,
"_originalHeight": 0,
"_id": "27NoG5EQZDr5iauH+Xhlsb"
},
{
"__type__": "cc.Node",
"_name": "bg_line",
"_name": "bg_grass",
"_objFlags": 0,
"_parent": {
"__id__": 35
......@@ -1885,7 +1924,10 @@
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 40
},
{
"__id__": 41
}
],
"_prefab": null,
......@@ -1900,7 +1942,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1920,
"height": 69
"height": 136
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1911,8 +1953,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-1241.538,
0,
-95.37,
0,
0,
0,
......@@ -1934,14 +1976,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "4f2Wb+GIFBYYkSO6lwlU9k"
"_id": "b3gy9kG7xEurs+dgIPgptF"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 39
},
"_enabled": true,
"_materials": [
......@@ -1952,7 +1994,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "1444b8d8-f715-445d-b84d-1d97b7da8d62"
"__uuid__": "dd1f4e00-0c23-4234-a3aa-02b0c037220f"
},
"_type": 0,
"_sizeMode": 1,
......@@ -1966,11 +2008,38 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "08Ycf2SbZDWaPnM+c/2QxD"
"_id": "17+K1vmg1DiqRJMgqJlr/z"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 0,
"_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": 1920,
"_originalHeight": 0,
"_id": "b0rFxRjOJMI5bdEE9uisdT"
},
{
"__type__": "cc.Node",
"_name": "fire_0",
"_name": "bg_build",
"_objFlags": 0,
"_parent": {
"__id__": 35
......@@ -1979,7 +2048,7 @@
"_active": true,
"_components": [
{
"__id__": 41
"__id__": 43
}
],
"_prefab": null,
......@@ -1993,8 +2062,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 133,
"height": 140
"width": 638,
"height": 872
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2005,8 +2074,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
226.751,
137.191,
407.949,
430.109,
0,
0,
0,
......@@ -2028,14 +2097,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "b2V7Rc9rZJ3aQ1cd5u38A8"
"_id": "b8mrD4po9ANrdP+9/20ccI"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 42
},
"_enabled": true,
"_materials": [
......@@ -2043,36 +2112,28 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "armatureName",
"_animationName": "燃烧",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "e226f3f0-4696-4c2b-9e33-a7764ed6fe55#8357ac13-87df-4cc1-9564-c8037fb215aa",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "e226f3f0-4696-4c2b-9e33-a7764ed6fe55"
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "64d8abe1-5325-4517-b84d-439b054b9a8c"
},
"_N$dragonAtlasAsset": {
"__uuid__": "8357ac13-87df-4cc1-9564-c8037fb215aa"
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "10/zPECrxOUqrIq+YNC73b"
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "77a5qqUT9A8r8whCQsLXPm"
},
{
"__type__": "cc.Node",
"_name": "fire_1",
"_name": "bg_line",
"_objFlags": 0,
"_parent": {
"__id__": 35
......@@ -2081,7 +2142,7 @@
"_active": true,
"_components": [
{
"__id__": 43
"__id__": 45
}
],
"_prefab": null,
......@@ -2095,8 +2156,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 133,
"height": 140
"width": 1920,
"height": 69
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2107,8 +2168,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
226.751,
324.969,
0,
-95.37,
0,
0,
0,
......@@ -2130,14 +2191,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "f9vXdPCclFKrgbgYKIPv/P"
"_id": "4f2Wb+GIFBYYkSO6lwlU9k"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 44
},
"_enabled": true,
"_materials": [
......@@ -2145,36 +2206,28 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "armatureName",
"_animationName": "燃烧",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "e226f3f0-4696-4c2b-9e33-a7764ed6fe55#8357ac13-87df-4cc1-9564-c8037fb215aa",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "e226f3f0-4696-4c2b-9e33-a7764ed6fe55"
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "1444b8d8-f715-445d-b84d-1d97b7da8d62"
},
"_N$dragonAtlasAsset": {
"__uuid__": "8357ac13-87df-4cc1-9564-c8037fb215aa"
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "7foxBNe2hLpblwJ8W/qLAo"
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "08Ycf2SbZDWaPnM+c/2QxD"
},
{
"__type__": "cc.Node",
"_name": "fire_2",
"_name": "bg_line",
"_objFlags": 0,
"_parent": {
"__id__": 35
......@@ -2183,7 +2236,7 @@
"_active": true,
"_components": [
{
"__id__": 45
"__id__": 47
}
],
"_prefab": null,
......@@ -2197,8 +2250,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 133,
"height": 140
"width": 1920,
"height": 69
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2209,8 +2262,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
226.751,
509.624,
-1250.427,
-95.37,
0,
0,
0,
......@@ -2232,14 +2285,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "40G2VU+ZhPwbcKxKKPCpPE"
"_id": "06vUuE8PlCg7RW9C5KXufJ"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 46
},
"_enabled": true,
"_materials": [
......@@ -2247,17 +2300,111 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "armatureName",
"_animationName": "燃烧",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "e226f3f0-4696-4c2b-9e33-a7764ed6fe55#8357ac13-87df-4cc1-9564-c8037fb215aa",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "1444b8d8-f715-445d-b84d-1d97b7da8d62"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "f0jgrn1QhHsqlaVsHqvg1R"
},
{
"__type__": "cc.Node",
"_name": "fire_0",
"_objFlags": 0,
"_parent": {
"__id__": 35
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 49
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 133,
"height": 140
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
226.751,
137.191,
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": "b2V7Rc9rZJ3aQ1cd5u38A8"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "armatureName",
"_animationName": "燃烧",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "e226f3f0-4696-4c2b-9e33-a7764ed6fe55#8357ac13-87df-4cc1-9564-c8037fb215aa",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
......@@ -2272,11 +2419,11 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "0b8BB1wqxKMIi1/NKaITWr"
"_id": "10/zPECrxOUqrIq+YNC73b"
},
{
"__type__": "cc.Node",
"_name": "fire_3",
"_name": "fire_1",
"_objFlags": 0,
"_parent": {
"__id__": 35
......@@ -2285,7 +2432,7 @@
"_active": true,
"_components": [
{
"__id__": 47
"__id__": 51
}
],
"_prefab": null,
......@@ -2311,8 +2458,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
441.094,
137.914,
226.751,
324.969,
0,
0,
0,
......@@ -2334,14 +2481,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "13wKm1qLVCRYPmlYgziggm"
"_id": "f9vXdPCclFKrgbgYKIPv/P"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 50
},
"_enabled": true,
"_materials": [
......@@ -2374,11 +2521,11 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "ee9t2ycAlIF7O+lKaUPe8j"
"_id": "7foxBNe2hLpblwJ8W/qLAo"
},
{
"__type__": "cc.Node",
"_name": "fire_4",
"_name": "fire_2",
"_objFlags": 0,
"_parent": {
"__id__": 35
......@@ -2387,7 +2534,7 @@
"_active": true,
"_components": [
{
"__id__": 49
"__id__": 53
}
],
"_prefab": null,
......@@ -2413,8 +2560,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
441.094,
324.81,
226.751,
509.624,
0,
0,
0,
......@@ -2436,14 +2583,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "d32sOgHeBE7bjggLKeT71q"
"_id": "40G2VU+ZhPwbcKxKKPCpPE"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 52
},
"_enabled": true,
"_materials": [
......@@ -2476,11 +2623,11 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "446a8eozpKa65gnlHpPXvj"
"_id": "0b8BB1wqxKMIi1/NKaITWr"
},
{
"__type__": "cc.Node",
"_name": "fire_5",
"_name": "fire_3",
"_objFlags": 0,
"_parent": {
"__id__": 35
......@@ -2489,7 +2636,7 @@
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 55
}
],
"_prefab": null,
......@@ -2516,7 +2663,7 @@
"ctor": "Float64Array",
"array": [
441.094,
511.81,
137.914,
0,
0,
0,
......@@ -2538,14 +2685,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "48Y1XZLU5H3LajAuNdvf0X"
"_id": "13wKm1qLVCRYPmlYgziggm"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 54
},
"_enabled": true,
"_materials": [
......@@ -2578,20 +2725,20 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "9cLMJk6kVFVrz/3wy0yqLc"
"_id": "ee9t2ycAlIF7O+lKaUPe8j"
},
{
"__type__": "cc.Node",
"_name": "water_0",
"_name": "fire_4",
"_objFlags": 0,
"_parent": {
"__id__": 35
},
"_children": [],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 57
}
],
"_prefab": null,
......@@ -2605,8 +2752,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 60,
"height": 65
"width": 133,
"height": 140
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2617,8 +2764,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
270.265,
72.634,
441.094,
324.81,
0,
0,
0,
......@@ -2640,14 +2787,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "14IBu8j9dJc5+RkEGiK7yw"
"_id": "d32sOgHeBE7bjggLKeT71q"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 56
},
"_enabled": true,
"_materials": [
......@@ -2656,12 +2803,12 @@
}
],
"_armatureName": "armatureName",
"_animationName": "流水",
"_animationName": "燃烧",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "8ddb17c3-bac2-4fe0-8eeb-77ca84e61b40#d28f5379-1415-4082-895c-45474006c97d",
"_armatureKey": "e226f3f0-4696-4c2b-9e33-a7764ed6fe55#8357ac13-87df-4cc1-9564-c8037fb215aa",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
......@@ -2669,10 +2816,10 @@
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "8ddb17c3-bac2-4fe0-8eeb-77ca84e61b40"
"__uuid__": "e226f3f0-4696-4c2b-9e33-a7764ed6fe55"
},
"_N$dragonAtlasAsset": {
"__uuid__": "d28f5379-1415-4082-895c-45474006c97d"
"__uuid__": "8357ac13-87df-4cc1-9564-c8037fb215aa"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
......@@ -2680,20 +2827,20 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "3eHh/iaABLhrGcSooxTfnK"
"_id": "446a8eozpKa65gnlHpPXvj"
},
{
"__type__": "cc.Node",
"_name": "water_1",
"_name": "fire_5",
"_objFlags": 0,
"_parent": {
"__id__": 35
},
"_children": [],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 59
}
],
"_prefab": null,
......@@ -2707,8 +2854,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 60,
"height": 65
"width": 133,
"height": 140
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2719,8 +2866,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
269.363,
261.985,
441.094,
511.81,
0,
0,
0,
......@@ -2742,14 +2889,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "48H8tVAIFGa5gS5vOEtKE6"
"_id": "48Y1XZLU5H3LajAuNdvf0X"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 58
},
"_enabled": true,
"_materials": [
......@@ -2758,12 +2905,12 @@
}
],
"_armatureName": "armatureName",
"_animationName": "流水",
"_animationName": "燃烧",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "8ddb17c3-bac2-4fe0-8eeb-77ca84e61b40#d28f5379-1415-4082-895c-45474006c97d",
"_armatureKey": "e226f3f0-4696-4c2b-9e33-a7764ed6fe55#8357ac13-87df-4cc1-9564-c8037fb215aa",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
......@@ -2771,10 +2918,10 @@
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "8ddb17c3-bac2-4fe0-8eeb-77ca84e61b40"
"__uuid__": "e226f3f0-4696-4c2b-9e33-a7764ed6fe55"
},
"_N$dragonAtlasAsset": {
"__uuid__": "d28f5379-1415-4082-895c-45474006c97d"
"__uuid__": "8357ac13-87df-4cc1-9564-c8037fb215aa"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
......@@ -2782,11 +2929,11 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "f00PM54zBNm6e4gQYZZWji"
"_id": "9cLMJk6kVFVrz/3wy0yqLc"
},
{
"__type__": "cc.Node",
"_name": "water_2",
"_name": "water_0",
"_objFlags": 0,
"_parent": {
"__id__": 35
......@@ -2795,7 +2942,7 @@
"_active": false,
"_components": [
{
"__id__": 57
"__id__": 61
}
],
"_prefab": null,
......@@ -2821,8 +2968,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
269.363,
449.196,
270.265,
72.634,
0,
0,
0,
......@@ -2844,14 +2991,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "f82S7SeK5MiKOqJg8isHf2"
"_id": "14IBu8j9dJc5+RkEGiK7yw"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
"__id__": 60
},
"_enabled": true,
"_materials": [
......@@ -2884,11 +3031,11 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "b72yMj7/NPuIwdkhFdCSDr"
"_id": "3eHh/iaABLhrGcSooxTfnK"
},
{
"__type__": "cc.Node",
"_name": "water_3",
"_name": "water_1",
"_objFlags": 0,
"_parent": {
"__id__": 35
......@@ -2897,7 +3044,7 @@
"_active": false,
"_components": [
{
"__id__": 59
"__id__": 63
}
],
"_prefab": null,
......@@ -2923,8 +3070,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
477.463,
72.99,
269.363,
261.985,
0,
0,
0,
......@@ -2946,14 +3093,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "9dhLN+kiJCmbzxUPVSt9pF"
"_id": "48H8tVAIFGa5gS5vOEtKE6"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 62
},
"_enabled": true,
"_materials": [
......@@ -2986,11 +3133,11 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "e9z9pi/zhI4oPNl5r2LDH0"
"_id": "f00PM54zBNm6e4gQYZZWji"
},
{
"__type__": "cc.Node",
"_name": "water_4",
"_name": "water_2",
"_objFlags": 0,
"_parent": {
"__id__": 35
......@@ -2999,7 +3146,7 @@
"_active": false,
"_components": [
{
"__id__": 61
"__id__": 65
}
],
"_prefab": null,
......@@ -3025,8 +3172,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
477.463,
261.201,
269.363,
449.196,
0,
0,
0,
......@@ -3048,14 +3195,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "d5eB3wiZRC1ZLUTabtx7Pu"
"_id": "f82S7SeK5MiKOqJg8isHf2"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -3088,11 +3235,11 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "119CQQdINF8J2AA9arJGoH"
"_id": "b72yMj7/NPuIwdkhFdCSDr"
},
{
"__type__": "cc.Node",
"_name": "water_5",
"_name": "water_3",
"_objFlags": 0,
"_parent": {
"__id__": 35
......@@ -3101,7 +3248,7 @@
"_active": false,
"_components": [
{
"__id__": 63
"__id__": 67
}
],
"_prefab": null,
......@@ -3128,7 +3275,7 @@
"ctor": "Float64Array",
"array": [
477.463,
448.722,
72.99,
0,
0,
0,
......@@ -3150,14 +3297,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "beI4qY6WhB5YoD1PwAR4MQ"
"_id": "9dhLN+kiJCmbzxUPVSt9pF"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 66
},
"_enabled": true,
"_materials": [
......@@ -3190,15 +3337,407 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "88j/AGggRKNZkE8W2HPhju"
"_id": "e9z9pi/zhI4oPNl5r2LDH0"
},
{
"__type__": "cc.Sprite",
"__type__": "cc.Node",
"_name": "water_4",
"_objFlags": 0,
"_parent": {
"__id__": 35
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 69
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 60,
"height": 65
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
477.463,
261.201,
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": "d5eB3wiZRC1ZLUTabtx7Pu"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "armatureName",
"_animationName": "流水",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "8ddb17c3-bac2-4fe0-8eeb-77ca84e61b40#d28f5379-1415-4082-895c-45474006c97d",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "8ddb17c3-bac2-4fe0-8eeb-77ca84e61b40"
},
"_N$dragonAtlasAsset": {
"__uuid__": "d28f5379-1415-4082-895c-45474006c97d"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "119CQQdINF8J2AA9arJGoH"
},
{
"__type__": "cc.Node",
"_name": "water_5",
"_objFlags": 0,
"_parent": {
"__id__": 35
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 71
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 60,
"height": 65
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
477.463,
448.722,
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": "beI4qY6WhB5YoD1PwAR4MQ"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "armatureName",
"_animationName": "流水",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "8ddb17c3-bac2-4fe0-8eeb-77ca84e61b40#d28f5379-1415-4082-895c-45474006c97d",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "8ddb17c3-bac2-4fe0-8eeb-77ca84e61b40"
},
"_N$dragonAtlasAsset": {
"__uuid__": "d28f5379-1415-4082-895c-45474006c97d"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "88j/AGggRKNZkE8W2HPhju"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 0,
"_left": 0,
"_right": 0,
"_top": 882,
"_bottom": 62,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1920,
"_originalHeight": 136,
"_id": "e4hUhc3z1E9InrVsH5SbN0"
},
{
"__type__": "cc.Node",
"_name": "build_2",
"_objFlags": 0,
"_parent": {
"__id__": 34
},
"_children": [
{
"__id__": 74
},
{
"__id__": 77
},
{
"__id__": 80
},
{
"__id__": 82
},
{
"__id__": 84
},
{
"__id__": 86
},
{
"__id__": 88
},
{
"__id__": 90
},
{
"__id__": 92
},
{
"__id__": 94
},
{
"__id__": 96
}
],
"_active": true,
"_components": [
{
"__id__": 98
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1920,
"height": 136
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
1920,
-410,
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": "0c19oqfzpAHqRhqOMlnevj"
},
{
"__type__": "cc.Node",
"_name": "bg_grass",
"_objFlags": 0,
"_parent": {
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
},
{
"__id__": 76
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1920,
"height": 136
},
"_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": "92CM1dKV1LnaTLoRa+eC40"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
},
"_enabled": true,
"_materials": [
{
......@@ -3211,7 +3750,7 @@
"__uuid__": "dd1f4e00-0c23-4234-a3aa-02b0c037220f"
},
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -3222,45 +3761,171 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "15KHfHnVNDbITilk2XHw4m"
"_id": "b6g3EWB29OLY+SY/hWOKoa"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 44,
"_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": 1920,
"_originalHeight": 0,
"_id": "5bxe4K2YVPY6xCuKIxWtAo"
},
{
"__type__": "cc.Node",
"_name": "build_2",
"_name": "bg_grass",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 73
},
"_children": [
"_children": [],
"_active": true,
"_components": [
{
"__id__": 66
"__id__": 78
},
{
"__id__": 68
"__id__": 79
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1919.9999999999998,
"height": 136
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
1203.0419999999995,
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": "77sOTa0otDBql9eXyhnBLW"
},
{
"__id__": 70
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "dd1f4e00-0c23-4234-a3aa-02b0c037220f"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
{
"__id__": 72
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "8cllg/tZhFCZrZ2B6s2wZg"
},
{
"__id__": 74
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
},
{
"__id__": 76
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 44,
"_left": 1203.0419999999997,
"_right": -1203.0419999999997,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1920,
"_originalHeight": 0,
"_id": "e6r9E9qMBG75F4CT4mI7Nd"
},
{
"__id__": 78
"__type__": "cc.Node",
"_name": "bg_build",
"_objFlags": 0,
"_parent": {
"__id__": 73
},
{
"__id__": 80
}
],
"_children": [],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 81
}
],
"_prefab": null,
......@@ -3274,8 +3939,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1920,
"height": 136
"width": 638,
"height": 872
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -3286,8 +3951,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
1920,
-410,
407.949,
430.109,
0,
0,
0,
......@@ -3309,20 +3974,52 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "0c19oqfzpAHqRhqOMlnevj"
"_id": "c2udCD6d1B0JnI5W761w6T"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "64d8abe1-5325-4517-b84d-439b054b9a8c"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b89+GlDKNLF5Xi1ZI5GCRT"
},
{
"__type__": "cc.Node",
"_name": "bg_build",
"_name": "bg_line",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 67
"__id__": 83
}
],
"_prefab": null,
......@@ -3336,8 +4033,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 638,
"height": 872
"width": 1920,
"height": 69
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -3348,8 +4045,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
407.949,
430.109,
1202.58,
-95.37,
0,
0,
0,
......@@ -3371,14 +4068,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "c2udCD6d1B0JnI5W761w6T"
"_id": "4eJ+9NA2pHIKe1RO7ZYn2H"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 82
},
"_enabled": true,
"_materials": [
......@@ -3389,7 +4086,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "64d8abe1-5325-4517-b84d-439b054b9a8c"
"__uuid__": "1444b8d8-f715-445d-b84d-1d97b7da8d62"
},
"_type": 0,
"_sizeMode": 1,
......@@ -3403,20 +4100,20 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b89+GlDKNLF5Xi1ZI5GCRT"
"_id": "68r5K73rZLdJ9myeAV47cH"
},
{
"__type__": "cc.Node",
"_name": "bg_line",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 85
}
],
"_prefab": null,
......@@ -3472,7 +4169,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 84
},
"_enabled": true,
"_materials": [
......@@ -3504,13 +4201,13 @@
"_name": "fire_0",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 87
}
],
"_prefab": null,
......@@ -3566,7 +4263,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 86
},
"_enabled": true,
"_materials": [
......@@ -3606,13 +4303,13 @@
"_name": "fire_1",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 73
"__id__": 89
}
],
"_prefab": null,
......@@ -3668,7 +4365,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -3708,13 +4405,13 @@
"_name": "fire_2",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 91
}
],
"_prefab": null,
......@@ -3770,7 +4467,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -3810,13 +4507,13 @@
"_name": "fire_3",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 93
}
],
"_prefab": null,
......@@ -3872,7 +4569,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 92
},
"_enabled": true,
"_materials": [
......@@ -3912,13 +4609,13 @@
"_name": "fire_4",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 79
"__id__": 95
}
],
"_prefab": null,
......@@ -3974,7 +4671,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4014,13 +4711,13 @@
"_name": "fire_5",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 81
"__id__": 97
}
],
"_prefab": null,
......@@ -4076,7 +4773,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 96
},
"_enabled": true,
"_materials": [
......@@ -4112,36 +4809,31 @@
"_id": "8ao/w7AdBPDaxYyu5cNUHW"
},
{
"__type__": "cc.Sprite",
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 73
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "dd1f4e00-0c23-4234-a3aa-02b0c037220f"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "345uqibDRH1o7/nxNdEppt"
"alignMode": 1,
"_target": null,
"_alignFlags": 0,
"_left": 1920,
"_right": -1920,
"_top": 882,
"_bottom": 62,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1920,
"_originalHeight": 136,
"_id": "9eKhaaLA1Jl7xKfxbSlbIS"
},
{
"__type__": "cc.Node",
......@@ -4152,13 +4844,13 @@
},
"_children": [
{
"__id__": 84
"__id__": 100
},
{
"__id__": 86
"__id__": 102
},
{
"__id__": 88
"__id__": 104
}
],
"_active": true,
......@@ -4216,13 +4908,13 @@
"_name": "firewater",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 101
}
],
"_prefab": null,
......@@ -4278,7 +4970,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 100
},
"_enabled": true,
"_materials": [
......@@ -4318,13 +5010,13 @@
"_name": "car",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 87
"__id__": 103
}
],
"_prefab": null,
......@@ -4380,7 +5072,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 102
},
"_enabled": true,
"_materials": [
......@@ -4420,13 +5112,13 @@
"_name": "btn_finger",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 89
"__id__": 105
}
],
"_prefab": null,
......@@ -4482,7 +5174,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
"__id__": 104
},
"_enabled": true,
"_materials": [
......@@ -4545,40 +5237,40 @@
},
"_children": [
{
"__id__": 92
"__id__": 108
},
{
"__id__": 96
"__id__": 112
},
{
"__id__": 98
"__id__": 114
},
{
"__id__": 110
"__id__": 127
},
{
"__id__": 112
"__id__": 129
},
{
"__id__": 114
"__id__": 131
},
{
"__id__": 116
"__id__": 133
},
{
"__id__": 118
"__id__": 135
},
{
"__id__": 120
"__id__": 137
},
{
"__id__": 122
"__id__": 139
}
],
"_active": true,
"_components": [
{
"__id__": 124
"__id__": 141
}
],
"_prefab": null,
......@@ -4634,19 +5326,19 @@
"_name": "gray",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 93
"__id__": 109
},
{
"__id__": 94
"__id__": 110
},
{
"__id__": 95
"__id__": 111
}
],
"_prefab": null,
......@@ -4702,7 +5394,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 108
},
"_enabled": true,
"_materials": [
......@@ -4734,7 +5426,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 108
},
"_enabled": true,
"alignMode": 1,
......@@ -4761,7 +5453,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 108
},
"_enabled": true,
"_id": "aaLLTNJ4JCrLs1MiLwHmnN"
......@@ -4771,13 +5463,13 @@
"_name": "btn_close",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 97
"__id__": 113
}
],
"_prefab": null,
......@@ -4833,7 +5525,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 112
},
"_enabled": true,
"_materials": [
......@@ -4865,29 +5557,29 @@
"_name": "bg_card",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 107
},
"_children": [
{
"__id__": 99
"__id__": 115
},
{
"__id__": 101
"__id__": 117
},
{
"__id__": 103
"__id__": 120
},
{
"__id__": 105
"__id__": 122
},
{
"__id__": 107
"__id__": 124
}
],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 126
}
],
"_prefab": null,
......@@ -4943,13 +5635,13 @@
"_name": "bg_title",
"_objFlags": 0,
"_parent": {
"__id__": 98
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 116
}
],
"_prefab": null,
......@@ -5005,7 +5697,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 115
},
"_enabled": true,
"_materials": [
......@@ -5037,13 +5729,16 @@
"_name": "btn_voice",
"_objFlags": 0,
"_parent": {
"__id__": 98
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 102
"__id__": 118
},
{
"__id__": 119
}
],
"_prefab": null,
......@@ -5078,7 +5773,7 @@
1,
1,
1,
1
0
]
},
"_eulerAngles": {
......@@ -5099,7 +5794,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 117
},
"_enabled": true,
"_materials": [
......@@ -5126,18 +5821,86 @@
"_atlas": null,
"_id": "e5lDG3ijdHaIGpvW8oTozv"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 3,
"transition": 3,
"_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": "3fVYS7hOlPApzzRHjoVbcd"
},
{
"__type__": "cc.Node",
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 98
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 104
"__id__": 121
}
],
"_prefab": null,
......@@ -5193,7 +5956,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 120
},
"_enabled": true,
"_materials": [
......@@ -5225,13 +5988,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 98
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 106
"__id__": 123
}
],
"_prefab": null,
......@@ -5287,7 +6050,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 122
},
"_enabled": true,
"_materials": [
......@@ -5297,13 +6060,15 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "apple",
"_N$string": "apple",
"_string": "fire",
"_N$string": "fire",
"_fontSize": 130,
"_lineHeight": 130,
"_enableWrapText": false,
"_N$file": null,
"_isSystemFontUsed": true,
"_N$file": {
"__uuid__": "23f9661e-5c67-41a5-abdf-65a4b99ef31b"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
......@@ -5320,13 +6085,13 @@
"_name": "label_progress",
"_objFlags": 0,
"_parent": {
"__id__": 98
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 108
"__id__": 125
}
],
"_prefab": null,
......@@ -5382,7 +6147,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 124
},
"_enabled": true,
"_materials": [
......@@ -5415,7 +6180,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 114
},
"_enabled": true,
"_materials": [
......@@ -5447,13 +6212,13 @@
"_name": "btn_start",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 111
"__id__": 128
}
],
"_prefab": null,
......@@ -5509,7 +6274,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 110
"__id__": 127
},
"_enabled": true,
"_materials": [
......@@ -5541,13 +6306,13 @@
"_name": "btn_start_reset",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 113
"__id__": 130
}
],
"_prefab": null,
......@@ -5603,7 +6368,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
"__id__": 129
},
"_enabled": true,
"_materials": [
......@@ -5635,13 +6400,13 @@
"_name": "btn_stop",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 115
"__id__": 132
}
],
"_prefab": null,
......@@ -5697,7 +6462,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 131
},
"_enabled": true,
"_materials": [
......@@ -5729,13 +6494,13 @@
"_name": "btn_record_replay",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 117
"__id__": 134
}
],
"_prefab": null,
......@@ -5791,7 +6556,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 133
},
"_enabled": true,
"_materials": [
......@@ -5823,13 +6588,13 @@
"_name": "btn_record_0",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 119
"__id__": 136
}
],
"_prefab": null,
......@@ -5885,7 +6650,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 135
},
"_enabled": true,
"_materials": [
......@@ -5917,13 +6682,13 @@
"_name": "btn_record_1",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 121
"__id__": 138
}
],
"_prefab": null,
......@@ -5979,7 +6744,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
"__id__": 137
},
"_enabled": true,
"_materials": [
......@@ -6011,13 +6776,13 @@
"_name": "btn_record_2",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 123
"__id__": 140
}
],
"_prefab": null,
......@@ -6073,7 +6838,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 122
"__id__": 139
},
"_enabled": true,
"_materials": [
......@@ -6105,7 +6870,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
"__id__": 107
},
"_enabled": true,
"alignMode": 1,
......@@ -6136,25 +6901,25 @@
},
"_children": [
{
"__id__": 126
"__id__": 143
},
{
"__id__": 130
"__id__": 147
},
{
"__id__": 132
"__id__": 149
},
{
"__id__": 134
"__id__": 151
},
{
"__id__": 136
"__id__": 153
}
],
"_active": false,
"_components": [
{
"__id__": 138
"__id__": 155
}
],
"_prefab": null,
......@@ -6210,19 +6975,19 @@
"_name": "gray",
"_objFlags": 0,
"_parent": {
"__id__": 125
"__id__": 142
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 127
"__id__": 144
},
{
"__id__": 128
"__id__": 145
},
{
"__id__": 129
"__id__": 146
}
],
"_prefab": null,
......@@ -6278,7 +7043,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 143
},
"_enabled": true,
"_materials": [
......@@ -6310,7 +7075,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 143
},
"_enabled": true,
"alignMode": 1,
......@@ -6337,7 +7102,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 143
},
"_enabled": true,
"_id": "06Mffqf45GhK4NFe0w8hTw"
......@@ -6347,13 +7112,13 @@
"_name": "ani_comeon",
"_objFlags": 0,
"_parent": {
"__id__": 125
"__id__": 142
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 131
"__id__": 148
}
],
"_prefab": null,
......@@ -6409,7 +7174,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 130
"__id__": 147
},
"_enabled": true,
"_materials": [
......@@ -6449,13 +7214,13 @@
"_name": "ani_excellent",
"_objFlags": 0,
"_parent": {
"__id__": 125
"__id__": 142
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 133
"__id__": 150
}
],
"_prefab": null,
......@@ -6511,7 +7276,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 149
},
"_enabled": true,
"_materials": [
......@@ -6551,13 +7316,13 @@
"_name": "ani_nice",
"_objFlags": 0,
"_parent": {
"__id__": 125
"__id__": 142
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 135
"__id__": 152
}
],
"_prefab": null,
......@@ -6613,7 +7378,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 151
},
"_enabled": true,
"_materials": [
......@@ -6653,13 +7418,13 @@
"_name": "ani_tryagain",
"_objFlags": 0,
"_parent": {
"__id__": 125
"__id__": 142
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 137
"__id__": 154
}
],
"_prefab": null,
......@@ -6715,7 +7480,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 136
"__id__": 153
},
"_enabled": true,
"_materials": [
......@@ -6755,7 +7520,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 125
"__id__": 142
},
"_enabled": true,
"alignMode": 1,
......@@ -6786,19 +7551,19 @@
},
"_children": [
{
"__id__": 140
"__id__": 157
},
{
"__id__": 144
"__id__": 161
},
{
"__id__": 148
"__id__": 165
},
{
"__id__": 152
"__id__": 169
},
{
"__id__": 156
"__id__": 173
}
],
"_active": false,
......@@ -6856,11 +7621,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 156
},
"_children": [
{
"__id__": 141
"__id__": 158
}
],
"_active": true,
......@@ -6918,11 +7683,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 157
},
"_children": [
{
"__id__": 142
"__id__": 159
}
],
"_active": true,
......@@ -6980,13 +7745,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 158
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 143
"__id__": 160
}
],
"_prefab": null,
......@@ -7042,7 +7807,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 159
},
"_enabled": true,
"_materials": [
......@@ -7072,11 +7837,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 156
},
"_children": [
{
"__id__": 145
"__id__": 162
}
],
"_active": true,
......@@ -7134,11 +7899,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 144
"__id__": 161
},
"_children": [
{
"__id__": 146
"__id__": 163
}
],
"_active": true,
......@@ -7196,13 +7961,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 145
"__id__": 162
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 147
"__id__": 164
}
],
"_prefab": null,
......@@ -7258,7 +8023,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
"__id__": 163
},
"_enabled": true,
"_materials": [
......@@ -7288,11 +8053,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 156
},
"_children": [
{
"__id__": 149
"__id__": 166
}
],
"_active": true,
......@@ -7350,11 +8115,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 148
"__id__": 165
},
"_children": [
{
"__id__": 150
"__id__": 167
}
],
"_active": true,
......@@ -7412,13 +8177,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 149
"__id__": 166
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 151
"__id__": 168
}
],
"_prefab": null,
......@@ -7474,7 +8239,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 167
},
"_enabled": true,
"_materials": [
......@@ -7504,11 +8269,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 156
},
"_children": [
{
"__id__": 153
"__id__": 170
}
],
"_active": true,
......@@ -7566,11 +8331,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 152
"__id__": 169
},
"_children": [
{
"__id__": 154
"__id__": 171
}
],
"_active": true,
......@@ -7628,13 +8393,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 153
"__id__": 170
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 155
"__id__": 172
}
],
"_prefab": null,
......@@ -7690,7 +8455,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 171
},
"_enabled": true,
"_materials": [
......@@ -7720,11 +8485,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 156
},
"_children": [
{
"__id__": 157
"__id__": 174
}
],
"_active": true,
......@@ -7782,11 +8547,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 156
"__id__": 173
},
"_children": [
{
"__id__": 158
"__id__": 175
}
],
"_active": true,
......@@ -7844,13 +8609,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 157
"__id__": 174
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 159
"__id__": 176
}
],
"_prefab": null,
......@@ -7906,7 +8671,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 158
"__id__": 175
},
"_enabled": true,
"_materials": [
......@@ -7987,31 +8752,31 @@
"__id__": 34
},
"layout_tip": {
"__id__": 125
"__id__": 142
},
"layout_speak": {
"__id__": 91
"__id__": 107
},
"node_firetruck": {
"__id__": 83
"__id__": 99
},
"node_firetruck_anim": {
"__id__": 86
"__id__": 102
},
"node_firetruck_flush": {
"__id__": 84
"__id__": 100
},
"btn_finger": {
"__id__": 88
"__id__": 104
},
"page_a": {
"__id__": 35
},
"page_b": {
"__id__": 65
"__id__": 73
},
"btn_close": {
"__id__": 96
"__id__": 112
},
"_id": "db3L+4L+FH/5MIRcKcfiq+"
}
......
......@@ -673,6 +673,11 @@ export default class SceneComponent extends MyCocosSceneComponent {
// 设置进度显示
this.renderProgressLabel(label_progress);
}
onTouchVoice() {
// 使用pg.ts的API播放音频
const currentData = this.currentFireNode.data;
pg.audio.playAudioByUrl(currentData.audioUrl);
}
/**
* 处理语音按钮的显示和事件绑定
......@@ -684,10 +689,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
// 如果数据中有audio,显示语音按钮
pg.view.visible(btn_voice, true);
// 绑定点击事件播放音频
pg.view.touchOn(btn_voice, () => {
// 使用pg.ts的API播放音频
pg.audio.playAudioByUrl(currentData.audioUrl);
}, this);
pg.view.touchOn(btn_voice, this.onTouchVoice, this);
} else {
// 没有音频则隐藏按钮
pg.view.visible(btn_voice, false);
......@@ -791,7 +793,17 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.stopVoiceAni();
}
}
onTouchSpeakClose() {
private onTouchSpeakCloseClosing: boolean;
async onTouchSpeakClose() {
if (this.onTouchSpeakCloseClosing) return;
this.onTouchSpeakCloseClosing = true;
// 检查是否在录音状态
const btn_stop = pg.view.find(this.layout_speak, 'btn_stop');
if (btn_stop && btn_stop.active) {
// 如果在录音状态,先执行停止录音操作
await this.onTouchRecordEnd()
}
this.onTouchSpeakCloseClosing = false;
this.showCard(false);
// 获取最后一次录音数据
......@@ -934,6 +946,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
* 停止倒计时,显示播放和重新录制按钮,结束录音
*/
private onTouchRecordEnd() {
return new Promise(async (resolve, reject) => {
// 使用更新后的showCard方法,传入'recorded'状态
this.showCard(true, 'recorded');
......@@ -943,7 +956,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
// 重置录音开始时间
this.recordStartTime = 0;
let testData = {
let testData: any = {
"audioUrl": "https://staging-teach.cdn.ireadabc.com/a8ea7bb153a46941e6f28b7d0dda49f4.mp3",
"eof": 1,
"file": "/storage/emulated/0/Android/data/com.example.oxford/cache/shengtong/gradeVoice.mp3",
......@@ -952,7 +965,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
"fluency": 84,
"integrity": 100,
"kernel_version": "3.7.1",
"overall": 8,
"overall": 11,
"pronunciation": 88,
"resource_version": "2.3.11",
"rhythm": 46,
......@@ -1012,12 +1025,56 @@ export default class SceneComponent extends MyCocosSceneComponent {
},
"tokenId": "632be7a73327935c2b000005"
}
if (!courseware) return this.recrodEnd(testData)
testData = {
"audioUrl": "http://staging-teach.cdn.ireadabc.com/oxford_voice/b24a6c27b9ff2557/1754926351482.mp3",
"eof": 1,
"file": "/storage/emulated/0/Android/data/com.example.oxford/cache/shengtong/gradeVoice.mp3",
"result": {
"duration": "2.350",
"fluency": 0,
"integrity": 0,
"kernel_version": "3.7.1",
"overall": 0,
"pronunciation": 0,
"resource_version": "2.3.12",
"rhythm": 0,
"sentences": [
{
"beginIndex": 0,
"details": [
{
"charType": 0,
"end": 0,
"overall": 0,
"prominence": 0,
"start": 0,
"word": "hat"
}
],
"end": 0,
"endIndex": 0,
"overall": 0,
"sentence": "hat",
"start": 0
}
],
"speed": 0
},
"tokenId": "689a0d0c332793307e000004",
"questionId": 5
}
if (!courseware) {
await this.recrodEnd(testData)
resolve(testData)
return
}
// await pg.time.delay(5);
courseware && courseware.stopTest((data) => {
courseware && courseware.stopTest(async (data) => {
data = JSON.parse(data);
this.recrodEnd(data);
await this.recrodEnd(data);
resolve(data);
}); //结束录音
})
}
onTouchPlayRecord() {
const voice = Game.getIns().player.getLastVoice();
......@@ -1091,28 +1148,6 @@ export default class SceneComponent extends MyCocosSceneComponent {
await pg.time.delay(2);
this.updateTips(null);
return;
} else {
// 单词不正确
if (this.tryData.some(td => td.id == this.touchData.id)) {
// 已经尝试过的题目,显示加油提示
this.updateTips(TIPS_STATE.COMEON);
if (this.tryAgain) {
// 第二次尝试后,无论结果如何都进入下一题
this.tryAgain = false;
// 如果有父节点(火苗节点),隐藏它
if (this.touchData && this.touchData.parent) {
this.touchData.parent.active = false;
}
await pg.time.delay(3);
this.showCard(false);
this.updateTips(null);
this.recordTouching = false;
this.onFireFail();
return;
}
} else {
// 首次尝试失败,显示再试一次提示
this.updateTips(TIPS_STATE.TRYAGAIN);
......@@ -1123,7 +1158,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
if (this.touchData && this.touchData.parent && !this.activeFireNodes.includes(this.touchData.parent)) {
this.activeFireNodes.push(this.touchData.parent);
}
}
Game.getIns().player.addVoice(data);
}
// 延迟后隐藏提示
......
......@@ -1017,6 +1017,53 @@ let pg = {
const id = cc.audioEngine.playEffect(audio.clip, loop);
resolve(id);
})
},
/**
* 显示提示信息
* @param {string} message - 提示信息内容
*/
showToast(message) {
console.log("show toast->" + message);
// 创建一个临时节点显示提示信息
const canvas = cc.director.getScene().getChildByName('Canvas');
if (!canvas) return;
// 创建提示节点
const node = new cc.Node('Toast');
canvas.addChild(node);
node.setPosition(0, 0);
node.zIndex = 999;
// 创建背景
const bg = new cc.Node('ToastBg');
node.addChild(bg);
const bgGraphics = bg.addComponent(cc.Graphics);
bgGraphics.fillColor = cc.Color.BLACK;
bgGraphics.lineWidth = 0;
bgGraphics.roundRect(-200, -30, 400, 60, 10);
bgGraphics.fill();
// 创建文本
const label = new cc.Node('ToastLabel');
node.addChild(label);
const labelComp = label.addComponent(cc.Label);
labelComp.string = message;
labelComp.fontSize = 24;
labelComp.lineHeight = 24;
labelComp.horizontalAlign = cc.Label.HorizontalAlign.CENTER;
labelComp.verticalAlign = cc.Label.VerticalAlign.CENTER;
// 动画显示和消失
node.opacity = 0;
const fadeIn = cc.fadeTo(0.3, 255);
const delay = cc.delayTime(1.5);
const fadeOut = cc.fadeTo(0.3, 0);
const remove = cc.callFunc(() => {
node.removeFromParent(true);
node.destroy();
});
node.runAction(cc.sequence(fadeIn, delay, fadeOut, remove));
}
},
/**
......
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