Commit 32067dad authored by 范雪寒's avatar 范雪寒

feat: 加音效

parent 93a5aa83
......@@ -17,22 +17,22 @@
"__id__": 2
},
{
"__id__": 45
"__id__": 48
},
{
"__id__": 58
"__id__": 61
},
{
"__id__": 68
"__id__": 71
},
{
"__id__": 80
"__id__": 83
},
{
"__id__": 82
"__id__": 85
},
{
"__id__": 107
"__id__": 110
}
],
"_active": false,
......@@ -96,13 +96,13 @@
"_active": true,
"_components": [
{
"__id__": 42
"__id__": 45
},
{
"__id__": 43
"__id__": 46
},
{
"__id__": 44
"__id__": 47
}
],
"_prefab": null,
......@@ -281,10 +281,10 @@
"_active": true,
"_components": [
{
"__id__": 40
"__id__": 43
},
{
"__id__": 41
"__id__": 44
}
],
"_prefab": null,
......@@ -1530,14 +1530,75 @@
{
"__id__": 32
},
{
"__id__": 34
},
{
"__id__": 35
}
],
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 308,
"height": 240
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-600,
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": "66UzG+s79JH6n4BZmEA5vd"
},
{
"__type__": "cc.Node",
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 31
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 33
}
],
"_prefab": null,
......@@ -1564,7 +1625,7 @@
"ctor": "Float64Array",
"array": [
0,
-600,
0,
0,
0,
0,
......@@ -1586,7 +1647,39 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "66UzG+s79JH6n4BZmEA5vd"
"_id": "896NQx501P2a2NgHNdKBdR"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "277770e3-f699-4696-b880-c8012c69eaf2"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "08fvlj7QhJo5G9tntZ8z3o"
},
{
"__type__": "cc.Node",
......@@ -1595,11 +1688,7 @@
"_parent": {
"__id__": 31
},
"_children": [
{
"__id__": 33
}
],
"_children": [],
"_active": true,
"_components": [],
"_prefab": null,
......@@ -1652,16 +1741,26 @@
},
{
"__type__": "cc.Node",
"_name": "bg_water",
"_name": "Gun",
"_objFlags": 0,
"_parent": {
"__id__": 32
"__id__": 31
},
"_children": [],
"_children": [
{
"__id__": 36
},
{
"__id__": 37
},
{
"__id__": 39
}
],
"_active": true,
"_components": [
{
"__id__": 34
"__id__": 42
}
],
"_prefab": null,
......@@ -1687,8 +1786,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
10,
110,
0,
0,
0,
......@@ -1710,57 +1809,76 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "e0OsqESgNL5YL99HMB+Kwz"
"_id": "4akwWGl7BDTKhnf59PrPB8"
},
{
"__type__": "cc.Sprite",
"_name": "",
"__type__": "cc.Node",
"_name": "Muzzle",
"_objFlags": 0,
"node": {
"__id__": 33
"_parent": {
"__id__": 35
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a4a03ebc-3cd6-4904-b441-b012b4e6b71d"
"_children": [],
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_type": 0,
"_sizeMode": 2,
"_fillType": 0,
"_fillCenter": {
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
115.663,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0
"y": 0,
"z": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": false,
"_atlas": null,
"_id": "0etIicbHZJ6J59UCOrkNTS"
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "c2mwhi/uFLaIaNrAlw2Cc2"
},
{
"__type__": "cc.Node",
"_name": "Gun",
"_name": "Water",
"_objFlags": 0,
"_parent": {
"__id__": 31
"__id__": 35
},
"_children": [
{
"__id__": 36
}
],
"_children": [],
"_active": true,
"_components": [
{
"__id__": 37
},
{
"__id__": 38
}
......@@ -1788,8 +1906,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
10,
110,
0,
0,
0,
0,
0,
......@@ -1811,18 +1929,57 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "4akwWGl7BDTKhnf59PrPB8"
"_id": "e0OsqESgNL5YL99HMB+Kwz"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a4a03ebc-3cd6-4904-b441-b012b4e6b71d"
},
"_type": 0,
"_sizeMode": 2,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": false,
"_atlas": null,
"_id": "0etIicbHZJ6J59UCOrkNTS"
},
{
"__type__": "cc.Node",
"_name": "Muzzle",
"_name": "Gun",
"_objFlags": 0,
"_parent": {
"__id__": 35
},
"_children": [],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 40
},
{
"__id__": 41
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -1834,8 +1991,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
"width": 238,
"height": 238
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1847,7 +2004,7 @@
"ctor": "Float64Array",
"array": [
0,
115.663,
0,
0,
0,
0,
......@@ -1869,14 +2026,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "c2mwhi/uFLaIaNrAlw2Cc2"
"_id": "1epegsQHFHSYvUiZM3SJQ+"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 39
},
"_enabled": true,
"_materials": [
......@@ -1901,14 +2058,14 @@
"_fillRange": 0,
"_isTrimmedMode": false,
"_atlas": null,
"_id": "06E2ai+zBPwpNcFZeuoIBh"
"_id": "bfIn6rrQpBiboL6xK7D0/o"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 39
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1969,39 +2126,75 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "72ubnvEnRDW45TNpsHlC5K"
"_id": "40JEUBMrtAVrjCHZeEKXlF"
},
{
"__type__": "cc.Sprite",
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 35
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "277770e3-f699-4696-b880-c8012c69eaf2"
"_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
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "a98fWlEH5JpK29NsroUUba"
"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": "72ubnvEnRDW45TNpsHlC5K"
},
{
"__type__": "cc.Sprite",
......@@ -2125,19 +2318,19 @@
},
"_children": [
{
"__id__": 46
"__id__": 49
},
{
"__id__": 48
"__id__": 51
},
{
"__id__": 52
"__id__": 55
}
],
"_active": true,
"_components": [
{
"__id__": 57
"__id__": 60
}
],
"_prefab": null,
......@@ -2193,13 +2386,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 48
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 47
"__id__": 50
}
],
"_prefab": null,
......@@ -2255,7 +2448,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -2287,17 +2480,17 @@
"_name": "Star",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 48
},
"_children": [
{
"__id__": 49
"__id__": 52
}
],
"_active": false,
"_components": [
{
"__id__": 51
"__id__": 54
}
],
"_prefab": null,
......@@ -2353,13 +2546,13 @@
"_name": "StarBig",
"_objFlags": 0,
"_parent": {
"__id__": 48
"__id__": 51
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 53
}
],
"_prefab": null,
......@@ -2415,7 +2608,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 52
},
"_enabled": true,
"_materials": [
......@@ -2447,7 +2640,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2479,20 +2672,20 @@
"_name": "Mask",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 48
},
"_children": [
{
"__id__": 53
"__id__": 56
}
],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 58
},
{
"__id__": 56
"__id__": 59
}
],
"_prefab": null,
......@@ -2548,13 +2741,13 @@
"_name": "Star",
"_objFlags": 0,
"_parent": {
"__id__": 52
"__id__": 55
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 57
}
],
"_prefab": null,
......@@ -2610,7 +2803,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 56
},
"_enabled": true,
"_materials": [
......@@ -2642,7 +2835,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -2662,7 +2855,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 55
},
"_enabled": true,
"alignMode": 1,
......@@ -2689,7 +2882,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 48
},
"_enabled": true,
"_materials": [
......@@ -2723,19 +2916,19 @@
},
"_children": [
{
"__id__": 59
"__id__": 62
},
{
"__id__": 61
"__id__": 64
},
{
"__id__": 65
"__id__": 68
}
],
"_active": true,
"_components": [
{
"__id__": 67
"__id__": 70
}
],
"_prefab": null,
......@@ -2791,13 +2984,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 61
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 60
"__id__": 63
}
],
"_prefab": null,
......@@ -2853,7 +3046,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
"__id__": 62
},
"_enabled": true,
"_materials": [
......@@ -2885,17 +3078,17 @@
"_name": "Mask",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 61
},
"_children": [
{
"__id__": 62
"__id__": 65
}
],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 67
}
],
"_prefab": null,
......@@ -2951,13 +3144,13 @@
"_name": "AnsterImg",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 63
"__id__": 66
}
],
"_prefab": null,
......@@ -3013,7 +3206,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -3045,7 +3238,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -3065,13 +3258,13 @@
"_name": "DistroyAnime",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 61
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 66
"__id__": 69
}
],
"_prefab": null,
......@@ -3127,7 +3320,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 68
},
"_enabled": true,
"_materials": [
......@@ -3167,7 +3360,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 61
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3239,19 +3432,19 @@
},
"_children": [
{
"__id__": 69
"__id__": 72
},
{
"__id__": 71
"__id__": 74
},
{
"__id__": 77
"__id__": 80
}
],
"_active": true,
"_components": [
{
"__id__": 79
"__id__": 82
}
],
"_prefab": null,
......@@ -3307,13 +3500,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 68
"__id__": 71
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 70
"__id__": 73
}
],
"_prefab": null,
......@@ -3369,7 +3562,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 69
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -3401,17 +3594,17 @@
"_name": "Mask",
"_objFlags": 0,
"_parent": {
"__id__": 68
"__id__": 71
},
"_children": [
{
"__id__": 72
"__id__": 75
}
],
"_active": true,
"_components": [
{
"__id__": 76
"__id__": 79
}
],
"_prefab": null,
......@@ -3467,17 +3660,17 @@
"_name": "AnswerText",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 74
},
"_children": [
{
"__id__": 73
"__id__": 76
}
],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 78
}
],
"_prefab": null,
......@@ -3533,13 +3726,13 @@
"_name": "RICHTEXT_CHILD",
"_objFlags": 1024,
"_parent": {
"__id__": 72
"__id__": 75
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 74
"__id__": 77
}
],
"_prefab": null,
......@@ -3589,14 +3782,14 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "37Zu+NlzJEUq0dnEkj7cFG"
"_id": "d437ERVt9MHqOMSwAUKbte"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 76
},
"_enabled": true,
"_materials": [
......@@ -3624,14 +3817,14 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "f5w8vS0UhKX7lpaqXfvHvB"
"_id": "48vLlhMTBGDa7zk5THusEE"
},
{
"__type__": "cc.RichText",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 75
},
"_enabled": true,
"_fontFamily": "Arial",
......@@ -3654,7 +3847,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 74
},
"_enabled": true,
"_materials": [
......@@ -3674,13 +3867,13 @@
"_name": "DistroyAnime",
"_objFlags": 0,
"_parent": {
"__id__": 68
"__id__": 71
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 78
"__id__": 81
}
],
"_prefab": null,
......@@ -3736,7 +3929,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -3776,7 +3969,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 71
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3850,7 +4043,7 @@
"_active": true,
"_components": [
{
"__id__": 81
"__id__": 84
}
],
"_prefab": null,
......@@ -3906,7 +4099,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 83
},
"_enabled": true,
"_materials": [
......@@ -3941,9 +4134,6 @@
"__id__": 1
},
"_children": [
{
"__id__": 83
},
{
"__id__": 86
},
......@@ -3964,6 +4154,9 @@
},
{
"__id__": 104
},
{
"__id__": 107
}
],
"_active": true,
......@@ -4021,11 +4214,11 @@
"_name": "New Node",
"_objFlags": 0,
"_parent": {
"__id__": 82
"__id__": 85
},
"_children": [
{
"__id__": 84
"__id__": 87
}
],
"_active": true,
......@@ -4083,13 +4276,13 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 88
}
],
"_prefab": null,
......@@ -4145,7 +4338,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 87
},
"_enabled": true,
"_materials": [
......@@ -4177,11 +4370,11 @@
"_name": "New Node",
"_objFlags": 0,
"_parent": {
"__id__": 82
"__id__": 85
},
"_children": [
{
"__id__": 87
"__id__": 90
}
],
"_active": true,
......@@ -4239,13 +4432,13 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 89
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 91
}
],
"_prefab": null,
......@@ -4301,7 +4494,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -4333,11 +4526,11 @@
"_name": "New Node",
"_objFlags": 0,
"_parent": {
"__id__": 82
"__id__": 85
},
"_children": [
{
"__id__": 90
"__id__": 93
}
],
"_active": true,
......@@ -4395,13 +4588,13 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 89
"__id__": 92
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 91
"__id__": 94
}
],
"_prefab": null,
......@@ -4457,7 +4650,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 93
},
"_enabled": true,
"_materials": [
......@@ -4489,11 +4682,11 @@
"_name": "New Node",
"_objFlags": 0,
"_parent": {
"__id__": 82
"__id__": 85
},
"_children": [
{
"__id__": 93
"__id__": 96
}
],
"_active": true,
......@@ -4551,13 +4744,13 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 95
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 97
}
],
"_prefab": null,
......@@ -4613,7 +4806,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 96
},
"_enabled": true,
"_materials": [
......@@ -4645,11 +4838,11 @@
"_name": "New Node",
"_objFlags": 0,
"_parent": {
"__id__": 82
"__id__": 85
},
"_children": [
{
"__id__": 96
"__id__": 99
}
],
"_active": true,
......@@ -4707,13 +4900,13 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 95
"__id__": 98
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 97
"__id__": 100
}
],
"_prefab": null,
......@@ -4769,7 +4962,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 99
},
"_enabled": true,
"_materials": [
......@@ -4801,11 +4994,11 @@
"_name": "New Node",
"_objFlags": 0,
"_parent": {
"__id__": 82
"__id__": 85
},
"_children": [
{
"__id__": 99
"__id__": 102
}
],
"_active": true,
......@@ -4863,13 +5056,13 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 98
"__id__": 101
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 103
}
],
"_prefab": null,
......@@ -4925,7 +5118,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 102
},
"_enabled": true,
"_materials": [
......@@ -4957,11 +5150,11 @@
"_name": "New Node",
"_objFlags": 0,
"_parent": {
"__id__": 82
"__id__": 85
},
"_children": [
{
"__id__": 102
"__id__": 105
}
],
"_active": true,
......@@ -5019,13 +5212,13 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 101
"__id__": 104
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 106
}
],
"_prefab": null,
......@@ -5081,7 +5274,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 105
},
"_enabled": true,
"_materials": [
......@@ -5113,11 +5306,11 @@
"_name": "New Node",
"_objFlags": 0,
"_parent": {
"__id__": 82
"__id__": 85
},
"_children": [
{
"__id__": 105
"__id__": 108
}
],
"_active": true,
......@@ -5175,13 +5368,13 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 104
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 106
"__id__": 109
}
],
"_prefab": null,
......@@ -5237,7 +5430,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 108
},
"_enabled": true,
"_materials": [
......@@ -5273,31 +5466,31 @@
},
"_children": [
{
"__id__": 108
"__id__": 111
},
{
"__id__": 110
"__id__": 113
},
{
"__id__": 112
"__id__": 115
},
{
"__id__": 114
"__id__": 117
},
{
"__id__": 116
"__id__": 119
},
{
"__id__": 118
"__id__": 121
},
{
"__id__": 120
"__id__": 123
},
{
"__id__": 122
"__id__": 125
},
{
"__id__": 124
"__id__": 127
}
],
"_active": true,
......@@ -5355,13 +5548,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 107
"__id__": 110
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 112
}
],
"_prefab": null,
......@@ -5417,7 +5610,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 111
},
"_enabled": true,
"_clip": {
......@@ -5436,13 +5629,13 @@
"_name": "light",
"_objFlags": 0,
"_parent": {
"__id__": 107
"__id__": 110
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 111
"__id__": 114
}
],
"_prefab": null,
......@@ -5498,7 +5691,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 110
"__id__": 113
},
"_enabled": true,
"_clip": {
......@@ -5517,13 +5710,13 @@
"_name": "move",
"_objFlags": 0,
"_parent": {
"__id__": 107
"__id__": 110
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 113
"__id__": 116
}
],
"_prefab": null,
......@@ -5579,7 +5772,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
"__id__": 115
},
"_enabled": true,
"_clip": {
......@@ -5598,13 +5791,13 @@
"_name": "wrong",
"_objFlags": 0,
"_parent": {
"__id__": 107
"__id__": 110
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 115
"__id__": 118
}
],
"_prefab": null,
......@@ -5660,7 +5853,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 117
},
"_enabled": true,
"_clip": {
......@@ -5679,13 +5872,13 @@
"_name": "appare",
"_objFlags": 0,
"_parent": {
"__id__": 107
"__id__": 110
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 117
"__id__": 120
}
],
"_prefab": null,
......@@ -5741,7 +5934,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 119
},
"_enabled": true,
"_clip": {
......@@ -5760,13 +5953,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 107
"__id__": 110
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 119
"__id__": 122
}
],
"_prefab": null,
......@@ -5822,7 +6015,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 121
},
"_enabled": true,
"_clip": {
......@@ -5841,13 +6034,13 @@
"_name": "question",
"_objFlags": 0,
"_parent": {
"__id__": 107
"__id__": 110
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 121
"__id__": 124
}
],
"_prefab": null,
......@@ -5903,7 +6096,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
"__id__": 123
},
"_enabled": true,
"_clip": {
......@@ -5922,13 +6115,13 @@
"_name": "star",
"_objFlags": 0,
"_parent": {
"__id__": 107
"__id__": 110
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 123
"__id__": 126
}
],
"_prefab": null,
......@@ -5984,7 +6177,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 122
"__id__": 125
},
"_enabled": true,
"_clip": {
......@@ -6003,13 +6196,13 @@
"_name": "end",
"_objFlags": 0,
"_parent": {
"__id__": 107
"__id__": 110
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 125
"__id__": 128
}
],
"_prefab": null,
......@@ -6065,7 +6258,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 127
},
"_enabled": true,
"_clip": {
......
......@@ -153,17 +153,17 @@ cc.Class({
await asyncTweenTo(BtnStart, 0.1, { opacity: 0 });
BtnStart.active = false;
this.gameStart();
});
}, this.playAudio.bind(this, 'btn'));
const BtnRestart = cc.find('Canvas/bg/BtnRestart');
addBtnListener(BtnRestart, async () => {
await asyncTweenTo(BtnRestart, 0.1, { opacity: 0 });
BtnRestart.active = false;
this.gameStart();
});
}, this.playAudio.bind(this, 'btn'));
const BtnSpeaker = cc.find('Canvas/bg/BtnSpeaker');
addBtnListener(BtnSpeaker, async () => {
await this.playQuestionAudio();
});
}, this.playAudio.bind(this, 'btn'));
const bg = cc.find('Canvas/bg');
bg.on('touchstart', (event) => {
......@@ -217,6 +217,8 @@ cc.Class({
star.x = startPos.x;
star.y = startPos.y - starBig.height;
this.playAudio('star');
cc.tween(star)
.to(0.3, { y: middlePos.y + 80 }, { easing: 'quadOut' })
.to(0.1, { y: middlePos.y + 40, scaleX: 1.2 / starBase.scale, scaleY: 0.8 / starBase.scale }, { easing: 'quadOut' })
......@@ -244,10 +246,12 @@ cc.Class({
onGameEnd() {
showTrebleFirework(cc.find('Canvas/bg'), cc.find('RabbonBase').children);
this.playAudio('end');
onHomeworkFinish();
this.hideGuns();
const BtnRestart = cc.find('Canvas/bg/BtnRestart');
BtnRestart.active = true;
BtnRestart.opacity = 255;
},
async gameStart() {
......@@ -264,9 +268,17 @@ cc.Class({
showGuns() {
const bg = cc.find('Canvas/bg');
const gunBase = cc.find('Canvas/bg/GunBase');
this.playAudio('move');
asyncTweenTo(gunBase, 0.5, { y: -bg.height / 2 });
},
hideGuns() {
const bg = cc.find('Canvas/bg');
const gunBase = cc.find('Canvas/bg/GunBase');
this.playAudio('move');
asyncTweenTo(gunBase, 0.5, { y: -bg.height / 2 - gunBase.height });
},
showBallsinterval: null,
startShowBalls() {
const currentQuestion = this.data.questionList[this._status.currentQuestionIdx];
......@@ -316,6 +328,8 @@ cc.Class({
.repeatForever()
.start();
this.playAudio('appare');
ball.on('touchstart', async (event) => {
if (ball.canNotTouch) {
return;
......@@ -393,9 +407,11 @@ cc.Class({
if (!currentQuestion) {
return;
}
this.playAudio('question', async () => {
this.speakerBlink();
await playAudioByUrlSync(currentQuestion.questionAudio);
this.speakerStopBlink();
});
},
speakerList: null,
......@@ -414,6 +430,7 @@ cc.Class({
async shootTarget(node, location, shootBullet) {
const GunPos = cc.find('Canvas/bg/GunBase/GunPos');
const Gun = cc.find('Canvas/bg/GunBase/Gun');
const Water = cc.find('Canvas/bg/GunBase/Gun/Water');
const Muzzle = cc.find('Canvas/bg/GunBase/Gun/Muzzle');
const bg = cc.find('Canvas/bg')
let offsetY = 0;
......@@ -432,6 +449,7 @@ cc.Class({
const angle = cc.v2(0, 1).signAngle(shootSide) * 180 / Math.PI;
bullet.angle = angle;
asyncTweenTo(Water, 0.1, { angle: -angle });
await asyncTweenTo(Gun, 0.1, { angle: angle, scaleY: 0.95 });
let startPos = exchangeNodePos(bg, Muzzle);
bullet.x = startPos.x;
......@@ -442,6 +460,8 @@ cc.Class({
.to(0.1, { scaleX: 1, scaleY: 1 })
.start();
this.playAudio('light');
let targetPos = bg.convertToNodeSpaceAR(cc.v2(location.x, location.y + offsetY));
let flySide = cc.v2(targetPos.x - startPos.x, targetPos.y - startPos.y);
await asyncTweenTo(bullet, 0.1, {
......@@ -457,6 +477,7 @@ cc.Class({
},
async targetDistroy(node) {
this.playAudio('right');
const bg = node.getChildByName('bg');
bg.active = false;
const DistroyAnime = node.getChildByName('DistroyAnime');
......@@ -468,6 +489,7 @@ cc.Class({
},
async targetLaugh(node) {
this.playAudio('wrong');
const x = node.x;
let offsetX = RandomInt(20, 50) * 2 * (RandomInt(2) - 0.5);
let offsetY = RandomInt(20, 50) * 2 * (RandomInt(2) - 0.5);
......@@ -478,9 +500,14 @@ cc.Class({
await asyncTweenTo(node, 0.05, { x: x });
},
async playAudio(audioName) {
playAudio(audioName, cb) {
const audioNode = cc.find(`AudioBase/${audioName}`);
const audioClip = audioNode.getComponent(cc.AudioSource).clip;
cc.audioEngine.play(audioClip, false, 0.8);
const id = cc.audioEngine.play(audioClip, false, 0.8);
cc.audioEngine.setFinishCallback(id, () => {
if (cb) {
cb();
}
});
}
});
......@@ -409,7 +409,7 @@ export async function jelly(node, offset = 0.1) {
});
}
export function addBtnListener(node, cb) {
export function addBtnListener(node, cb, beforeJelly = null) {
const button = node.getComponent(cc.Button);
if (!button) {
node.addComponent(cc.Button);
......@@ -419,6 +419,9 @@ export function addBtnListener(node, cb) {
return;
}
node.canNotClick = true;
if (beforeJelly) {
beforeJelly();
}
await jelly(node);
await cb();
node.canNotClick = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment