Commit 6fb27e42 authored by yu's avatar yu

6.21调整

parent 1cf96696
......@@ -81,31 +81,31 @@
"__id__": 32
},
{
"__id__": 84
"__id__": 85
},
{
"__id__": 92
"__id__": 93
},
{
"__id__": 104
"__id__": 105
},
{
"__id__": 58
"__id__": 59
},
{
"__id__": 71
"__id__": 72
}
],
"_active": true,
"_components": [
{
"__id__": 113
},
{
"__id__": 114
},
{
"__id__": 115
},
{
"__id__": 116
}
],
"_prefab": null,
......@@ -1507,19 +1507,19 @@
"__id__": 33
},
{
"__id__": 39
"__id__": 40
},
{
"__id__": 41
"__id__": 42
}
],
"_active": true,
"_components": [
{
"__id__": 56
"__id__": 57
},
{
"__id__": 57
"__id__": 58
}
],
"_prefab": null,
......@@ -1595,6 +1595,9 @@
"_components": [
{
"__id__": 38
},
{
"__id__": 39
}
],
"_prefab": null,
......@@ -1608,7 +1611,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1334,
"width": -20,
"height": 750
},
"_anchorPoint": {
......@@ -1653,7 +1656,7 @@
"__id__": 33
},
"_children": [],
"_active": true,
"_active": false,
"_components": [],
"_prefab": null,
"_opacity": 255,
......@@ -1678,7 +1681,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-397.277,
-309,
80.816,
0,
0,
......@@ -1711,7 +1714,7 @@
"__id__": 33
},
"_children": [],
"_active": true,
"_active": false,
"_components": [],
"_prefab": null,
"_opacity": 255,
......@@ -1736,7 +1739,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-90.854,
0,
38.784,
0,
0,
......@@ -1769,7 +1772,7 @@
"__id__": 33
},
"_children": [],
"_active": true,
"_active": false,
"_components": [],
"_prefab": null,
"_opacity": 255,
......@@ -1794,7 +1797,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
179.457,
309,
153.315,
0,
0,
......@@ -1827,7 +1830,7 @@
"__id__": 33
},
"_children": [],
"_active": true,
"_active": false,
"_components": [],
"_prefab": null,
"_opacity": 255,
......@@ -1852,7 +1855,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
465.629,
463.5,
68.06,
0,
0,
......@@ -1888,8 +1891,8 @@
"alignMode": 1,
"_target": null,
"_alignFlags": 44,
"_left": 0,
"_right": 0,
"_left": 677,
"_right": 677,
"_top": 375,
"_bottom": 0,
"_verticalCenter": 0,
......@@ -1904,6 +1907,38 @@
"_originalHeight": 0,
"_id": "b7Uy3nTI5IAL9x9guKKKZV"
},
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
},
"_enabled": true,
"_layoutSize": {
"__type__": "cc.Size",
"width": -20,
"height": 750
},
"_resize": 1,
"_N$layoutType": 1,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_N$startAxis": 0,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 20,
"_N$spacingY": 0,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "3eWJufbwxHLoFh3O6PHgqf"
},
{
"__type__": "cc.Node",
"_name": "layout_ground ",
......@@ -1915,7 +1950,7 @@
"_active": true,
"_components": [
{
"__id__": 40
"__id__": 41
}
],
"_prefab": null,
......@@ -1971,7 +2006,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 40
},
"_enabled": true,
"alignMode": 1,
......@@ -2002,7 +2037,7 @@
},
"_children": [
{
"__id__": 42
"__id__": 43
},
{
"__id__": 45
......@@ -2014,13 +2049,13 @@
"__id__": 51
},
{
"__id__": 53
"__id__": 54
}
],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 56
}
],
"_prefab": null,
......@@ -2071,21 +2106,115 @@
"groupIndex": 0,
"_id": "a81G90UGhOCJJQmLo1eqlB"
},
{
"__type__": "cc.Node",
"_name": "shell",
"_objFlags": 0,
"_parent": {
"__id__": 42
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 44
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 103,
"height": 104
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-70,
-169.222,
0,
0,
0,
0,
1,
0.5,
0.5,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "d55gPJYI5H14MUwvRoC4Ii"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "7f1177d4-1a3e-40a8-8722-0d349523afce"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "69HJNRWkZLZLvCtLZtE6W/"
},
{
"__type__": "cc.Node",
"_name": "bg_cannon-left",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 42
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 43
"__id__": 46
},
{
"__id__": 44
"__id__": 47
}
],
"_prefab": null,
......@@ -2111,8 +2240,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-249,
-9,
-249.46999999999997,
0,
0,
0,
......@@ -2141,7 +2270,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 45
},
"_enabled": true,
"_materials": [
......@@ -2173,7 +2302,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 45
},
"_enabled": true,
"alignMode": 1,
......@@ -2182,7 +2311,7 @@
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 10,
"_bottom": 9.53000000000003,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
......@@ -2200,16 +2329,16 @@
"_name": "bg_cannon-front",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 49
},
{
"__id__": 47
"__id__": 50
}
],
"_prefab": null,
......@@ -2236,7 +2365,7 @@
"ctor": "Float64Array",
"array": [
0,
-243.5,
-244,
0,
0,
0,
......@@ -2265,7 +2394,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 48
},
"_enabled": true,
"_materials": [
......@@ -2297,7 +2426,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 48
},
"_enabled": true,
"alignMode": 1,
......@@ -2306,7 +2435,7 @@
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 10,
"_bottom": 9.5,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
......@@ -2324,16 +2453,16 @@
"_name": "bg_cannon-right",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 42
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 49
"__id__": 52
},
{
"__id__": 50
"__id__": 53
}
],
"_prefab": null,
......@@ -2359,7 +2488,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
9,
-249,
0,
0,
......@@ -2389,7 +2518,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2421,7 +2550,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 51
},
"_enabled": true,
"alignMode": 1,
......@@ -2448,13 +2577,13 @@
"_name": "cannon",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 42
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 52
"__id__": 55
}
],
"_prefab": null,
......@@ -2481,7 +2610,7 @@
"ctor": "Float64Array",
"array": [
-9,
-244.19,
-244,
0,
0,
0,
......@@ -2510,7 +2639,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 54
},
"_enabled": true,
"_materials": [
......@@ -2545,106 +2674,12 @@
"_N$enableBatch": false,
"_id": "cajejnzsZPBJ4pk4dqFOEK"
},
{
"__type__": "cc.Node",
"_name": "shell",
"_objFlags": 0,
"_parent": {
"__id__": 41
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 54
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 103,
"height": 104
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
14,
-273.506,
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": "d55gPJYI5H14MUwvRoC4Ii"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "7f1177d4-1a3e-40a8-8722-0d349523afce"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "69HJNRWkZLZLvCtLZtE6W/"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 42
},
"_enabled": true,
"alignMode": 1,
......@@ -2702,19 +2737,19 @@
},
"_enabled": true,
"item_word": {
"__id__": 58
"__id__": 59
},
"item_pic": {
"__id__": 71
"__id__": 72
},
"layout_item": {
"__id__": 33
},
"layout_ground": {
"__id__": 39
"__id__": 40
},
"layout_cannon": {
"__id__": 41
"__id__": 42
},
"_id": "caiNpeoI5OraK468WiV2vn"
},
......@@ -2727,22 +2762,22 @@
},
"_children": [
{
"__id__": 59
"__id__": 60
},
{
"__id__": 61
"__id__": 62
},
{
"__id__": 63
"__id__": 64
},
{
"__id__": 65
"__id__": 66
},
{
"__id__": 67
"__id__": 68
},
{
"__id__": 69
"__id__": 70
}
],
"_active": true,
......@@ -2800,13 +2835,13 @@
"_name": "bg_right",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 59
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 60
"__id__": 61
}
],
"_prefab": null,
......@@ -2862,7 +2897,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
"__id__": 60
},
"_enabled": true,
"_materials": [
......@@ -2894,13 +2929,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 62
"__id__": 63
}
],
"_prefab": null,
......@@ -2956,7 +2991,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 62
},
"_enabled": true,
"_materials": [
......@@ -2988,22 +3023,22 @@
"_name": "question",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 65
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"r": 85,
"g": 85,
"b": 122,
"a": 255
},
"_contentSize": {
......@@ -3021,7 +3056,7 @@
"ctor": "Float64Array",
"array": [
33.737,
39.856,
44.386,
0,
0,
0,
......@@ -3050,7 +3085,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -3085,13 +3120,13 @@
"_name": "bomb",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 59
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 66
"__id__": 67
}
],
"_prefab": null,
......@@ -3147,7 +3182,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 66
},
"_enabled": true,
"_materials": [
......@@ -3177,7 +3212,7 @@
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$timeScale": 5,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "a17+2pb39HYqsKJkHr45Td"
......@@ -3187,13 +3222,13 @@
"_name": "icon_shell-wrong",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 59
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 68
"__id__": 69
}
],
"_prefab": null,
......@@ -3249,7 +3284,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
"__id__": 68
},
"_enabled": true,
"_materials": [
......@@ -3281,13 +3316,13 @@
"_name": "icon_arrow",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 59
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 70
"__id__": 71
}
],
"_prefab": null,
......@@ -3343,7 +3378,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 69
"__id__": 70
},
"_enabled": true,
"_materials": [
......@@ -3379,22 +3414,22 @@
},
"_children": [
{
"__id__": 72
"__id__": 73
},
{
"__id__": 74
"__id__": 75
},
{
"__id__": 76
"__id__": 77
},
{
"__id__": 78
"__id__": 79
},
{
"__id__": 80
"__id__": 81
},
{
"__id__": 82
"__id__": 83
}
],
"_active": true,
......@@ -3452,13 +3487,13 @@
"_name": "bg_right",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 72
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 73
"__id__": 74
}
],
"_prefab": null,
......@@ -3514,7 +3549,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 73
},
"_enabled": true,
"_materials": [
......@@ -3546,13 +3581,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 72
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 76
}
],
"_prefab": null,
......@@ -3608,7 +3643,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 75
},
"_enabled": true,
"_materials": [
......@@ -3640,13 +3675,13 @@
"_name": "question",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 72
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 78
}
],
"_prefab": null,
......@@ -3702,7 +3737,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 77
},
"_enabled": true,
"_materials": [
......@@ -3734,13 +3769,13 @@
"_name": "bomb",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 72
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 79
"__id__": 80
}
],
"_prefab": null,
......@@ -3796,7 +3831,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 79
},
"_enabled": true,
"_materials": [
......@@ -3826,7 +3861,7 @@
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$timeScale": 5,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "b3+XohtxFD3JOQaUzFZvz+"
......@@ -3836,13 +3871,13 @@
"_name": "icon_shell-wrong",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 72
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 81
"__id__": 82
}
],
"_prefab": null,
......@@ -3898,7 +3933,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 81
},
"_enabled": true,
"_materials": [
......@@ -3930,13 +3965,13 @@
"_name": "icon_arrow",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 72
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 83
"__id__": 84
}
],
"_prefab": null,
......@@ -3992,7 +4027,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
"__id__": 83
},
"_enabled": true,
"_materials": [
......@@ -4028,16 +4063,16 @@
},
"_children": [
{
"__id__": 85
"__id__": 86
}
],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 91
},
{
"__id__": 91
"__id__": 92
}
],
"_prefab": null,
......@@ -4093,20 +4128,20 @@
"_name": "bg_title",
"_objFlags": 0,
"_parent": {
"__id__": 84
"__id__": 85
},
"_children": [
{
"__id__": 86
"__id__": 87
}
],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 89
},
{
"__id__": 89
"__id__": 90
}
],
"_prefab": null,
......@@ -4132,8 +4167,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-401,
307,
-373,
319.5,
0,
0,
0,
......@@ -4162,22 +4197,22 @@
"_name": "title",
"_objFlags": 0,
"_parent": {
"__id__": 85
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 87
"__id__": 88
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 183,
"g": 83,
"b": 62,
"r": 255,
"g": 217,
"b": 121,
"a": 255
},
"_contentSize": {
......@@ -4224,7 +4259,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 87
},
"_enabled": true,
"_materials": [
......@@ -4257,7 +4292,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 86
},
"_enabled": true,
"_materials": [
......@@ -4289,15 +4324,15 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 86
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_left": 97,
"_left": 125,
"_right": 0,
"_top": 12.5,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
......@@ -4316,7 +4351,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 85
},
"_enabled": true,
"_id": "78N5o1/GhHa5t0r3SoI14W"
......@@ -4326,7 +4361,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 85
},
"_enabled": true,
"alignMode": 1,
......@@ -4357,19 +4392,19 @@
},
"_children": [
{
"__id__": 93
"__id__": 94
},
{
"__id__": 95
"__id__": 96
},
{
"__id__": 97
"__id__": 98
},
{
"__id__": 99
"__id__": 100
},
{
"__id__": 102
"__id__": 103
}
],
"_active": false,
......@@ -4427,13 +4462,13 @@
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 95
}
],
"_prefab": null,
......@@ -4489,7 +4524,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4521,13 +4556,13 @@
"_name": "bg_instructions",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 97
}
],
"_prefab": null,
......@@ -4583,7 +4618,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
"__id__": 96
},
"_enabled": true,
"_materials": [
......@@ -4615,13 +4650,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 98
"__id__": 99
}
],
"_prefab": null,
......@@ -4677,7 +4712,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 98
},
"_enabled": true,
"_materials": [
......@@ -4712,16 +4747,16 @@
"_name": "btn_start",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 101
},
{
"__id__": 101
"__id__": 102
}
],
"_prefab": null,
......@@ -4777,7 +4812,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 100
},
"_enabled": true,
"_materials": [
......@@ -4809,7 +4844,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 100
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4870,7 +4905,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 99
"__id__": 100
},
"_id": "7095HuemhJQ40wHbz5jlAy"
},
......@@ -4879,13 +4914,13 @@
"_name": "touch",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 104
}
],
"_prefab": null,
......@@ -4941,7 +4976,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 103
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5013,22 +5048,22 @@
},
"_children": [
{
"__id__": 105
"__id__": 106
},
{
"__id__": 107
"__id__": 108
},
{
"__id__": 109
"__id__": 110
}
],
"_active": true,
"_components": [
{
"__id__": 111
"__id__": 112
},
{
"__id__": 112
"__id__": 113
}
],
"_prefab": null,
......@@ -5054,8 +5089,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
565.759,
-295.698,
556.759,
-302.698,
0,
0,
0,
......@@ -5084,13 +5119,13 @@
"_name": "btn_laba",
"_objFlags": 0,
"_parent": {
"__id__": 104
"__id__": 105
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 106
"__id__": 107
}
],
"_prefab": null,
......@@ -5146,7 +5181,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 106
},
"_enabled": true,
"_materials": [
......@@ -5178,13 +5213,13 @@
"_name": "btn_laba2",
"_objFlags": 0,
"_parent": {
"__id__": 104
"__id__": 105
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 108
"__id__": 109
}
],
"_prefab": null,
......@@ -5240,7 +5275,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 108
},
"_enabled": true,
"_materials": [
......@@ -5272,13 +5307,13 @@
"_name": "btn_laba3",
"_objFlags": 0,
"_parent": {
"__id__": 104
"__id__": 105
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 111
}
],
"_prefab": null,
......@@ -5334,7 +5369,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
"__id__": 110
},
"_enabled": true,
"_materials": [
......@@ -5366,7 +5401,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
"__id__": 105
},
"_enabled": true,
"alignMode": 1,
......@@ -5375,7 +5410,7 @@
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 30.30200000000002,
"_bottom": 23.30200000000002,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
......@@ -5393,7 +5428,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
"__id__": 105
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5514,10 +5549,10 @@
"layout_player": null,
"layout_balloon": null,
"layout_cannon": {
"__id__": 41
"__id__": 42
},
"btn_laba": {
"__id__": 104
"__id__": 105
},
"_id": "8bPdkfFS9F8bOmPlsaKJDw"
}
......
......@@ -139,7 +139,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
data.total = Game.getIns().getTotla;
data.right = Game.getIns().player.right;
data.scores = Game.getIns().player.voices;
this.log("total: " + data.total + " right: " + data.right);
data.stone = Math.floor(10 * data.right / data.total);
this.log("total: " + data.total + " right: " + data.right + " stone: " + data.stone);
onHomeworkFinish(data)
})
}
......
......@@ -40,6 +40,7 @@ export default class layout_cannon extends cc.Component {
private wrongNum;
onLoad() {
this.arrowAction = false;
this.rightNum = 0;
this.initEvent();
}
......@@ -63,22 +64,21 @@ export default class layout_cannon extends cc.Component {
list.sort((A, B) => { return Math.random() < 0.5 });
let layout_item = cc.instantiate(this.layout_item);
list.forEach((data, idx) => {
let item = cc.find("item" + idx, layout_item);
if (!item) return;
data.id = idx;
if (data.type == "txt") {
let word = cc.instantiate(this.item_word);
let item = cc.find("item" + idx, layout_item);
if (!item) return;
item.addChild(word);
word.setPosition(0, 0);
this.initWordItem(word, data);
} else {
let pic = cc.instantiate(this.item_pic);
let item = cc.find("item" + idx, layout_item);
if (!item) return;
item.addChild(pic);
pic.setPosition(0, 0);
this.initPicItem(pic, data);
}
item.active = true;
});
this.layout_ground.addChild(layout_item);
if (page.page > 1) {
......@@ -114,6 +114,7 @@ export default class layout_cannon extends cc.Component {
this.arrowAction = true;
let c1 = this.layout_ground.children[0];
c1.children.forEach(item => {
if (!item.active) return;
let data = item.children[0].data;
if (!data.touchRight) {
let arrow = cc.find("icon_arrow", item.children[0]);
......@@ -125,12 +126,11 @@ export default class layout_cannon extends cc.Component {
private stopArrow() {
let c1 = this.layout_ground.children[0];
c1.children.forEach(item => {
let data = item.children[0].data;
if (!data.touchRight) {
let arrow = cc.find("icon_arrow", item.children[0]);
arrow.active = false;
cc.Tween.stopAllByTarget(arrow);
}
if (!item.active) return;
// let data = item.children[0].data;
let arrow = cc.find("icon_arrow", item.children[0]);
arrow.active = false;
cc.Tween.stopAllByTarget(arrow);
});
}
private count;
......@@ -145,6 +145,7 @@ export default class layout_cannon extends cc.Component {
private touch;
private async fishingRight(item, data: Option, wpos) {
this.arrowAction = true;
this.stopArrow();
if (Game.getIns().state != GAME_STATE.RUNNING) return;
if (this.touch) return;
......@@ -153,82 +154,72 @@ export default class layout_cannon extends cc.Component {
let ball = cc.instantiate(shell);
let startPos: cc.Vec2, targetPos: cc.Vec2 = wpos;
this.playGun(GUN_STATE.WAIT);
if (data.id == 3) {
shell.active = false;
if (item.parent.x > 160) {//if (data.id == 3) {
//弹弓动画。
await this.playConnon(GUN_STATE.SHUT_RIGHT);
//向右飞出
ball.active = true;
startPos = cc.v2(14, -280);
// targetPos = ball.parent.convertToNodeSpaceAR(wpos);
ball.setPosition(startPos);
cc.Tween.stopAllByTarget(ball);
cc.tween(ball).to(0.5, { x: targetPos.x, y: targetPos.y }).call(() => {
ball.active = false;
}).start();
} else if (data.id == 0) {
startPos = cc.v2(64, -165);
} else if (item.parent.x < -160) {
//弹弓动画。
await this.playConnon(GUN_STATE.SHUT_LEFT);
//向左飞出
ball.active = true;
startPos = cc.v2(-14, -274);
// targetPos = ball.parent.convertToNodeSpaceAR(wpos);
ball.setPosition(startPos);
cc.Tween.stopAllByTarget(ball);
cc.tween(ball).to(0.5, { x: targetPos.x, y: targetPos.y }).call(() => {
ball.active = false;
}).start();
startPos = cc.v2(-70, -168);
} else {
//弹弓动画。
await this.playConnon(GUN_STATE.SHUT_MIDDLE);
//向上飞出
ball.active = true;
startPos = cc.v2(0, -274);
// targetPos = ball.parent.convertToNodeSpaceAR(wpos);
cc.Tween.stopAllByTarget(ball);
ball.setPosition(startPos);
cc.tween(ball).to(0.5, { x: targetPos.x, y: targetPos.y }).call(() => {
ball.active = false;
}).start();
startPos = cc.v2(0.5, -150);
}
if (data.right) {
data.touchRight = true;
this.playLocalAudio("bomb");
//爆炸效果
let bg_right = pg.view.find(item, 'bg_right');
let bg = pg.view.find(item, 'bg');
bg.active = false;
let question = pg.view.find(item, 'question');
question.active = false;
bg_right.active = true;
let bomb = pg.view.find(item, 'bomb');
bomb.active = true;
bomb.getComponent(dragonBones.ArmatureDisplay).addEventListener(dragonBones.EventObject.LOOP_COMPLETE, () => {
bomb.active = false;
this.rightNum++;
Game.getIns().player.addRight();
pg.audio.playAudioByUrl(data.audioUrl, () => {
if (!Game.getIns().getCurrentPage().checkMore || this.rightNum > 1) {
shell.active = true;
shell.scale = 0.5;
// targetPos = ball.parent.convertToNodeSpaceAR(wpos);
shell.setPosition(startPos);
cc.Tween.stopAllByTarget(shell);
cc.tween(shell).to(0.5, { x: targetPos.x, y: targetPos.y, scale: 0.2 }).call(() => {
shell.active = false;
if (data.right) {
data.touchRight = true;
this.playLocalAudio("bomb");
//爆炸效果
let bg_right = pg.view.find(item, 'bg_right');
let bg = pg.view.find(item, 'bg');
bg.active = false;
let question = pg.view.find(item, 'question');
question.active = false;
bg_right.active = true;
let bomb = pg.view.find(item, 'bomb');
bomb.active = true;
bomb.getComponent(dragonBones.ArmatureDisplay).addEventListener(dragonBones.EventObject.LOOP_COMPLETE, () => {
bomb.active = false;
this.rightNum++;
Game.getIns().player.addRight();
pg.audio.playAudioByUrl(data.audioUrl, () => {
if (!Game.getIns().getCurrentPage().checkMore || this.rightNum > 1) {
pg.event.emit("game_time_over");
} else {
pg.event.emit("play_laba_audio");
}
this.touch = false;
});
});
} else {
this.wrongNum++;
this.playLocalAudio("error");
let icon_shell = cc.find("icon_shell-wrong", item);
icon_shell.active = true;
cc.tween(icon_shell).to(0.5, { y: -135 }).delay(1).call(() => {
icon_shell.active = false;
icon_shell.y = 0;
if (this.wrongNum >= 2 || (Game.getIns().getCurrentPage().checkMore && this.rightNum >= 1)) {
pg.event.emit("game_time_over");
} else {
pg.event.emit("play_laba_audio");
}
this.touch = false;
});
});
} else {
this.wrongNum++;
this.playLocalAudio("error");
let icon_shell = cc.find("icon_shell-wrong", item);
icon_shell.active = true;
cc.tween(icon_shell).to(0.5, { y: -135 }).delay(1).call(() => {
icon_shell.active = false;
icon_shell.y = 0;
if (this.wrongNum >= 2 || (Game.getIns().getCurrentPage().checkMore && this.rightNum >= 1)) {
pg.event.emit("game_time_over");
}
this.touch = false;
}).start();
}
}).start();
}
this.stopArrow();
}).start();
}
private playConnon(state: GUN_STATE) {
......
......@@ -196,7 +196,15 @@ export default class Game {
this.page += 1;
}
get getTotla() {
return this.data.length;
let count = 0;
this.data.forEach(item => {
item.options.forEach((op) => {
if (op.right) count++;
})
});
return count;
}
get isOver() {
return this.page > this.lists.length;
......
......@@ -265,8 +265,8 @@ let pg = {
let scaleX = w / nw;
let scaleY = h / nh;
let scale = scaleX <= scaleY ? scaleX : scaleY;
node.width = nw * scale;
node.height = nh * scale;
node.width = w;// nw * scale;
node.height = h;//nh * scale;
}
node.active = true;
resolve({ w: nw, h: nh });
......
......@@ -27,13 +27,13 @@ export const defaultData = {
"text": "take cat",
"right": true
},
{
"type": "txt",
"image": "",
"audio": "https://staging-teach.cdn.ireadabc.com/7c18e0838dcf0707f885842ed09e1579.mp3",
"text": "Please take some cookies",
"right": false
}
// {
// "type": "txt",
// "image": "",
// "audio": "https://staging-teach.cdn.ireadabc.com/7c18e0838dcf0707f885842ed09e1579.mp3",
// "text": "Please take some cookies",
// "right": false
// }
]
},
{
......@@ -65,7 +65,7 @@ export const defaultData = {
"image": "https://staging-teach.cdn.ireadabc.com/7b315ba7227294d63933cd659d5372fb.png",
"audio": "https://staging-teach.cdn.ireadabc.com/a6a5c388c636bc6d063946e91b4bd21a.mp3",
"text": "egg",
"right": true
"right": false
}
]
}
......
......@@ -4588,6 +4588,7 @@ declare namespace cc {
/** !#en Returns a normalized vector representing the forward direction (Z axis) of the node in world space.
!#zh 获取节点正前方(z 轴)面对的方向,返回值为世界坐标系下的归一化向量 */
forward: Vec3;
data: any;
/**
@param name name
......@@ -99,6 +99,21 @@
<div class="word-type-title">
题目{{i+1}}
</div>
<div>
<div class="word-type-option-title" style="margin-top:10px;">题目音频:</div>
<div style="display:flex ;">
<div>
<app-audio-recorder [audioUrl]="question.questionAudio"
(audioUploaded)="onAudioUploadSuccess($event, 'questionAudio',question)">
</app-audio-recorder>
</div>
<div style="margin: 5px">
<span>{{ question.audioName}}</span>
</div>
</div>
</div>
<div class="word-type-option-title" style="margin-top:20px;">
选项内容:
</div>
......@@ -171,25 +186,25 @@
<input class="input-place-red" type="text" placeholder="必填,语音评测是根据文本内容去对比打分的" nz-input
[(ngModel)]="option.text" (blur)="save()">
</div>
<div class="option-time">
<!-- <div class="option-time">
<div class="word-input-title">
<span>录音时间: </span>
</div>
<input type="number" placeholder="录音超过时间将自动提交成绩" nz-input [(ngModel)]="option.time"
(blur)="save()">
</div>
</div> -->
</div>
</div>
<div class="option-btns">
<div class="option-btns" >
<button class="btn-red" nz-button nzType="default" nzDanger (click)="removeoption(i,j)">删除选项</button>
<button class="btn-blue" style="margin-top: 10px;" nz-button nzType="default" nzDanger
<button *ngIf="question.options.length < 4" class="btn-blue" style="margin-top: 10px;" nz-button nzType="default" nzDanger
(click)="copyoption(i,j)">复制选项</button>
</div>
</div>
</div>
<div style="margin-left: 69px;margin-top: 15px;">
<div style="margin-left: 69px;margin-top: 15px;" *ngIf="question.options.length < 4">
<button class="btn-blue" nz-button nzType="default" nzDanger (click)="addoption(i)">+增加选项</button>
</div>
</div>
......
......@@ -9,11 +9,11 @@ import { MetaFormCreator } from './mataFormCreator';
})
export class FormComponent extends ComponentBase implements OnInit, OnChanges, OnDestroy {
// 储存数据用
saveKey = "dqq";
saveKey = "hlxpt";
item = {
title: "热气球大战",
questionText: "可恶的小偷将魔法卡牌藏在热气球里,准备偷走!快来夺回魔法卡牌吧!只要击落热气球,魔法卡牌就会掉落下来。请仔细观察魔法卡牌,并大声说出魔法咒语。魔法咒语正确,你将获得该张魔法卡牌。游戏结束后,根据获得的魔法卡牌数量,你将获得相应的能量石奖励!开始挑战吧!",
title: "火力小炮台",
questionText: "敌人建造了很多炮塔在我们的地盘上,真是太危险了! 亲爱的小玩家,请认真听游戏指令,利用小炮台摧毁这些炮塔吧!游戏结束后,根据摧毁的炮塔数量,你将获得相应的能量石奖励哟!开始挑战吧!",
questionTextAudio: "http://staging-teach.cdn.ireadabc.com/d60710f8580f77d494a6ab95d5cc46c5.mp3",
questions: [],
audioName:""
......
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