Commit e4471bfd authored by Tt's avatar Tt

修改

parent eb692f80
......@@ -75,40 +75,40 @@
"__id__": 5
},
{
"__id__": 7
"__id__": 13
},
{
"__id__": 15
"__id__": 16
},
{
"__id__": 18
"__id__": 70
},
{
"__id__": 72
"__id__": 73
},
{
"__id__": 75
"__id__": 108
},
{
"__id__": 109
"__id__": 110
},
{
"__id__": 111
"__id__": 112
},
{
"__id__": 113
"__id__": 114
}
],
"_active": true,
"_components": [
{
"__id__": 133
},
{
"__id__": 134
},
{
"__id__": 135
},
{
"__id__": 136
}
],
"_prefab": null,
......@@ -257,100 +257,6 @@
"_alignWithScreen": true,
"_id": "81GN3uXINKVLeW4+iKSlim"
},
{
"__type__": "cc.Node",
"_name": "bg_again",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 6
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 584,
"height": 163
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
1641.217,
863.992,
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": "26BKMgnhtG1ILYnCRkq2ar"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "7bc8f383-057f-46fa-8431-19b148c76a1f"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "21FfYOJDxGWKFPs7q98BhO"
},
{
"__type__": "cc.Node",
"_name": "bg",
......@@ -360,16 +266,16 @@
},
"_children": [
{
"__id__": 8
"__id__": 6
},
{
"__id__": 11
"__id__": 9
}
],
"_active": true,
"_components": [
{
"__id__": 14
"__id__": 12
}
],
"_prefab": null,
......@@ -425,16 +331,16 @@
"_name": "bg_wall",
"_objFlags": 0,
"_parent": {
"__id__": 7
"__id__": 5
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 9
"__id__": 7
},
{
"__id__": 10
"__id__": 8
}
],
"_prefab": null,
......@@ -490,7 +396,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
"__id__": 6
},
"_enabled": true,
"_materials": [
......@@ -522,7 +428,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
"__id__": 6
},
"_enabled": true,
"alignMode": 1,
......@@ -549,16 +455,16 @@
"_name": "bg_bottom",
"_objFlags": 0,
"_parent": {
"__id__": 7
"__id__": 5
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 12
"__id__": 10
},
{
"__id__": 13
"__id__": 11
}
],
"_prefab": null,
......@@ -614,7 +520,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
"__id__": 9
},
"_enabled": true,
"_materials": [
......@@ -646,7 +552,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
"__id__": 9
},
"_enabled": true,
"alignMode": 1,
......@@ -673,7 +579,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
"__id__": 5
},
"_enabled": true,
"alignMode": 1,
......@@ -706,10 +612,10 @@
"_active": true,
"_components": [
{
"__id__": 16
"__id__": 14
},
{
"__id__": 17
"__id__": 15
}
],
"_prefab": null,
......@@ -765,7 +671,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
"__id__": 13
},
"_enabled": true,
"alignMode": 1,
......@@ -792,7 +698,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
"__id__": 13
},
"_enabled": true,
"_normalMaterial": null,
......@@ -853,7 +759,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 15
"__id__": 13
},
"_id": "49gKv9YnNGGb71uG9nSzID"
},
......@@ -866,28 +772,28 @@
},
"_children": [
{
"__id__": 19
"__id__": 17
},
{
"__id__": 20
"__id__": 18
},
{
"__id__": 22
"__id__": 20
},
{
"__id__": 59
"__id__": 57
},
{
"__id__": 63
"__id__": 61
},
{
"__id__": 67
"__id__": 65
}
],
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 69
}
],
"_prefab": null,
......@@ -943,7 +849,7 @@
"_name": "img_board",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 16
},
"_children": [],
"_active": true,
......@@ -1001,13 +907,13 @@
"_name": "layout_item",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 21
"__id__": 19
}
],
"_prefab": null,
......@@ -1063,7 +969,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
"__id__": 18
},
"_enabled": false,
"_materials": [
......@@ -1083,32 +989,32 @@
"_name": "item",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 16
},
"_children": [
{
"__id__": 23
"__id__": 21
},
{
"__id__": 27
"__id__": 25
},
{
"__id__": 31
"__id__": 29
},
{
"__id__": 35
"__id__": 33
},
{
"__id__": 37
"__id__": 35
},
{
"__id__": 39
"__id__": 37
}
],
"_active": true,
"_components": [
{
"__id__": 58
"__id__": 56
}
],
"_prefab": null,
......@@ -1164,17 +1070,17 @@
"_name": "bg_1",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 20
},
"_children": [
{
"__id__": 24
"__id__": 22
}
],
"_active": true,
"_components": [
{
"__id__": 26
"__id__": 24
}
],
"_prefab": null,
......@@ -1230,13 +1136,13 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 21
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 23
}
],
"_prefab": null,
......@@ -1292,7 +1198,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 22
},
"_enabled": true,
"_materials": [
......@@ -1324,7 +1230,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 21
},
"_enabled": true,
"_materials": [
......@@ -1356,17 +1262,17 @@
"_name": "bg_2",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 20
},
"_children": [
{
"__id__": 28
"__id__": 26
}
],
"_active": false,
"_components": [
{
"__id__": 30
"__id__": 28
}
],
"_prefab": null,
......@@ -1422,13 +1328,13 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 27
"__id__": 25
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 27
}
],
"_prefab": null,
......@@ -1484,7 +1390,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 26
},
"_enabled": true,
"_materials": [
......@@ -1516,7 +1422,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 25
},
"_enabled": true,
"_materials": [
......@@ -1548,17 +1454,17 @@
"_name": "bg_3",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 20
},
"_children": [
{
"__id__": 32
"__id__": 30
}
],
"_active": false,
"_components": [
{
"__id__": 34
"__id__": 32
}
],
"_prefab": null,
......@@ -1614,13 +1520,13 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 31
"__id__": 29
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 31
}
],
"_prefab": null,
......@@ -1676,7 +1582,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 30
},
"_enabled": true,
"_materials": [
......@@ -1708,7 +1614,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 29
},
"_enabled": true,
"_materials": [
......@@ -1740,13 +1646,13 @@
"_name": "bg_number",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 20
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 36
"__id__": 34
}
],
"_prefab": null,
......@@ -1802,7 +1708,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 33
},
"_enabled": true,
"_materials": [
......@@ -1834,13 +1740,13 @@
"_name": "label_round",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 20
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 38
"__id__": 36
}
],
"_prefab": null,
......@@ -1896,7 +1802,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 35
},
"_enabled": true,
"_materials": [
......@@ -1929,26 +1835,26 @@
"_name": "btn_voice",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 20
},
"_children": [
{
"__id__": 40
"__id__": 38
},
{
"__id__": 44
"__id__": 42
},
{
"__id__": 50
"__id__": 48
}
],
"_active": true,
"_components": [
{
"__id__": 56
"__id__": 54
},
{
"__id__": 57
"__id__": 55
}
],
"_prefab": null,
......@@ -2004,17 +1910,17 @@
"_name": "p3",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 37
},
"_children": [
{
"__id__": 41
"__id__": 39
}
],
"_active": false,
"_components": [
{
"__id__": 43
"__id__": 41
}
],
"_prefab": null,
......@@ -2070,13 +1976,13 @@
"_name": "icon_laba",
"_objFlags": 0,
"_parent": {
"__id__": 40
"__id__": 38
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 42
"__id__": 40
}
],
"_prefab": null,
......@@ -2102,7 +2008,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-28.787,
-12.96,
9.253,
0,
0,
......@@ -2132,7 +2038,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 39
},
"_enabled": true,
"_materials": [
......@@ -2164,7 +2070,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 38
},
"_enabled": true,
"_materials": [
......@@ -2196,20 +2102,20 @@
"_name": "p2",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 37
},
"_children": [
{
"__id__": 45
"__id__": 43
},
{
"__id__": 47
"__id__": 45
}
],
"_active": false,
"_components": [
{
"__id__": 49
"__id__": 47
}
],
"_prefab": null,
......@@ -2265,13 +2171,13 @@
"_name": "icon_laba",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 44
}
],
"_prefab": null,
......@@ -2297,7 +2203,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-28.787,
-11.99,
9.253,
0,
0,
......@@ -2327,7 +2233,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -2359,13 +2265,13 @@
"_name": "icon_laba2",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 46
}
],
"_prefab": null,
......@@ -2391,7 +2297,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
4.737,
21.534,
10.421,
0,
0,
......@@ -2421,7 +2327,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 45
},
"_enabled": true,
"_materials": [
......@@ -2453,7 +2359,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 42
},
"_enabled": true,
"_materials": [
......@@ -2485,20 +2391,20 @@
"_name": "p1",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 37
},
"_children": [
{
"__id__": 51
"__id__": 49
},
{
"__id__": 53
"__id__": 51
}
],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 53
}
],
"_prefab": null,
......@@ -2554,13 +2460,13 @@
"_name": "icon_laba",
"_objFlags": 0,
"_parent": {
"__id__": 50
"__id__": 48
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 52
"__id__": 50
}
],
"_prefab": null,
......@@ -2586,7 +2492,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-28.787,
-11.971,
9.253,
0,
0,
......@@ -2616,7 +2522,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -2648,13 +2554,13 @@
"_name": "icon_laba2",
"_objFlags": 0,
"_parent": {
"__id__": 50
"__id__": 48
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 52
}
],
"_prefab": null,
......@@ -2680,7 +2586,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
11.558,
28.374,
10.421,
0,
0,
......@@ -2710,7 +2616,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2742,7 +2648,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 48
},
"_enabled": true,
"_materials": [
......@@ -2774,7 +2680,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 37
},
"_enabled": true,
"alignMode": 2,
......@@ -2801,7 +2707,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 37
},
"_enabled": true,
"_id": "a0WvSneXdFbryZmBtbSwAu"
......@@ -2811,7 +2717,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
"__id__": 20
},
"_enabled": false,
"_materials": [
......@@ -2843,17 +2749,17 @@
"_name": "item_little",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 16
},
"_children": [
{
"__id__": 60
"__id__": 58
}
],
"_active": false,
"_components": [
{
"__id__": 62
"__id__": 60
}
],
"_prefab": null,
......@@ -2909,13 +2815,13 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 59
}
],
"_prefab": null,
......@@ -2971,7 +2877,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 58
},
"_enabled": true,
"_materials": [
......@@ -3003,7 +2909,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
"__id__": 57
},
"_enabled": true,
"_materials": [
......@@ -3035,19 +2941,19 @@
"_name": "btn_last",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 62
},
{
"__id__": 65
"__id__": 63
},
{
"__id__": 66
"__id__": 64
}
],
"_prefab": null,
......@@ -3103,7 +3009,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 61
},
"_enabled": true,
"_materials": [
......@@ -3135,7 +3041,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 61
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3203,7 +3109,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 61
},
"_enabled": true,
"alignMode": 1,
......@@ -3230,19 +3136,19 @@
"_name": "btn_next",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 68
"__id__": 66
},
{
"__id__": 69
"__id__": 67
},
{
"__id__": 70
"__id__": 68
}
],
"_prefab": null,
......@@ -3298,7 +3204,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -3330,7 +3236,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
"__id__": 65
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3398,7 +3304,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
"__id__": 65
},
"_enabled": true,
"alignMode": 1,
......@@ -3425,7 +3331,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 16
},
"_enabled": true,
"alignMode": 1,
......@@ -3458,10 +3364,10 @@
"_active": true,
"_components": [
{
"__id__": 73
"__id__": 71
},
{
"__id__": 74
"__id__": 72
}
],
"_prefab": null,
......@@ -3517,7 +3423,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 70
},
"_enabled": true,
"_materials": [
......@@ -3557,7 +3463,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 70
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3629,19 +3535,19 @@
},
"_children": [
{
"__id__": 76
"__id__": 74
},
{
"__id__": 104
"__id__": 102
},
{
"__id__": 106
"__id__": 105
}
],
"_active": true,
"_components": [
{
"__id__": 108
"__id__": 107
}
],
"_prefab": null,
......@@ -3697,17 +3603,17 @@
"_name": "layout_cover",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 73
},
"_children": [
{
"__id__": 77
"__id__": 75
}
],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 101
}
],
"_prefab": null,
......@@ -3763,23 +3669,23 @@
"_name": "btn_record",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 74
},
"_children": [
{
"__id__": 78
"__id__": 76
},
{
"__id__": 91
"__id__": 89
},
{
"__id__": 95
"__id__": 93
}
],
"_active": true,
"_components": [
{
"__id__": 102
"__id__": 100
}
],
"_prefab": null,
......@@ -3835,17 +3741,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 75
},
"_children": [
{
"__id__": 79
"__id__": 77
}
],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 88
}
],
"_prefab": null,
......@@ -3901,23 +3807,23 @@
"_name": "layout_btns",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 76
},
"_children": [
{
"__id__": 80
"__id__": 78
},
{
"__id__": 83
"__id__": 81
},
{
"__id__": 86
"__id__": 84
}
],
"_active": true,
"_components": [
{
"__id__": 89
"__id__": 87
}
],
"_prefab": null,
......@@ -3973,16 +3879,16 @@
"_name": "btn_right",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 77
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 81
"__id__": 79
},
{
"__id__": 82
"__id__": 80
}
],
"_prefab": null,
......@@ -4038,7 +3944,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 78
},
"_enabled": true,
"_materials": [
......@@ -4070,7 +3976,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 78
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4138,16 +4044,16 @@
"_name": "btn_play",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 77
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 84
"__id__": 82
},
{
"__id__": 85
"__id__": 83
}
],
"_prefab": null,
......@@ -4203,7 +4109,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 81
},
"_enabled": true,
"_materials": [
......@@ -4235,7 +4141,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 81
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4303,16 +4209,16 @@
"_name": "btn_stop",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 77
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 87
"__id__": 85
},
{
"__id__": 88
"__id__": 86
}
],
"_prefab": null,
......@@ -4368,7 +4274,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 84
},
"_enabled": true,
"_materials": [
......@@ -4400,7 +4306,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 84
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4468,7 +4374,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 77
},
"_enabled": true,
"_materials": [
......@@ -4500,7 +4406,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 76
},
"_enabled": true,
"_materials": [
......@@ -4520,17 +4426,17 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 75
},
"_children": [
{
"__id__": 92
"__id__": 90
}
],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 92
}
],
"_prefab": null,
......@@ -4586,13 +4492,13 @@
"_name": "ani",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 89
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 93
"__id__": 91
}
],
"_prefab": null,
......@@ -4648,7 +4554,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -4688,7 +4594,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
"__id__": 89
},
"_enabled": true,
"_materials": [
......@@ -4720,23 +4626,23 @@
"_name": "img_voice",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 75
},
"_children": [
{
"__id__": 96
"__id__": 94
},
{
"__id__": 97
"__id__": 95
},
{
"__id__": 99
"__id__": 97
}
],
"_active": false,
"_components": [
{
"__id__": 101
"__id__": 99
}
],
"_prefab": null,
......@@ -4792,7 +4698,7 @@
"_name": "p1",
"_objFlags": 0,
"_parent": {
"__id__": 95
"__id__": 93
},
"_children": [],
"_active": true,
......@@ -4850,13 +4756,13 @@
"_name": "p2",
"_objFlags": 0,
"_parent": {
"__id__": 95
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 98
"__id__": 96
}
],
"_prefab": null,
......@@ -4912,7 +4818,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 95
},
"_enabled": true,
"_materials": [
......@@ -4944,13 +4850,13 @@
"_name": "p3",
"_objFlags": 0,
"_parent": {
"__id__": 95
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 98
}
],
"_prefab": null,
......@@ -5006,7 +4912,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 97
},
"_enabled": true,
"_materials": [
......@@ -5038,7 +4944,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
"__id__": 93
},
"_enabled": true,
"_id": "1b37Xp6IVLg6RciXLxM7OU"
......@@ -5048,7 +4954,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 75
},
"_enabled": true,
"alignMode": 2,
......@@ -5075,7 +4981,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 74
},
"_enabled": true,
"alignMode": 1,
......@@ -5102,13 +5008,16 @@
"_name": "label_word",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 73
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 105
"__id__": 103
},
{
"__id__": 104
}
],
"_prefab": null,
......@@ -5164,7 +5073,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
"__id__": 102
},
"_enabled": true,
"_materials": [
......@@ -5194,18 +5103,45 @@
"_N$cacheMode": 0,
"_id": "84N8kDaWJInooia+ejqnHR"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 32.285000000000025,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "f0NMVwbpVJ5ZnFjFOfTyVq"
},
{
"__type__": "cc.Node",
"_name": "ani_good",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 73
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 107
"__id__": 106
}
],
"_prefab": null,
......@@ -5261,7 +5197,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 105
},
"_enabled": true,
"_materials": [
......@@ -5301,7 +5237,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 73
},
"_enabled": true,
"alignMode": 1,
......@@ -5334,7 +5270,7 @@
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 109
}
],
"_prefab": null,
......@@ -5390,7 +5326,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
"__id__": 108
},
"_enabled": true,
"_materials": [
......@@ -5417,6 +5353,100 @@
"_atlas": null,
"_id": "c2JLiXkDBKPIkZuS7pZ48C"
},
{
"__type__": "cc.Node",
"_name": "tip_again",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 111
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 584,
"height": 163
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-0.045,
75.059,
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": "26BKMgnhtG1ILYnCRkq2ar"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 110
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "7bc8f383-057f-46fa-8431-19b148c76a1f"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "21FfYOJDxGWKFPs7q98BhO"
},
{
"__type__": "cc.Node",
"_name": "tip_nopic",
......@@ -5428,7 +5458,7 @@
"_active": true,
"_components": [
{
"__id__": 112
"__id__": 113
}
],
"_prefab": null,
......@@ -5484,7 +5514,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 111
"__id__": 112
},
"_enabled": true,
"_materials": [
......@@ -5520,13 +5550,13 @@
},
"_children": [
{
"__id__": 114
"__id__": 115
},
{
"__id__": 117
"__id__": 118
},
{
"__id__": 120
"__id__": 121
}
],
"_active": false,
......@@ -5584,11 +5614,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 113
"__id__": 114
},
"_children": [
{
"__id__": 115
"__id__": 116
}
],
"_active": true,
......@@ -5646,13 +5676,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 114
"__id__": 115
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 116
"__id__": 117
}
],
"_prefab": null,
......@@ -5708,7 +5738,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
"__id__": 116
},
"_enabled": true,
"_materials": [],
......@@ -5739,11 +5769,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 113
"__id__": 114
},
"_children": [
{
"__id__": 118
"__id__": 119
}
],
"_active": true,
......@@ -5801,13 +5831,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 117
"__id__": 118
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 119
"__id__": 120
}
],
"_prefab": null,
......@@ -5863,7 +5893,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 119
},
"_enabled": true,
"_materials": [],
......@@ -5891,26 +5921,26 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 113
"__id__": 114
},
"_children": [
{
"__id__": 121
"__id__": 122
},
{
"__id__": 123
"__id__": 124
},
{
"__id__": 125
"__id__": 126
},
{
"__id__": 127
"__id__": 128
},
{
"__id__": 129
"__id__": 130
},
{
"__id__": 131
"__id__": 132
}
],
"_active": true,
......@@ -5968,13 +5998,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 120
"__id__": 121
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 122
"__id__": 123
}
],
"_prefab": null,
......@@ -6030,7 +6060,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 121
"__id__": 122
},
"_enabled": true,
"_clip": {
......@@ -6049,13 +6079,13 @@
"_name": "tip",
"_objFlags": 0,
"_parent": {
"__id__": 120
"__id__": 121
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 124
"__id__": 125
}
],
"_prefab": null,
......@@ -6111,7 +6141,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 124
},
"_enabled": true,
"_clip": {
......@@ -6130,13 +6160,13 @@
"_name": "tosmall",
"_objFlags": 0,
"_parent": {
"__id__": 120
"__id__": 121
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 126
"__id__": 127
}
],
"_prefab": null,
......@@ -6192,7 +6222,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 125
"__id__": 126
},
"_enabled": true,
"_clip": {
......@@ -6211,13 +6241,13 @@
"_name": "pagenext",
"_objFlags": 0,
"_parent": {
"__id__": 120
"__id__": 121
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 128
"__id__": 129
}
],
"_prefab": null,
......@@ -6273,7 +6303,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 128
},
"_enabled": true,
"_clip": {
......@@ -6292,13 +6322,13 @@
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 120
"__id__": 121
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 130
"__id__": 131
}
],
"_prefab": null,
......@@ -6354,7 +6384,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 129
"__id__": 130
},
"_enabled": true,
"_clip": {
......@@ -6373,13 +6403,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 120
"__id__": 121
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 132
"__id__": 133
}
],
"_prefab": null,
......@@ -6435,7 +6465,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 131
"__id__": 132
},
"_enabled": true,
"_clip": {
......@@ -6502,34 +6532,34 @@
},
"_enabled": true,
"layout_item": {
"__id__": 20
"__id__": 18
},
"layer_item": {
"__id__": 22
"__id__": 20
},
"layer_item_little": {
"__id__": 59
"__id__": 57
},
"btn_record": {
"__id__": 77
"__id__": 75
},
"layer_touch": {
"__id__": 15
"__id__": 13
},
"label_word": {
"__id__": 104
"__id__": 102
},
"ani_good": {
"__id__": 106
"__id__": 105
},
"ani_npc": {
"__id__": 72
"__id__": 70
},
"btn_last": {
"__id__": 63
"__id__": 61
},
"btn_next": {
"__id__": 67
"__id__": 65
},
"_id": "eaTVUpqahPfZeO9+sUI7RP"
}
......
......@@ -58,7 +58,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
public layer_item_little: cc.Node = null;
_cantouch = null;
private list: Array<{ type, text, right, imgage, duration, content, audio, npcAudio }>;
private list: Array<{ type, text, right, imgage, duration, content, audio, npcAudio, npcPlay }>;
private recordFlag: number;//录音模式
private score: number;
private scoreList: Array<number>;
......@@ -81,6 +81,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
private layers: Array<cc.Node>;
initView() {
pg.view.visible(pg.view.find(this, 'tip_record'), false);
pg.view.visible(pg.view.find(this, 'tip_again'), false);
pg.view.visible(pg.view.find(this, 'tip_nopic'), false);
}
......@@ -90,7 +91,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
initListener() {
pg.view.touchOn(this.btn_last, this.preLayer, this);
pg.view.touchOn(this.btn_next, this.nextLayer, this);
pg.view.touchOn(this.btn_record, this.onTouchRecord, this);
pg.view.touchOn(pg.view.find(this.btn_record, 'bg'), this.onTouchRecord, this);
pg.view.touchOn(this.ani_npc, this.onPlayNpc, this);
let layout_btns = pg.view.find(this.btn_record, "mask/layout_btns");
......@@ -252,6 +253,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
private recordAudioId: any;
async showRecorAudioPlay() {
if (!this.recordAudio) return;
this.touchForbid = false
let layout_btns = pg.view.find(this.btn_record, "mask/layout_btns");
let btn_right = pg.view.find(layout_btns, 'btn_right')
......@@ -263,8 +265,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
pg.audio.playAudioByUrl(this.recordAudio, () => {
this.recordAudioId = null;
this.showRecorAudioPlayEnd().then(() => {
this.showRecorAudioPlayEnd(false).then(() => {
if (this.recording) return;
this.showNpcAudioPlay().then(() => {
if (this.recording) return;
this.showNpcAudioPlayEnd();
this.nextLayer();
})
......@@ -273,10 +277,20 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.recordAudioId = audioId;
})
}
showRecorAudioPlayEnd() {
showRecorAudioPlayEnd(clear) {
return new Promise((resolve, reject) => {
if (!this.recordAudio) return;
if (this.recordAudioId) {
cc.audioEngine.stopEffect(this.recordAudioId)
this.recordAudioId = null;
}
if (clear) {
this.showRecordHide();
return;
}
let layout_btns = pg.view.find(this.btn_record, "mask/layout_btns");
let btn_right = pg.view.find(layout_btns, 'btn_right')
let btn_play = pg.view.find(layout_btns, 'btn_play')
......@@ -285,16 +299,12 @@ export default class SceneComponent extends MyCocosSceneComponent {
btn_play.active = true;
btn_stop.active = false;
if (this.recordAudioId) {
cc.audioEngine.stopEffect(this.recordAudioId)
this.recordAudioId = null;
}
// 播放文字内容
this.label_word.active = true;
pg.view.setString(this.label_word, this.recordAudioWord);
// 播放鼓励
this.ani_good.active = true;
pg.hw.playLocalAudio("right")
pg.view.playDBAnimation(this.ani_good, 'newAnimation', 1);
this._cantouch = false;
this.scheduleOnce(() => {
......@@ -315,6 +325,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
private npcAudioId: any;
showNpcAudioPlay() {
return new Promise((resolve, reject) => {
if (this.CurrentData.npcPlay) {
return resolve('');
}
this.CurrentData.npcPlay = true;
pg.view.playDBAnimation(this.ani_npc, 'newAnimation', 0);
pg.audio.playAudioByUrl(this.CurrentData.npcAudio, () => {
pg.view.playDBAnimation(this.ani_npc, 'newAnimation', 1);
......@@ -339,8 +353,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
// 停止播放录音
onTouchRecordStop() {
this.showRecorAudioPlayEnd().then(() => {
this.showRecorAudioPlayEnd(false).then(() => {
if (this.recording) return;
this.showNpcAudioPlay().then(() => {
if (this.recording) return;
this.showNpcAudioPlayEnd();
this.nextLayer();
})
......@@ -362,7 +378,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
async onTouchRecord() {
if (this.touchForbid) return;
if (this.recording) return;
if (this.recordAudio) return;
if (this.recordAudio) {
this.showRecorAudioPlayEnd(true);
}
this.recording = true;
this.recordAudio = '';
this.voiceTouchForbid = true;
......@@ -392,6 +410,15 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.recordAudio = data.audio;
this.recordAudioWord = data.text;
this.recording = false;
if (!this.recordAudioWord) {
pg.hw.playLocalAudio("tip")
let tip = pg.view.find(this, 'tip_again');
pg.view.visible(tip, true);
tip.opacity = 255;
cc.Tween.stopAllByTarget(tip)
cc.tween(tip).delay(0.8).to(0.5, { opacity: 0 }).start();
return;
}
this.showRecorAudioPlay();
}
private recordAudioWord: string;
......
......@@ -125,13 +125,13 @@
<div style="margin-top: 5px;">
<nz-radio-group [(ngModel)]="option.imageBig" (ngModelChange)="ngChange(i,j)">
<label nz-radio [nzValue]="1">
<span [style]="{color:option.imageBig== 1 ? '#169BD5':'#000'}">16:9比例</span>
<span [style]="{color:option.imageBig== 1 ? '#169BD5':'#000'}">4:3比例</span>
</label>
<label nz-radio [nzValue]="2">
<span [style]="{color:option.imageBig== 2 ? '#169BD5':'#000'}">2:1比例</span>
</label>
<label nz-radio [nzValue]="3">
<span [style]="{color:option.imageBig== 3 ? '#169BD5':'#000'}">4:3比例</span>
<span [style]="{color:option.imageBig== 3 ? '#169BD5':'#000'}">16:9比例</span>
</label>
</nz-radio-group>
</div>
......
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