Commit 765aeedf authored by Tt's avatar Tt

部分bug修改

parent 531fc82d
......@@ -132,88 +132,88 @@
"__id__": 45
},
{
"__id__": 48
"__id__": 51
},
{
"__id__": 61
"__id__": 64
},
{
"__id__": 72
"__id__": 76
},
{
"__id__": 83
"__id__": 87
},
{
"__id__": 95
"__id__": 99
},
{
"__id__": 97
"__id__": 101
},
{
"__id__": 103
"__id__": 107
},
{
"__id__": 110
"__id__": 114
},
{
"__id__": 117
"__id__": 121
},
{
"__id__": 144
"__id__": 148
},
{
"__id__": 165
"__id__": 169
},
{
"__id__": 167
"__id__": 171
},
{
"__id__": 168
"__id__": 172
},
{
"__id__": 176
"__id__": 180
},
{
"__id__": 177
"__id__": 181
},
{
"__id__": 197
"__id__": 201
},
{
"__id__": 199
"__id__": 203
},
{
"__id__": 203
"__id__": 207
},
{
"__id__": 206
"__id__": 210
},
{
"__id__": 207
"__id__": 211
},
{
"__id__": 208
"__id__": 212
},
{
"__id__": 210
"__id__": 214
},
{
"__id__": 216
"__id__": 220
},
{
"__id__": 229
"__id__": 233
}
],
"_active": true,
"_components": [
{
"__id__": 255
"__id__": 259
},
{
"__id__": 256
"__id__": 260
},
{
"__id__": 257
"__id__": 261
}
],
"_prefab": null,
......@@ -2225,14 +2225,18 @@
"_parent": {
"__id__": 2
},
"_children": [],
"_active": false,
"_components": [
"_children": [
{
"__id__": 46
},
{
"__id__": 47
"__id__": 48
}
],
"_active": false,
"_components": [
{
"__id__": 50
}
],
"_prefab": null,
......@@ -2283,13 +2287,169 @@
"groupIndex": 0,
"_id": "495QX07mtM5bGdwHmcE7cR"
},
{
"__type__": "cc.Node",
"_name": "btn_restart_circle",
"_objFlags": 0,
"_parent": {
"__id__": 45
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 47
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 409,
"height": 409
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-16.219,
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": "c55FqQ/H1MErQhYi9iQZ42"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "b34babe1-0856-4403-9446-7b6e2bbe9f15"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "06EJTStJZOKrh2NZhvKlo8"
},
{
"__type__": "cc.Node",
"_name": "btn_restart",
"_objFlags": 0,
"_parent": {
"__id__": 45
},
"_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": 262,
"height": 268
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-16.219,
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": "8exrEsWQBOeZNloemHn+y8"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
},
"_enabled": true,
"_materials": [
{
......@@ -2299,7 +2459,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "dd09a3f5-2df8-4334-89a7-36396823aae0"
"__uuid__": "3f3258fc-f4c1-4862-bc12-6467ec15b5b3"
},
"_type": 0,
"_sizeMode": 1,
......@@ -2313,7 +2473,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "c6lCUW2lxPGpPFuo+y7PYz"
"_id": "f2hsTcSZlGyYotUfZ0IjEM"
},
{
"__type__": "cc.Button",
......@@ -2392,19 +2552,19 @@
},
"_children": [
{
"__id__": 49
"__id__": 52
},
{
"__id__": 54
"__id__": 57
}
],
"_active": true,
"_components": [
{
"__id__": 59
"__id__": 62
},
{
"__id__": 60
"__id__": 63
}
],
"_prefab": null,
......@@ -2460,17 +2620,17 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 48
"__id__": 51
},
"_children": [
{
"__id__": 50
"__id__": 53
}
],
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 56
}
],
"_prefab": null,
......@@ -2526,16 +2686,16 @@
"_name": "first",
"_objFlags": 0,
"_parent": {
"__id__": 49
"__id__": 52
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 54
},
{
"__id__": 52
"__id__": 55
}
],
"_prefab": null,
......@@ -2591,7 +2751,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 53
},
"_enabled": true,
"_fontFamily": "Arial",
......@@ -2614,7 +2774,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 53
},
"_enabled": true,
"alignMode": 2,
......@@ -2641,7 +2801,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 52
},
"_enabled": true,
"_fontFamily": "Arial",
......@@ -2664,17 +2824,17 @@
"_name": "last",
"_objFlags": 0,
"_parent": {
"__id__": 48
"__id__": 51
},
"_children": [
{
"__id__": 55
"__id__": 58
}
],
"_active": false,
"_components": [
{
"__id__": 58
"__id__": 61
}
],
"_prefab": null,
......@@ -2730,16 +2890,16 @@
"_name": "first",
"_objFlags": 0,
"_parent": {
"__id__": 54
"__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 56
"__id__": 59
},
{
"__id__": 57
"__id__": 60
}
],
"_prefab": null,
......@@ -2795,7 +2955,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 58
},
"_enabled": true,
"_materials": [
......@@ -2828,7 +2988,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 58
},
"_enabled": true,
"alignMode": 2,
......@@ -2855,7 +3015,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 57
},
"_enabled": true,
"_materials": [
......@@ -2888,7 +3048,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2920,7 +3080,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 51
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2981,7 +3141,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 48
"__id__": 51
},
"_id": "353s8k2CVAc7KuCyimD4za"
},
......@@ -2994,22 +3154,25 @@
},
"_children": [
{
"__id__": 62
"__id__": 65
},
{
"__id__": 65
"__id__": 68
},
{
"__id__": 67
"__id__": 70
},
{
"__id__": 69
"__id__": 72
}
],
"_active": false,
"_components": [
{
"__id__": 71
"__id__": 74
},
{
"__id__": 75
}
],
"_prefab": null,
......@@ -3023,8 +3186,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
"width": 2176,
"height": 1600
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -3065,16 +3228,16 @@
"_name": "bg_btm",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 63
"__id__": 66
},
{
"__id__": 64
"__id__": 67
}
],
"_prefab": null,
......@@ -3100,8 +3263,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-1.361,
0.888,
0,
0,
0,
0,
0,
......@@ -3130,7 +3293,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -3162,7 +3325,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 65
},
"_enabled": true,
"alignMode": 2,
......@@ -3189,13 +3352,13 @@
"_name": "bg_light",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 66
"__id__": 69
}
],
"_prefab": null,
......@@ -3251,7 +3414,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 68
},
"_enabled": true,
"_materials": [
......@@ -3283,13 +3446,13 @@
"_name": "bg_tryagain",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 68
"__id__": 71
}
],
"_prefab": null,
......@@ -3345,7 +3508,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
"__id__": 70
},
"_enabled": true,
"_materials": [
......@@ -3377,13 +3540,13 @@
"_name": "bg_success",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 70
"__id__": 73
}
],
"_prefab": null,
......@@ -3439,7 +3602,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 69
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -3471,7 +3634,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 64
},
"_enabled": true,
"alignMode": 2,
......@@ -3493,6 +3656,16 @@
"_originalHeight": 0,
"_id": "92BzAVl8JJPqEhiO5n32B0"
},
{
"__type__": "cc.BlockInputEvents",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
},
"_enabled": true,
"_id": "c4+HuZrxNNzoHrIA23FzVQ"
},
{
"__type__": "cc.Node",
"_name": "btn_record",
......@@ -3502,22 +3675,22 @@
},
"_children": [
{
"__id__": 73
"__id__": 77
},
{
"__id__": 75
"__id__": 79
},
{
"__id__": 79
"__id__": 83
}
],
"_active": false,
"_components": [
{
"__id__": 81
"__id__": 85
},
{
"__id__": 82
"__id__": 86
}
],
"_prefab": null,
......@@ -3573,13 +3746,13 @@
"_name": "guid_ske",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 76
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 74
"__id__": 78
}
],
"_prefab": null,
......@@ -3635,7 +3808,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 77
},
"_enabled": true,
"_materials": [
......@@ -3675,17 +3848,17 @@
"_name": "btn_record",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 76
},
"_children": [
{
"__id__": 76
"__id__": 80
}
],
"_active": true,
"_components": [
{
"__id__": 78
"__id__": 82
}
],
"_prefab": null,
......@@ -3741,13 +3914,13 @@
"_name": "icon_record",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 81
}
],
"_prefab": null,
......@@ -3803,7 +3976,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -3835,7 +4008,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 79
},
"_enabled": true,
"_materials": [
......@@ -3867,13 +4040,13 @@
"_name": "icon_record",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 76
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 84
}
],
"_prefab": null,
......@@ -3929,7 +4102,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 83
},
"_enabled": true,
"_materials": [
......@@ -3961,7 +4134,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 76
},
"_enabled": false,
"_materials": [
......@@ -3993,7 +4166,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 76
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4054,7 +4227,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 72
"__id__": 76
},
"_id": "b09HfTfohGxpd5Ff9vXa7G"
},
......@@ -4067,28 +4240,28 @@
},
"_children": [
{
"__id__": 84
"__id__": 88
},
{
"__id__": 86
"__id__": 90
},
{
"__id__": 88
"__id__": 92
},
{
"__id__": 90
"__id__": 94
}
],
"_active": false,
"_components": [
{
"__id__": 92
"__id__": 96
},
{
"__id__": 93
"__id__": 97
},
{
"__id__": 94
"__id__": 98
}
],
"_prefab": null,
......@@ -4144,13 +4317,13 @@
"_name": "icon_recording",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 87
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 89
}
],
"_prefab": null,
......@@ -4206,7 +4379,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 88
},
"_enabled": false,
"_materials": [
......@@ -4238,13 +4411,13 @@
"_name": "p0",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 87
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 87
"__id__": 91
}
],
"_prefab": null,
......@@ -4300,7 +4473,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -4332,13 +4505,13 @@
"_name": "p1",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 87
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 89
"__id__": 93
}
],
"_prefab": null,
......@@ -4394,7 +4567,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
"__id__": 92
},
"_enabled": true,
"_materials": [
......@@ -4426,13 +4599,13 @@
"_name": "p2",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 87
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 91
"__id__": 95
}
],
"_prefab": null,
......@@ -4488,7 +4661,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4520,7 +4693,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 87
},
"_enabled": true,
"_materials": [
......@@ -4552,7 +4725,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 87
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4613,7 +4786,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 83
"__id__": 87
},
"_id": "feA2HsnyFASLUXjdq0vRse"
},
......@@ -4622,7 +4795,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 87
},
"_enabled": true,
"_id": "09R5wk/0NITYGz7Es4tALJ"
......@@ -4638,7 +4811,7 @@
"_active": false,
"_components": [
{
"__id__": 96
"__id__": 100
}
],
"_prefab": null,
......@@ -4694,7 +4867,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
"__id__": 99
},
"_enabled": false,
"_materials": [
......@@ -4730,19 +4903,19 @@
},
"_children": [
{
"__id__": 98
"__id__": 102
}
],
"_active": false,
"_components": [
{
"__id__": 100
"__id__": 104
},
{
"__id__": 101
"__id__": 105
},
{
"__id__": 102
"__id__": 106
}
],
"_prefab": null,
......@@ -4798,13 +4971,13 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 101
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 99
"__id__": 103
}
],
"_prefab": null,
......@@ -4860,7 +5033,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 102
},
"_enabled": true,
"_materials": [
......@@ -4892,7 +5065,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 101
},
"_enabled": true,
"_materials": [
......@@ -4924,12 +5097,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 101
},
"_enabled": true,
"_N$totalLength": 1383.3,
"_N$barSprite": {
"__id__": 99
"__id__": 103
},
"_N$mode": 0,
"_N$progress": 0,
......@@ -4941,7 +5114,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 101
},
"_enabled": true,
"costtime": 4,
......@@ -4956,10 +5129,10 @@
},
"_children": [
{
"__id__": 104
"__id__": 108
},
{
"__id__": 107
"__id__": 111
}
],
"_active": false,
......@@ -5017,16 +5190,16 @@
"_name": "invalid-name",
"_objFlags": 0,
"_parent": {
"__id__": 103
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 105
"__id__": 109
},
{
"__id__": 106
"__id__": 110
}
],
"_prefab": null,
......@@ -5082,7 +5255,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
"__id__": 108
},
"_enabled": true,
"_materials": [
......@@ -5114,7 +5287,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
"__id__": 108
},
"_enabled": true,
"r_width": 1,
......@@ -5135,16 +5308,16 @@
"_name": "invalid-name_2",
"_objFlags": 0,
"_parent": {
"__id__": 103
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 108
"__id__": 112
},
{
"__id__": 109
"__id__": 113
}
],
"_prefab": null,
......@@ -5200,7 +5373,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 111
},
"_enabled": true,
"_materials": [
......@@ -5232,7 +5405,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 111
},
"_enabled": true,
"r_width": 1,
......@@ -5257,16 +5430,16 @@
},
"_children": [
{
"__id__": 111
"__id__": 115
},
{
"__id__": 113
"__id__": 117
}
],
"_active": false,
"_components": [
{
"__id__": 116
"__id__": 120
}
],
"_prefab": null,
......@@ -5322,13 +5495,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 110
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 112
"__id__": 116
}
],
"_prefab": null,
......@@ -5384,7 +5557,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 111
"__id__": 115
},
"_enabled": true,
"_materials": [
......@@ -5416,16 +5589,16 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 110
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 114
"__id__": 118
},
{
"__id__": 115
"__id__": 119
}
],
"_prefab": null,
......@@ -5481,7 +5654,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
"__id__": 117
},
"_enabled": true,
"_materials": [
......@@ -5516,7 +5689,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
"__id__": 117
},
"_enabled": true,
"_color": {
......@@ -5534,7 +5707,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 110
"__id__": 114
},
"_enabled": true,
"r_width": 0,
......@@ -5559,22 +5732,22 @@
},
"_children": [
{
"__id__": 118
"__id__": 122
},
{
"__id__": 121
"__id__": 125
},
{
"__id__": 124
"__id__": 128
},
{
"__id__": 131
"__id__": 135
},
{
"__id__": 138
"__id__": 142
},
{
"__id__": 141
"__id__": 145
}
],
"_active": false,
......@@ -5632,11 +5805,11 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 117
"__id__": 121
},
"_children": [
{
"__id__": 119
"__id__": 123
}
],
"_active": true,
......@@ -5694,13 +5867,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 118
"__id__": 122
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 124
}
],
"_prefab": null,
......@@ -5756,7 +5929,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 123
},
"_enabled": true,
"_materials": [
......@@ -5788,11 +5961,11 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 117
"__id__": 121
},
"_children": [
{
"__id__": 122
"__id__": 126
}
],
"_active": true,
......@@ -5850,13 +6023,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 121
"__id__": 125
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 123
"__id__": 127
}
],
"_prefab": null,
......@@ -5912,7 +6085,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 122
"__id__": 126
},
"_enabled": true,
"_materials": [
......@@ -5944,14 +6117,14 @@
"_name": "line2",
"_objFlags": 0,
"_parent": {
"__id__": 117
"__id__": 121
},
"_children": [
{
"__id__": 125
"__id__": 129
},
{
"__id__": 127
"__id__": 131
}
],
"_active": true,
......@@ -6009,13 +6182,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 128
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 126
"__id__": 130
}
],
"_prefab": null,
......@@ -6071,7 +6244,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 125
"__id__": 129
},
"_enabled": true,
"_materials": [
......@@ -6103,17 +6276,17 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 128
},
"_children": [
{
"__id__": 128
"__id__": 132
}
],
"_active": false,
"_components": [
{
"__id__": 130
"__id__": 134
}
],
"_prefab": null,
......@@ -6169,13 +6342,13 @@
"_name": "combined-shape-copy-2",
"_objFlags": 0,
"_parent": {
"__id__": 127
"__id__": 131
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 129
"__id__": 133
}
],
"_prefab": null,
......@@ -6231,7 +6404,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 128
"__id__": 132
},
"_enabled": true,
"_materials": [
......@@ -6263,7 +6436,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 131
},
"_enabled": true,
"_materials": [
......@@ -6295,14 +6468,14 @@
"_name": "line3",
"_objFlags": 0,
"_parent": {
"__id__": 117
"__id__": 121
},
"_children": [
{
"__id__": 132
"__id__": 136
},
{
"__id__": 134
"__id__": 138
}
],
"_active": true,
......@@ -6360,13 +6533,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 135
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 133
"__id__": 137
}
],
"_prefab": null,
......@@ -6422,7 +6595,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 136
},
"_enabled": true,
"_materials": [
......@@ -6454,17 +6627,17 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 135
},
"_children": [
{
"__id__": 135
"__id__": 139
}
],
"_active": false,
"_components": [
{
"__id__": 137
"__id__": 141
}
],
"_prefab": null,
......@@ -6520,13 +6693,13 @@
"_name": "combined-shape-copy-2",
"_objFlags": 0,
"_parent": {
"__id__": 134
"__id__": 138
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 136
"__id__": 140
}
],
"_prefab": null,
......@@ -6582,7 +6755,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 135
"__id__": 139
},
"_enabled": true,
"_materials": [
......@@ -6614,7 +6787,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 138
},
"_enabled": true,
"_materials": [
......@@ -6646,11 +6819,11 @@
"_name": "line4",
"_objFlags": 0,
"_parent": {
"__id__": 117
"__id__": 121
},
"_children": [
{
"__id__": 139
"__id__": 143
}
],
"_active": true,
......@@ -6708,13 +6881,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 138
"__id__": 142
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 140
"__id__": 144
}
],
"_prefab": null,
......@@ -6770,7 +6943,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 139
"__id__": 143
},
"_enabled": true,
"_materials": [
......@@ -6802,11 +6975,11 @@
"_name": "line5",
"_objFlags": 0,
"_parent": {
"__id__": 117
"__id__": 121
},
"_children": [
{
"__id__": 142
"__id__": 146
}
],
"_active": true,
......@@ -6864,13 +7037,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 145
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 143
"__id__": 147
}
],
"_prefab": null,
......@@ -6926,7 +7099,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 146
},
"_enabled": true,
"_materials": [
......@@ -6962,13 +7135,13 @@
},
"_children": [
{
"__id__": 145
"__id__": 149
},
{
"__id__": 152
"__id__": 156
},
{
"__id__": 159
"__id__": 163
}
],
"_active": false,
......@@ -7026,23 +7199,23 @@
"_name": "sub_0",
"_objFlags": 0,
"_parent": {
"__id__": 144
"__id__": 148
},
"_children": [
{
"__id__": 146
"__id__": 150
},
{
"__id__": 148
"__id__": 152
}
],
"_active": true,
"_components": [
{
"__id__": 150
"__id__": 154
},
{
"__id__": 151
"__id__": 155
}
],
"_prefab": null,
......@@ -7098,13 +7271,13 @@
"_name": "combined-shape_4",
"_objFlags": 0,
"_parent": {
"__id__": 145
"__id__": 149
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 147
"__id__": 151
}
],
"_prefab": null,
......@@ -7160,7 +7333,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
"__id__": 150
},
"_enabled": true,
"_materials": [
......@@ -7192,13 +7365,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 145
"__id__": 149
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 149
"__id__": 153
}
],
"_prefab": null,
......@@ -7254,7 +7427,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
"__id__": 152
},
"_enabled": true,
"_materials": [
......@@ -7289,7 +7462,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 149
},
"_enabled": true,
"_materials": [
......@@ -7321,7 +7494,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 149
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7382,7 +7555,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 145
"__id__": 149
},
"_id": "e9hETjbwFN6ofBSoo7woie"
},
......@@ -7391,23 +7564,23 @@
"_name": "sub_1",
"_objFlags": 0,
"_parent": {
"__id__": 144
"__id__": 148
},
"_children": [
{
"__id__": 153
"__id__": 157
},
{
"__id__": 155
"__id__": 159
}
],
"_active": true,
"_components": [
{
"__id__": 157
"__id__": 161
},
{
"__id__": 158
"__id__": 162
}
],
"_prefab": null,
......@@ -7463,13 +7636,13 @@
"_name": "combined-shape_3",
"_objFlags": 0,
"_parent": {
"__id__": 152
"__id__": 156
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 154
"__id__": 158
}
],
"_prefab": null,
......@@ -7525,7 +7698,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 153
"__id__": 157
},
"_enabled": true,
"_materials": [
......@@ -7557,13 +7730,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 152
"__id__": 156
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 156
"__id__": 160
}
],
"_prefab": null,
......@@ -7619,7 +7792,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 155
"__id__": 159
},
"_enabled": true,
"_materials": [
......@@ -7654,7 +7827,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 156
},
"_enabled": true,
"_materials": [
......@@ -7686,7 +7859,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 156
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7747,7 +7920,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 152
"__id__": 156
},
"_id": "8cGgjvgvhL/LuPKRoVnVQq"
},
......@@ -7756,20 +7929,20 @@
"_name": "main",
"_objFlags": 0,
"_parent": {
"__id__": 144
"__id__": 148
},
"_children": [
{
"__id__": 160
"__id__": 164
},
{
"__id__": 162
"__id__": 166
}
],
"_active": true,
"_components": [
{
"__id__": 164
"__id__": 168
}
],
"_prefab": null,
......@@ -7825,13 +7998,13 @@
"_name": "oval-18",
"_objFlags": 0,
"_parent": {
"__id__": 159
"__id__": 163
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 161
"__id__": 165
}
],
"_prefab": null,
......@@ -7887,7 +8060,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
"__id__": 164
},
"_enabled": true,
"_materials": [
......@@ -7919,13 +8092,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 159
"__id__": 163
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 163
"__id__": 167
}
],
"_prefab": null,
......@@ -7981,7 +8154,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 162
"__id__": 166
},
"_enabled": true,
"_materials": [
......@@ -8016,7 +8189,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 159
"__id__": 163
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8077,7 +8250,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 159
"__id__": 163
},
"_id": "f41Ic5OXhCRpAxS/kMIRiA"
},
......@@ -8092,7 +8265,7 @@
"_active": false,
"_components": [
{
"__id__": 166
"__id__": 170
}
],
"_prefab": null,
......@@ -8148,7 +8321,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 165
"__id__": 169
},
"_enabled": true,
"_materials": [
......@@ -8242,19 +8415,19 @@
},
"_children": [
{
"__id__": 169
"__id__": 173
},
{
"__id__": 171
"__id__": 175
},
{
"__id__": 173
"__id__": 177
}
],
"_active": false,
"_components": [
{
"__id__": 175
"__id__": 179
}
],
"_prefab": null,
......@@ -8310,13 +8483,13 @@
"_name": "bg_blue",
"_objFlags": 0,
"_parent": {
"__id__": 168
"__id__": 172
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 170
"__id__": 174
}
],
"_prefab": null,
......@@ -8372,7 +8545,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 173
},
"_enabled": true,
"_materials": [
......@@ -8404,13 +8577,13 @@
"_name": "bg_green",
"_objFlags": 0,
"_parent": {
"__id__": 168
"__id__": 172
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 172
"__id__": 176
}
],
"_prefab": null,
......@@ -8466,7 +8639,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 171
"__id__": 175
},
"_enabled": true,
"_materials": [
......@@ -8498,13 +8671,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 168
"__id__": 172
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 174
"__id__": 178
}
],
"_prefab": null,
......@@ -8560,7 +8733,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
"__id__": 177
},
"_enabled": true,
"_materials": [
......@@ -8595,7 +8768,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 168
"__id__": 172
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8656,7 +8829,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 168
"__id__": 172
},
"_id": "176BYmeDpPZ68HlISEHa8t"
},
......@@ -8726,12 +8899,6 @@
"__id__": 2
},
"_children": [
{
"__id__": 178
},
{
"__id__": 180
},
{
"__id__": 182
},
......@@ -8741,14 +8908,20 @@
{
"__id__": 186
},
{
"__id__": 188
},
{
"__id__": 190
},
{
"__id__": 194
}
],
"_active": false,
"_components": [
{
"__id__": 196
"__id__": 200
}
],
"_prefab": null,
......@@ -8804,13 +8977,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 181
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 179
"__id__": 183
}
],
"_prefab": null,
......@@ -8866,7 +9039,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 178
"__id__": 182
},
"_enabled": true,
"_materials": [
......@@ -8898,13 +9071,13 @@
"_name": "chose",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 181
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 181
"__id__": 185
}
],
"_prefab": null,
......@@ -8960,7 +9133,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 184
},
"_enabled": true,
"_materials": [
......@@ -8992,13 +9165,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 181
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 183
"__id__": 187
}
],
"_prefab": null,
......@@ -9054,7 +9227,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 186
},
"_enabled": true,
"_materials": [
......@@ -9086,13 +9259,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 181
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 185
"__id__": 189
}
],
"_prefab": null,
......@@ -9148,7 +9321,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 184
"__id__": 188
},
"_enabled": true,
"_materials": [
......@@ -9183,17 +9356,17 @@
"_name": "fail",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 181
},
"_children": [
{
"__id__": 187
"__id__": 191
}
],
"_active": false,
"_components": [
{
"__id__": 189
"__id__": 193
}
],
"_prefab": null,
......@@ -9249,13 +9422,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 186
"__id__": 190
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 188
"__id__": 192
}
],
"_prefab": null,
......@@ -9311,7 +9484,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 187
"__id__": 191
},
"_enabled": true,
"_materials": [
......@@ -9346,7 +9519,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 190
},
"_enabled": true,
"_materials": [
......@@ -9378,20 +9551,20 @@
"_name": "success",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 181
},
"_children": [
{
"__id__": 191
"__id__": 195
},
{
"__id__": 193
"__id__": 197
}
],
"_active": false,
"_components": [
{
"__id__": 195
"__id__": 199
}
],
"_prefab": null,
......@@ -9447,13 +9620,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 190
"__id__": 194
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 192
"__id__": 196
}
],
"_prefab": null,
......@@ -9509,7 +9682,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 191
"__id__": 195
},
"_enabled": true,
"_materials": [
......@@ -9544,13 +9717,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 190
"__id__": 194
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 194
"__id__": 198
}
],
"_prefab": null,
......@@ -9606,7 +9779,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 193
"__id__": 197
},
"_enabled": true,
"_materials": [
......@@ -9638,7 +9811,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
"__id__": 194
},
"_enabled": true,
"_materials": [
......@@ -9670,7 +9843,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 177
"__id__": 181
},
"_enabled": true,
"_normalMaterial": null,
......@@ -9731,7 +9904,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 177
"__id__": 181
},
"_id": "58IQ76yf1KT71BqZoNtHOV"
},
......@@ -9746,7 +9919,7 @@
"_active": false,
"_components": [
{
"__id__": 198
"__id__": 202
}
],
"_prefab": null,
......@@ -9802,7 +9975,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 197
"__id__": 201
},
"_enabled": true,
"r_width": 0,
......@@ -9829,13 +10002,13 @@
"_active": false,
"_components": [
{
"__id__": 200
"__id__": 204
},
{
"__id__": 201
"__id__": 205
},
{
"__id__": 202
"__id__": 206
}
],
"_prefab": null,
......@@ -9891,7 +10064,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 199
"__id__": 203
},
"_enabled": true,
"_materials": [
......@@ -9923,7 +10096,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 199
"__id__": 203
},
"_enabled": true,
"_normalMaterial": null,
......@@ -9984,7 +10157,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 199
"__id__": 203
},
"_id": "86ErSTSUhP26kFUGhhqqPn"
},
......@@ -9993,7 +10166,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 199
"__id__": 203
},
"_enabled": true,
"r_width": 0,
......@@ -10020,10 +10193,10 @@
"_active": false,
"_components": [
{
"__id__": 204
"__id__": 208
},
{
"__id__": 205
"__id__": 209
}
],
"_prefab": null,
......@@ -10079,7 +10252,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 203
"__id__": 207
},
"_enabled": true,
"_layoutSize": {
......@@ -10111,7 +10284,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 203
"__id__": 207
},
"_enabled": true,
"alignMode": 1,
......@@ -10260,7 +10433,7 @@
"_active": false,
"_components": [
{
"__id__": 209
"__id__": 213
}
],
"_prefab": null,
......@@ -10316,7 +10489,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 208
"__id__": 212
},
"_enabled": true,
"_materials": [
......@@ -10360,13 +10533,13 @@
},
"_children": [
{
"__id__": 211
"__id__": 215
}
],
"_active": false,
"_components": [
{
"__id__": 215
"__id__": 219
}
],
"_prefab": null,
......@@ -10422,17 +10595,17 @@
"_name": "Star",
"_objFlags": 0,
"_parent": {
"__id__": 210
"__id__": 214
},
"_children": [
{
"__id__": 212
"__id__": 216
}
],
"_active": false,
"_components": [
{
"__id__": 214
"__id__": 218
}
],
"_prefab": null,
......@@ -10488,13 +10661,13 @@
"_name": "StarBig",
"_objFlags": 0,
"_parent": {
"__id__": 211
"__id__": 215
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 213
"__id__": 217
}
],
"_prefab": null,
......@@ -10550,7 +10723,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 212
"__id__": 216
},
"_enabled": true,
"_materials": [
......@@ -10582,7 +10755,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 211
"__id__": 215
},
"_enabled": true,
"_materials": [
......@@ -10614,7 +10787,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 210
"__id__": 214
},
"_enabled": true,
"_materials": [
......@@ -10649,12 +10822,6 @@
"__id__": 2
},
"_children": [
{
"__id__": 217
},
{
"__id__": 219
},
{
"__id__": 221
},
......@@ -10666,6 +10833,12 @@
},
{
"__id__": 227
},
{
"__id__": 229
},
{
"__id__": 231
}
],
"_active": false,
......@@ -10723,13 +10896,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 216
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 218
"__id__": 222
}
],
"_prefab": null,
......@@ -10785,7 +10958,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 217
"__id__": 221
},
"_enabled": true,
"_materials": [
......@@ -10817,13 +10990,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 216
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 220
"__id__": 224
}
],
"_prefab": null,
......@@ -10879,7 +11052,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 219
"__id__": 223
},
"_enabled": true,
"_materials": [
......@@ -10911,13 +11084,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 216
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 222
"__id__": 226
}
],
"_prefab": null,
......@@ -10973,7 +11146,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 221
"__id__": 225
},
"_enabled": true,
"_materials": [
......@@ -11005,13 +11178,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 216
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 224
"__id__": 228
}
],
"_prefab": null,
......@@ -11067,7 +11240,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 223
"__id__": 227
},
"_enabled": true,
"_materials": [
......@@ -11099,13 +11272,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 216
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 226
"__id__": 230
}
],
"_prefab": null,
......@@ -11161,7 +11334,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 225
"__id__": 229
},
"_enabled": true,
"_materials": [
......@@ -11193,13 +11366,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 216
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 228
"__id__": 232
}
],
"_prefab": null,
......@@ -11255,7 +11428,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 227
"__id__": 231
},
"_enabled": true,
"_materials": [
......@@ -11291,19 +11464,19 @@
},
"_children": [
{
"__id__": 230
"__id__": 234
},
{
"__id__": 235
"__id__": 239
},
{
"__id__": 240
"__id__": 244
},
{
"__id__": 245
"__id__": 249
},
{
"__id__": 250
"__id__": 254
}
],
"_active": false,
......@@ -11361,11 +11534,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 229
"__id__": 233
},
"_children": [
{
"__id__": 231
"__id__": 235
}
],
"_active": true,
......@@ -11423,17 +11596,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 230
"__id__": 234
},
"_children": [
{
"__id__": 232
"__id__": 236
}
],
"_active": true,
"_components": [
{
"__id__": 234
"__id__": 238
}
],
"_prefab": null,
......@@ -11489,13 +11662,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 231
"__id__": 235
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 233
"__id__": 237
}
],
"_prefab": null,
......@@ -11551,7 +11724,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 232
"__id__": 236
},
"_enabled": true,
"_materials": [
......@@ -11583,7 +11756,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 231
"__id__": 235
},
"_enabled": true,
"_materials": [
......@@ -11605,11 +11778,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 229
"__id__": 233
},
"_children": [
{
"__id__": 236
"__id__": 240
}
],
"_active": true,
......@@ -11667,17 +11840,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 235
"__id__": 239
},
"_children": [
{
"__id__": 237
"__id__": 241
}
],
"_active": true,
"_components": [
{
"__id__": 239
"__id__": 243
}
],
"_prefab": null,
......@@ -11733,13 +11906,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 236
"__id__": 240
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 238
"__id__": 242
}
],
"_prefab": null,
......@@ -11795,7 +11968,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 237
"__id__": 241
},
"_enabled": true,
"_materials": [
......@@ -11827,7 +12000,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 236
"__id__": 240
},
"_enabled": true,
"_materials": [
......@@ -11849,11 +12022,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 229
"__id__": 233
},
"_children": [
{
"__id__": 241
"__id__": 245
}
],
"_active": true,
......@@ -11911,17 +12084,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 240
"__id__": 244
},
"_children": [
{
"__id__": 242
"__id__": 246
}
],
"_active": true,
"_components": [
{
"__id__": 244
"__id__": 248
}
],
"_prefab": null,
......@@ -11977,13 +12150,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 241
"__id__": 245
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 243
"__id__": 247
}
],
"_prefab": null,
......@@ -12039,7 +12212,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 242
"__id__": 246
},
"_enabled": true,
"_materials": [
......@@ -12071,7 +12244,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 241
"__id__": 245
},
"_enabled": true,
"_materials": [
......@@ -12093,11 +12266,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 229
"__id__": 233
},
"_children": [
{
"__id__": 246
"__id__": 250
}
],
"_active": true,
......@@ -12155,17 +12328,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 245
"__id__": 249
},
"_children": [
{
"__id__": 247
"__id__": 251
}
],
"_active": true,
"_components": [
{
"__id__": 249
"__id__": 253
}
],
"_prefab": null,
......@@ -12221,13 +12394,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 246
"__id__": 250
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 248
"__id__": 252
}
],
"_prefab": null,
......@@ -12283,7 +12456,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 247
"__id__": 251
},
"_enabled": true,
"_materials": [
......@@ -12315,7 +12488,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 246
"__id__": 250
},
"_enabled": true,
"_materials": [
......@@ -12337,11 +12510,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 229
"__id__": 233
},
"_children": [
{
"__id__": 251
"__id__": 255
}
],
"_active": true,
......@@ -12399,17 +12572,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 250
"__id__": 254
},
"_children": [
{
"__id__": 252
"__id__": 256
}
],
"_active": true,
"_components": [
{
"__id__": 254
"__id__": 258
}
],
"_prefab": null,
......@@ -12465,13 +12638,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 251
"__id__": 255
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 253
"__id__": 257
}
],
"_prefab": null,
......@@ -12527,7 +12700,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 252
"__id__": 256
},
"_enabled": true,
"_materials": [
......@@ -12559,7 +12732,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 251
"__id__": 255
},
"_enabled": true,
"_materials": [
......
......@@ -277,7 +277,7 @@ cc.Class({
let icon_hand = pg.view.find(this, "icon_hand");
let btn_picture = pg.view.find(this, "btn_picture");
pg.view.visible(btn_replay, false);
this.hideRestartBtn();
pg.view.visible(btn_record, false);
pg.view.visible(end, false);//不显示的内容用false
pg.view.visible(end_success, false);
......@@ -328,7 +328,7 @@ cc.Class({
pg.view.visible(btn_replay, false);
this.hideRestartBtn();
pg.view.visible(btn_record, false);
this.playPartAni()
this.playWordAni().then(() => {
......@@ -364,7 +364,7 @@ cc.Class({
pg.view.visible(icon_hand, false);
pg.view.visible(btn_record, false);
pg.view.visible(btn_replay, false);
this.hideRestartBtn();
pg.view.visible(btn_recording, true);
pg.view.visible(progress, true);
},
......@@ -416,7 +416,10 @@ cc.Class({
let btn_picture = pg.view.find(this, "btn_picture");
// 一局失败弹出tryagain,同时下方录音按钮明亮并出现提示
this.playSFX("audio_tryagain");
this.playSFX("audio_tryagain").then(() => {
pg.view.visible(bg_tryagain, false);
pg.view.visible(end, false);
})
pg.view.visible(end, true);
pg.view.visible(bg_tryagain, true);
pg.view.visible(btn_recording, false);
......@@ -510,7 +513,7 @@ cc.Class({
dragonDisplay.playAnimation(this.animationName, 1);//animation所有的动画名称
});
},
playWordAni() {
playWordAni(jumpWait) {
return new Promise((resolve, reject) => {
let btn_replay = pg.view.find(this, "btn_replay")
let btn_recording = pg.view.find(this, "btn_recording")
......@@ -531,7 +534,7 @@ cc.Class({
this._playing = true;
icon_ex_txt.active = false;
icon_ex.active = false;
this._timeoutIds.push(setTimeout(() => {
if (jumpWait) {
pg.view.visible(icon_ex, true);
let icon_ex_word = this._stageData.word;
let aniFinished = false;
......@@ -550,7 +553,28 @@ cc.Class({
resolve('');
}
})
}, 1000 * 2));
} else {
this._timeoutIds.push(setTimeout(() => {
pg.view.visible(icon_ex, true);
let icon_ex_word = this._stageData.word;
let aniFinished = false;
let audioFinished = false;
this.wordAni(icon_ex_txt, icon_ex_word).then(() => {
aniFinished = true;
if (aniFinished && audioFinished) {
this._playing = false;
resolve('');
}
})
pg.audio.playAudioByUrl(this._stageData.sound).then(() => {
audioFinished = true;
if (aniFinished && audioFinished) {
this._playing = false;
resolve('');
}
})
}, 1000 * 2));
}
});
},
playRecordAudio() {
......@@ -573,7 +597,7 @@ cc.Class({
let icon_hand = pg.view.find(this, "icon_hand");
let btn_picture = pg.view.find(this, "btn_picture");
pg.view.visible(btn_record, true);
pg.view.visible(btn_replay, true);
this.showRestartBtn();
if (this._audio_record) {
this._playing = false;
resolve("");
......@@ -653,7 +677,7 @@ cc.Class({
"fluency": 60,
"rhythm": 90,
"kernel_version": "5.2.4",
"overall": 75,
"overall": 25,//75
"integrity": 100,
"duration": "6.779",
"rear_tone": "fall",
......@@ -670,6 +694,7 @@ cc.Class({
},
recrodEnd(data) {
let score = data.result.overall;
score = (score / 100) * 40 + (100 - 40);
// score = 40;
if (score > 50) {
GameManager.getIns().setState(3);
......@@ -711,7 +736,7 @@ cc.Class({
},
onTouchWord() {
if (this._playing) return;
this.playWordAni();
this.playWordAni(true);
},
onTouchCat() {
if (this._playing) return;
......@@ -745,7 +770,7 @@ cc.Class({
let btn_record = pg.view.find(this, "btn_record")
let btn_recording = pg.view.find(this, "btn_recording")
let progress = pg.view.find(this, "progress")
pg.view.visible(btn_replay, false);//隐藏
this.hideRestartBtn();//隐藏
pg.view.visible(btn_record, false);
pg.view.visible(btn_recording, true);//显示
pg.view.visible(progress, true);
......@@ -759,7 +784,7 @@ cc.Class({
let end = pg.view.find(this, "end")
let ant_ske = pg.view.find(this, "ant_ske")
let ax_ske = pg.view.find(this, "ax_ske")
pg.view.visible(btn_replay, false);
this.hideRestartBtn();
pg.view.visible(btn_record, false);
pg.view.visible(btn_recording, false);
pg.view.visible(progress, false);
......@@ -773,10 +798,8 @@ cc.Class({
initStep2() {
let btn_replay = pg.view.find(this, "btn_replay")
let btn_record = pg.view.find(this, "btn_record")
pg.view.visible(btn_replay, true);
this.showRestartBtn();
pg.view.visible(btn_record, true);
},
initStep3() {
......@@ -792,7 +815,39 @@ cc.Class({
//显示replay
showRestartBtn() {
const btn = cc.find('Canvas/btn_replay');
if (btn.canClick) {
return;
}
btn.active = true;
btn.canClick = true;
const circle = cc.find('Canvas/btn_replay/btn_restart_circle');
cc.tween(circle)
.set({ scale: 0.8, opacity: 255 })
.to(2, { scale: 1.2, opacity: 0 })
.union()
.repeatForever()
.start();
},
hideRestartBtn() {
console.log('hideRestartBtn');
const btn = cc.find('Canvas/btn_replay');
if (!btn.canClick) {
return;
}
btn.canClick = false;
btn.active = false;
const circle = cc.find('Canvas/btn_replay/btn_restart_circle');
circle.stopAllActions();
circle.scale = 0.8;
circle.opacity = 255;
},
//
......@@ -814,8 +869,6 @@ cc.Class({
this.createFireworkAni().then(() => {
// 游戏结束时需要调用这个方法通知系统作业完成
onHomeworkFinish();
// pg.view.visible(this.btn_replay, true);
})
},
......
......@@ -20,6 +20,11 @@ class GameManager {
console.log(`init`);
}
parseData(data) {
this._list = [];
this._stage = 0;//关卡
this._state = 0;//状态
this._cat = {};
this._tryagain = {};
console.log(data);
this._cat = data.contentObj.picArr.cat;
this._tryagain = data.contentObj.picArr.tryagain;
......
{
"ver": "2.3.5",
"uuid": "5e1cc31e-9ab3-4cb1-b57c-c83e08e1c58d",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 262,
"height": 268,
"platformSettings": {},
"subMetas": {
"btn_restart": {
"ver": "1.0.4",
"uuid": "3f3258fc-f4c1-4862-bc12-6467ec15b5b3",
"rawTextureUuid": "5e1cc31e-9ab3-4cb1-b57c-c83e08e1c58d",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 262,
"height": 268,
"rawWidth": 262,
"rawHeight": 268,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "69bdf5db-fc29-42d1-bf66-c20cf0dbe674",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 409,
"height": 409,
"platformSettings": {},
"subMetas": {
"btn_restart_circle": {
"ver": "1.0.4",
"uuid": "b34babe1-0856-4403-9446-7b6e2bbe9f15",
"rawTextureUuid": "69bdf5db-fc29-42d1-bf66-c20cf0dbe674",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 409,
"height": 409,
"rawWidth": 409,
"rawHeight": 409,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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