Commit f58b805b authored by 李帅's avatar 李帅

+1

parent 225ebf93
......@@ -77,53 +77,53 @@
{
"__id__": 7
},
{
"__id__": 9
},
{
"__id__": 11
},
{
"__id__": 14
"__id__": 13
},
{
"__id__": 17
"__id__": 16
},
{
"__id__": 19
},
{
"__id__": 70
"__id__": 21
},
{
"__id__": 75
"__id__": 72
},
{
"__id__": 78
"__id__": 77
},
{
"__id__": 83
"__id__": 80
},
{
"__id__": 86
"__id__": 85
},
{
"__id__": 91
"__id__": 88
},
{
"__id__": 110
"__id__": 93
},
{
"__id__": 112
}
],
"_active": true,
"_components": [
{
"__id__": 114
"__id__": 116
},
{
"__id__": 115
"__id__": 117
},
{
"__id__": 116
"__id__": 118
}
],
"_prefab": null,
......@@ -373,11 +373,15 @@
"_parent": {
"__id__": 2
},
"_children": [],
"_children": [
{
"__id__": 8
}
],
"_active": true,
"_components": [
{
"__id__": 8
"__id__": 10
}
],
"_prefab": null,
......@@ -426,6 +430,68 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "b9SENajdtL7atheA5z8L6Y"
},
{
"__type__": "cc.Node",
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 9
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 520,
"height": 560
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "damML95g5P/LzgAPNp1SXW"
},
{
......@@ -433,7 +499,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
"__id__": 8
},
"_enabled": true,
"_materials": [
......@@ -458,6 +524,26 @@
"_atlas": null,
"_id": "b6xYZuPy1J0JtkdIrxF4PC"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_spriteFrame": null,
"_type": 0,
"_segments": 64,
"_N$alphaThreshold": 0.1,
"_N$inverted": false,
"_id": "44LWb06rpEVJmRQLlKfO0t"
},
{
"__type__": "cc.Node",
"_name": "bg_pic",
......@@ -469,7 +555,7 @@
"_active": true,
"_components": [
{
"__id__": 10
"__id__": 12
}
],
"_prefab": null,
......@@ -525,7 +611,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 9
"__id__": 11
},
"_enabled": true,
"_materials": [
......@@ -563,10 +649,10 @@
"_active": false,
"_components": [
{
"__id__": 12
"__id__": 14
},
{
"__id__": 13
"__id__": 15
}
],
"_prefab": null,
......@@ -622,7 +708,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
"__id__": 13
},
"_enabled": true,
"_materials": [
......@@ -654,7 +740,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
"__id__": 13
},
"_enabled": true,
"_normalMaterial": null,
......@@ -728,10 +814,10 @@
"_active": false,
"_components": [
{
"__id__": 15
"__id__": 17
},
{
"__id__": 16
"__id__": 18
}
],
"_prefab": null,
......@@ -787,7 +873,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 14
"__id__": 16
},
"_enabled": true,
"_materials": [
......@@ -819,7 +905,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 14
"__id__": 16
},
"_enabled": true,
"_normalMaterial": null,
......@@ -893,7 +979,7 @@
"_active": true,
"_components": [
{
"__id__": 18
"__id__": 20
}
],
"_prefab": null,
......@@ -949,7 +1035,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
"__id__": 19
},
"_enabled": true,
"_materials": [
......@@ -985,13 +1071,13 @@
},
"_children": [
{
"__id__": 20
"__id__": 22
}
],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 71
}
],
"_prefab": null,
......@@ -1006,7 +1092,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 650,
"height": 640
"height": 620
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1018,7 +1104,7 @@
"ctor": "Float64Array",
"array": [
297,
-32,
-22,
0,
0,
0,
......@@ -1047,26 +1133,26 @@
"_name": "view",
"_objFlags": 512,
"_parent": {
"__id__": 19
"__id__": 21
},
"_children": [
{
"__id__": 21
"__id__": 23
},
{
"__id__": 24
"__id__": 26
},
{
"__id__": 62
"__id__": 64
}
],
"_active": true,
"_components": [
{
"__id__": 67
"__id__": 69
},
{
"__id__": 68
"__id__": 70
}
],
"_prefab": null,
......@@ -1081,7 +1167,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 650,
"height": 640
"height": 620
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1122,16 +1208,16 @@
"_name": "content",
"_objFlags": 512,
"_parent": {
"__id__": 20
"__id__": 22
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 22
"__id__": 24
},
{
"__id__": 23
"__id__": 25
}
],
"_prefab": null,
......@@ -1158,7 +1244,7 @@
"ctor": "Float64Array",
"array": [
0,
320,
310,
0,
0,
0,
......@@ -1187,7 +1273,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
"__id__": 23
},
"_enabled": true,
"alignMode": 1,
......@@ -1214,7 +1300,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
"__id__": 23
},
"_enabled": true,
"_layoutSize": {
......@@ -1233,7 +1319,7 @@
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 48,
"_N$paddingBottom": 35,
"_N$paddingBottom": 60,
"_N$spacingX": 0,
"_N$spacingY": 58,
"_N$verticalDirection": 1,
......@@ -1246,38 +1332,38 @@
"_name": "item",
"_objFlags": 0,
"_parent": {
"__id__": 20
"__id__": 22
},
"_children": [
{
"__id__": 25
"__id__": 27
},
{
"__id__": 28
"__id__": 30
},
{
"__id__": 32
"__id__": 34
},
{
"__id__": 36
"__id__": 38
},
{
"__id__": 39
"__id__": 41
},
{
"__id__": 49
"__id__": 51
}
],
"_active": false,
"_components": [
{
"__id__": 60
"__id__": 62
},
{
"__id__": 61
"__id__": 63
},
{
"__id__": 66
"__id__": 68
}
],
"_prefab": null,
......@@ -1333,16 +1419,16 @@
"_name": "icon_tip",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 26
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 26
"__id__": 28
},
{
"__id__": 27
"__id__": 29
}
],
"_prefab": null,
......@@ -1398,7 +1484,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
"__id__": 27
},
"_enabled": true,
"_materials": [
......@@ -1430,7 +1516,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
"__id__": 27
},
"_enabled": true,
"alignMode": 1,
......@@ -1457,19 +1543,19 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 26
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 31
},
{
"__id__": 30
"__id__": 32
},
{
"__id__": 31
"__id__": 33
}
],
"_prefab": null,
......@@ -1525,7 +1611,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 30
},
"_enabled": true,
"_materials": [
......@@ -1560,7 +1646,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 30
},
"_enabled": true,
"alignMode": 1,
......@@ -1587,11 +1673,11 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 30
},
"_enabled": true,
"label": {
"__id__": 29
"__id__": 31
},
"_id": "1711BQVPJEyr92fkrtWanD"
},
......@@ -1600,19 +1686,19 @@
"_name": "btn_record",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 26
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 33
"__id__": 35
},
{
"__id__": 34
"__id__": 36
},
{
"__id__": 35
"__id__": 37
}
],
"_prefab": null,
......@@ -1668,7 +1754,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 34
},
"_enabled": true,
"_materials": [
......@@ -1700,7 +1786,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 34
},
"_enabled": true,
"alignMode": 1,
......@@ -1727,7 +1813,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 34
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1795,16 +1881,16 @@
"_name": "btn_record_click",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 26
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 37
"__id__": 39
},
{
"__id__": 38
"__id__": 40
}
],
"_prefab": null,
......@@ -1860,7 +1946,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 38
},
"_enabled": true,
"_materials": [
......@@ -1892,7 +1978,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 38
},
"_enabled": true,
"alignMode": 1,
......@@ -1919,29 +2005,29 @@
"_name": "btn_myrecord",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 26
},
"_children": [
{
"__id__": 40
},
{
"__id__": 42
},
{
"__id__": 44
},
{
"__id__": 46
}
],
"_active": false,
"_components": [
{
"__id__": 46
"__id__": 48
},
{
"__id__": 47
"__id__": 49
},
{
"__id__": 48
"__id__": 50
}
],
"_prefab": null,
......@@ -1997,13 +2083,13 @@
"_name": "icon_myrecord1",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 41
"__id__": 43
}
],
"_prefab": null,
......@@ -2059,7 +2145,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 42
},
"_enabled": true,
"_materials": [
......@@ -2091,13 +2177,13 @@
"_name": "icon_myrecord2",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 43
"__id__": 45
}
],
"_prefab": null,
......@@ -2153,7 +2239,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 44
},
"_enabled": true,
"_materials": [
......@@ -2185,13 +2271,13 @@
"_name": "icon_myrecord3",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 45
"__id__": 47
}
],
"_prefab": null,
......@@ -2247,7 +2333,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 46
},
"_enabled": true,
"_materials": [
......@@ -2279,7 +2365,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 41
},
"_enabled": true,
"_materials": [
......@@ -2311,7 +2397,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 41
},
"_enabled": true,
"alignMode": 1,
......@@ -2338,7 +2424,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 41
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2406,32 +2492,32 @@
"_name": "btn_myrecord_play",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 26
},
"_children": [
{
"__id__": 50
},
{
"__id__": 52
},
{
"__id__": 54
},
{
"__id__": 56
}
],
"_active": false,
"_components": [
{
"__id__": 56
"__id__": 58
},
{
"__id__": 57
"__id__": 59
},
{
"__id__": 58
"__id__": 60
},
{
"__id__": 59
"__id__": 61
}
],
"_prefab": null,
......@@ -2487,13 +2573,13 @@
"_name": "icon_myrecord1",
"_objFlags": 0,
"_parent": {
"__id__": 49
"__id__": 51
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 53
}
],
"_prefab": null,
......@@ -2549,7 +2635,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 52
},
"_enabled": true,
"_materials": [
......@@ -2581,13 +2667,13 @@
"_name": "icon_myrecord2",
"_objFlags": 0,
"_parent": {
"__id__": 49
"__id__": 51
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 55
}
],
"_prefab": null,
......@@ -2643,7 +2729,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 54
},
"_enabled": true,
"_materials": [
......@@ -2675,13 +2761,13 @@
"_name": "icon_myrecord3",
"_objFlags": 0,
"_parent": {
"__id__": 49
"__id__": 51
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 57
}
],
"_prefab": null,
......@@ -2737,7 +2823,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 56
},
"_enabled": true,
"_materials": [
......@@ -2769,7 +2855,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2801,7 +2887,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 51
},
"_enabled": true,
"_defaultClip": {
......@@ -2820,7 +2906,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 51
},
"_enabled": true,
"alignMode": 1,
......@@ -2847,7 +2933,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 51
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2915,7 +3001,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 26
},
"_enabled": true,
"alignMode": 1,
......@@ -2942,29 +3028,29 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 26
},
"_enabled": true,
"label": {
"__id__": 31
"__id__": 33
},
"tip": {
"__id__": 25
"__id__": 27
},
"record": {
"__id__": 32
"__id__": 34
},
"record_click": {
"__id__": 36
"__id__": 38
},
"myrecord": {
"__id__": 39
"__id__": 41
},
"myrecord_play": {
"__id__": 49
"__id__": 51
},
"low": {
"__id__": 62
"__id__": 64
},
"_id": "78sbViiXNOl5SgddmNDgr+"
},
......@@ -2973,17 +3059,17 @@
"_name": "low",
"_objFlags": 0,
"_parent": {
"__id__": 20
"__id__": 22
},
"_children": [
{
"__id__": 63
"__id__": 65
}
],
"_active": false,
"_components": [
{
"__id__": 65
"__id__": 67
}
],
"_prefab": null,
......@@ -3039,13 +3125,13 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 66
}
],
"_prefab": null,
......@@ -3101,7 +3187,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -3136,7 +3222,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -3168,7 +3254,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 26
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3236,7 +3322,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
"__id__": 22
},
"_enabled": true,
"_materials": [
......@@ -3256,7 +3342,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
"__id__": 22
},
"_enabled": true,
"alignMode": 1,
......@@ -3283,7 +3369,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 21
},
"_enabled": true,
"horizontal": false,
......@@ -3295,10 +3381,10 @@
"scrollEvents": [],
"cancelInnerEvents": true,
"_N$content": {
"__id__": 21
"__id__": 23
},
"content": {
"__id__": 21
"__id__": 23
},
"_N$horizontalScrollBar": null,
"_N$verticalScrollBar": null,
......@@ -3313,16 +3399,16 @@
},
"_children": [
{
"__id__": 71
"__id__": 73
}
],
"_active": false,
"_components": [
{
"__id__": 73
"__id__": 75
},
{
"__id__": 74
"__id__": 76
}
],
"_prefab": null,
......@@ -3378,13 +3464,13 @@
"_name": "icon_record",
"_objFlags": 0,
"_parent": {
"__id__": 70
"__id__": 72
},
"_children": [],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 72
"__id__": 74
}
],
"_prefab": null,
......@@ -3440,7 +3526,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 73
},
"_enabled": true,
"_materials": [
......@@ -3480,7 +3566,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 72
},
"_enabled": true,
"alignMode": 1,
......@@ -3507,7 +3593,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 72
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3581,10 +3667,10 @@
"_active": false,
"_components": [
{
"__id__": 76
"__id__": 78
},
{
"__id__": 77
"__id__": 79
}
],
"_prefab": null,
......@@ -3640,7 +3726,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 77
},
"_enabled": true,
"_materials": [
......@@ -3672,7 +3758,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 77
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3744,13 +3830,13 @@
},
"_children": [
{
"__id__": 79
"__id__": 81
}
],
"_active": false,
"_components": [
{
"__id__": 82
"__id__": 84
}
],
"_prefab": null,
......@@ -3806,16 +3892,16 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 80
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 82
},
{
"__id__": 81
"__id__": 83
}
],
"_prefab": null,
......@@ -3871,7 +3957,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 81
},
"_enabled": true,
"_materials": [
......@@ -3906,7 +3992,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 81
},
"_enabled": false,
"_color": {
......@@ -3924,7 +4010,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -3962,10 +4048,10 @@
"_active": false,
"_components": [
{
"__id__": 84
"__id__": 86
},
{
"__id__": 85
"__id__": 87
}
],
"_prefab": null,
......@@ -4021,7 +4107,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 85
},
"_enabled": true,
"_materials": [
......@@ -4053,7 +4139,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 85
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4125,16 +4211,16 @@
},
"_children": [
{
"__id__": 87
"__id__": 89
}
],
"_active": true,
"_components": [
{
"__id__": 89
"__id__": 91
},
{
"__id__": 90
"__id__": 92
}
],
"_prefab": null,
......@@ -4190,13 +4276,13 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 90
}
],
"_prefab": null,
......@@ -4252,7 +4338,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 89
},
"_enabled": true,
"_materials": [
......@@ -4285,7 +4371,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -4317,7 +4403,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 88
},
"_enabled": true,
"alignMode": 1,
......@@ -4348,25 +4434,25 @@
},
"_children": [
{
"__id__": 92
"__id__": 94
},
{
"__id__": 96
"__id__": 98
},
{
"__id__": 99
"__id__": 101
},
{
"__id__": 101
"__id__": 103
},
{
"__id__": 105
"__id__": 107
}
],
"_active": false,
"_components": [
{
"__id__": 109
"__id__": 111
}
],
"_prefab": null,
......@@ -4422,19 +4508,19 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 93
"__id__": 95
},
{
"__id__": 94
"__id__": 96
},
{
"__id__": 95
"__id__": 97
}
],
"_prefab": null,
......@@ -4490,7 +4576,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4522,7 +4608,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 94
},
"_enabled": true,
"alignMode": 1,
......@@ -4549,7 +4635,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 94
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4617,16 +4703,16 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 97
"__id__": 99
},
{
"__id__": 98
"__id__": 100
}
],
"_prefab": null,
......@@ -4682,7 +4768,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 98
},
"_enabled": true,
"_materials": [
......@@ -4714,7 +4800,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 98
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4775,7 +4861,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 96
"__id__": 98
},
"_id": "dbf6SlfeFJtqujsCK52/CR"
},
......@@ -4784,13 +4870,13 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 102
}
],
"_prefab": null,
......@@ -4846,7 +4932,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 101
},
"_enabled": true,
"_materials": [
......@@ -4881,16 +4967,16 @@
"_name": "start",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 93
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 102
"__id__": 104
},
{
"__id__": 103
"__id__": 105
}
],
"_prefab": null,
......@@ -4946,7 +5032,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 103
},
"_enabled": true,
"_materials": [
......@@ -4978,7 +5064,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 103
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4987,7 +5073,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 104
"__id__": 106
}
],
"_N$interactable": true,
......@@ -5043,7 +5129,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 101
"__id__": 103
},
"_id": "f86X4c6OtP4K2F2ODiAK9B"
},
......@@ -5062,16 +5148,16 @@
"_name": "restart",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 93
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 106
"__id__": 108
},
{
"__id__": 107
"__id__": 109
}
],
"_prefab": null,
......@@ -5127,7 +5213,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 107
},
"_enabled": true,
"_materials": [
......@@ -5159,7 +5245,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 107
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5168,7 +5254,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 108
"__id__": 110
}
],
"_N$interactable": true,
......@@ -5243,7 +5329,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
"__id__": 93
},
"_enabled": true,
"alignMode": 1,
......@@ -5274,7 +5360,7 @@
},
"_children": [
{
"__id__": 111
"__id__": 113
}
],
"_active": true,
......@@ -5332,11 +5418,11 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 110
"__id__": 112
},
"_children": [
{
"__id__": 112
"__id__": 114
}
],
"_active": true,
......@@ -5394,13 +5480,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 113
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 113
"__id__": 115
}
],
"_prefab": null,
......@@ -5456,7 +5542,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
"__id__": 114
},
"_enabled": true,
"_clip": {
......@@ -5523,13 +5609,13 @@
},
"_enabled": true,
"item": {
"__id__": 24
"__id__": 26
},
"content": {
"__id__": 21
"__id__": 23
},
"tip": {
"__id__": 91
"__id__": 93
},
"_id": "eaTVUpqahPfZeO9+sUI7RP"
}
......
/*
* @Author: ls
* @Date: 2022-05-15 18:22:18
* @LastEditTime: 2022-06-08 23:00:12
* @LastEditTime: 2022-06-10 11:11:44
* @LastEditors: ls
* @Description:
* @FilePath: \ls_gramophone\assets\ls_gramophone\scene\ls_gramophone.ts
......@@ -30,6 +30,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
// 倒计时
_countdown = 30;
// 当前
_curIndex = -1;
addPreloadImage() {
// TODO 根据自己的配置预加载图片资源
this._imageResList.push({ url: this.data.pageImage });
......@@ -69,9 +72,11 @@ export default class SceneComponent extends MyCocosSceneComponent {
cc.find('Canvas/bg_title/label').getComponent(cc.Label).string = this.data.title;
// this.getSpriteFrimeByUrl(this.data.pageImage + '?x-oss-process=image/resize,m_lfit,h_143,w_560', (sp) => {
this.getSpriteFrimeByUrl(this.data.pageImage, (sp) => {
cc.find('Canvas/bg_img').getComponent(cc.Sprite).spriteFrame = sp;
this.getSpriteFrimeByUrl(this.data.pageImage + '?x-oss-process=image/resize,m_fill,h_520,w_560', (sp) => {
// this.getSpriteFrimeByUrl(this.data.pageImage, (sp) => {
cc.find('Canvas/bg_img/img').getComponent(cc.Sprite).spriteFrame = sp;
cc.find('Canvas/bg_img/img').scale = Math.max(520 / cc.find('Canvas/bg_img/img').width, 560 / cc.find('Canvas/bg_img/img').height);
});
let play = cc.find('Canvas/btn_play');
......@@ -81,14 +86,16 @@ export default class SceneComponent extends MyCocosSceneComponent {
play.off('click');
stop.off('click');
play.on('click', () => {
this.resetText();
this.resetRecord();
cc.audioEngine.stopAll();
play.active = false;
stop.active = true;
});
stop.on('click', () => {
this.resetText();
this.resetRecord();
cc.audioEngine.stopAll();
play.active = true;
stop.active = false;
......@@ -144,6 +151,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
mask.active = true;
record_start.active = true;
record_stop.active = false;
this._curIndex = index;
});
element.getComponent(Item).hideRecord();
......@@ -173,8 +182,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
// 录音界面
let mask = cc.find('Canvas/mask');
mask.active = false;
let icon_record = cc.find('Canvas/mask/icon_record');
icon_record.active = false;
// icon_record.getComponent(dragonBones.ArmatureDisplay).timeScale = 0;
let record_start = cc.find('Canvas/btn_record_start');
let record_stop = cc.find('Canvas/btn_record_stop');
......@@ -188,14 +198,18 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.playLocalAudio('btn');
mask.active = true;
icon_record.active = true;
// icon_record.getComponent(dragonBones.ArmatureDisplay).timeScale = 1;
record_start.active = false;
record_stop.active = true;
countdown.active = true;
let cd = 10;
if (this._curIndex !== -1) {
cd = this.data.sentences[this._curIndex].countdown;
}
this.unschedule(this.onCountdown);
this._countdown = 30 + 1;
this._countdown = cd + 1;
this.onCountdown();
this.schedule(this.onCountdown, 1);
......@@ -209,13 +223,14 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.playLocalAudio('btn');
mask.active = false;
icon_record.active = false;
// icon_record.getComponent(dragonBones.ArmatureDisplay).timeScale = 0;
record_start.active = false;
record_stop.active = false;
countdown.active = false;
this.unschedule(this.onCountdown);
this._curIndex = -1;
this._recording = false;
......@@ -368,8 +383,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
onCallBack(event: cc.Event.EventTouch, str: string) {
this.playLocalAudio('btn');
if (str === 'start' || str === 'restart') {
cc.audioEngine.stopAll();
this.playLocalAudio('btn');
this.hideTip();
} else if (str === 'record_start') {
} else if (str === 'record_stop') {
......
/*
* @Author: ls
* @Date: 2022-05-15 18:22:18
* @LastEditTime: 2022-06-08 21:16:09
* @LastEditTime: 2022-06-10 10:54:08
* @LastEditors: ls
* @Description:
* @FilePath: \ls_gramophone\assets\ls_gramophone\script\defaultData.ts
......@@ -15,23 +15,28 @@ export const defaultData = {
pageAudio: 'http://staging-teach.cdn.ireadabc.com/c0e467e1950cb24b1e581737a1344cb4.mp3', // 整体音频
sentences: [
{
countdown: 7,
text: 'Good morning',
audio: 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3',
audio: 'http://staging-teach.cdn.ireadabc.com/c0e467e1950cb24b1e581737a1344cb4.mp3',
},
{
countdown: 8,
text: 'what can i do for you',
audio: 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3',
audio: 'http://staging-teach.cdn.ireadabc.com/c0e467e1950cb24b1e581737a1344cb4.mp3',
},
{
countdown: 9,
text: 'Hello, how are you',
audio: 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3',
},
{
countdown: 10,
text: 'Hello, how old are you you',
audio: 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3',
},
{
text: 'Hello, how dare you, Hello, how dare you',
countdown: 11,
text: 'Hello, how dare you, Hello, how dare you how dare you how dare you how dare you h',
audio: 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3',
},
],
......
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