Commit 43798a2b authored by limingzhe's avatar limingzhe

fix: debug

parent 9b2b5366
No preview for this file type
......@@ -17,7 +17,7 @@
"__id__": 2
},
{
"__id__": 202
"__id__": 208
}
],
"_active": false,
......@@ -84,40 +84,40 @@
"__id__": 16
},
{
"__id__": 79
"__id__": 85
},
{
"__id__": 123
"__id__": 129
},
{
"__id__": 130
"__id__": 136
},
{
"__id__": 143
"__id__": 149
},
{
"__id__": 148
"__id__": 154
},
{
"__id__": 150
"__id__": 156
},
{
"__id__": 152
"__id__": 158
},
{
"__id__": 155
"__id__": 161
}
],
"_active": true,
"_components": [
{
"__id__": 199
"__id__": 205
},
{
"__id__": 200
"__id__": 206
},
{
"__id__": 201
"__id__": 207
}
],
"_prefab": null,
......@@ -789,25 +789,25 @@
"__id__": 32
},
{
"__id__": 40
"__id__": 46
},
{
"__id__": 53
"__id__": 59
},
{
"__id__": 60
"__id__": 66
},
{
"__id__": 64
"__id__": 70
},
{
"__id__": 71
"__id__": 77
}
],
"_active": true,
"_components": [
{
"__id__": 78
"__id__": 84
}
],
"_prefab": null,
......@@ -1552,15 +1552,18 @@
"_children": [
{
"__id__": 33
},
{
"__id__": 39
}
],
"_active": true,
"_components": [
{
"__id__": 38
"__id__": 44
},
{
"__id__": 39
"__id__": 45
}
],
"_prefab": null,
......@@ -1574,7 +1577,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1250,
"width": 1352,
"height": 120
},
"_anchorPoint": {
......@@ -1613,7 +1616,7 @@
},
{
"__type__": "cc.Node",
"_name": "title",
"_name": "soundNode",
"_objFlags": 0,
"_parent": {
"__id__": 32
......@@ -1621,12 +1624,285 @@
"_children": [
{
"__id__": 34
},
{
"__id__": 36
}
],
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 82,
"height": 80
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-585,
-12.303,
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": "3d5qVye1xFBaEDOy9+Uh/N"
},
{
"__type__": "cc.Node",
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 33
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 35
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 82,
"height": 80
},
"_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": "9dj3TuyJtBmJ/9FrQF5AL9"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "dd9335de-476e-4b60-ac36-8f107cf43020"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "19qRfVXHJNUpnEXo5xpz6m"
},
{
"__type__": "cc.Node",
"_name": "anim",
"_objFlags": 0,
"_parent": {
"__id__": 33
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 37
},
{
"__id__": 38
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 82,
"height": 80
},
"_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": "a23fsBrmhAAJEW2vaIJo7a"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "dd9335de-476e-4b60-ac36-8f107cf43020"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "30nRp5TxdFrbM/vzNaOBzx"
},
{
"__type__": "cc.Animation",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
},
"_enabled": true,
"_defaultClip": null,
"_clips": [
{
"__uuid__": "06b33c9f-f254-4e3c-a9c6-021941a4fa94"
}
],
"playOnLoad": false,
"_id": "dc2rl/J5RJVqSx9MkUQYoc"
},
{
"__type__": "cc.Node",
"_name": "title",
"_objFlags": 0,
"_parent": {
"__id__": 32
},
"_children": [
{
"__id__": 40
}
],
"_active": true,
"_components": [
{
"__id__": 43
}
],
"_prefab": null,
......@@ -1652,7 +1928,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
51,
-12.303,
0,
0,
......@@ -1682,16 +1958,16 @@
"_name": "label_round",
"_objFlags": 0,
"_parent": {
"__id__": 33
"__id__": 39
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 35
"__id__": 41
},
{
"__id__": 36
"__id__": 42
}
],
"_prefab": null,
......@@ -1747,7 +2023,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 40
},
"_enabled": true,
"_materials": [
......@@ -1782,7 +2058,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 40
},
"_enabled": true,
"alignMode": 2,
......@@ -1809,7 +2085,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 39
},
"_enabled": true,
"_materials": [
......@@ -1849,7 +2125,7 @@
"_enabled": true,
"_layoutSize": {
"__type__": "cc.Size",
"width": 1250,
"width": 1352,
"height": 120
},
"_resize": 1,
......@@ -1864,7 +2140,7 @@
"_N$paddingRight": 50,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 0,
"_N$spacingX": 20,
"_N$spacingY": 0,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
......@@ -1907,10 +2183,10 @@
},
"_children": [
{
"__id__": 41
"__id__": 47
},
{
"__id__": 42
"__id__": 48
}
],
"_active": true,
......@@ -1968,7 +2244,7 @@
"_name": "layout_card",
"_objFlags": 0,
"_parent": {
"__id__": 40
"__id__": 46
},
"_children": [],
"_active": true,
......@@ -2026,23 +2302,23 @@
"_name": "card",
"_objFlags": 0,
"_parent": {
"__id__": 40
"__id__": 46
},
"_children": [
{
"__id__": 43
"__id__": 49
},
{
"__id__": 45
"__id__": 51
},
{
"__id__": 47
"__id__": 53
},
{
"__id__": 49
"__id__": 55
},
{
"__id__": 51
"__id__": 57
}
],
"_active": true,
......@@ -2100,13 +2376,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 48
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 44
"__id__": 50
}
],
"_prefab": null,
......@@ -2162,7 +2438,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -2194,13 +2470,13 @@
"_name": "text",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 48
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 52
}
],
"_prefab": null,
......@@ -2256,7 +2532,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2289,13 +2565,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 48
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 54
}
],
"_prefab": null,
......@@ -2351,7 +2627,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 53
},
"_enabled": true,
"_materials": [
......@@ -2383,13 +2659,13 @@
"_name": "image_text_image",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 48
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 56
}
],
"_prefab": null,
......@@ -2445,7 +2721,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -2477,13 +2753,13 @@
"_name": "image_text_text",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 48
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 52
"__id__": 58
}
],
"_prefab": null,
......@@ -2539,7 +2815,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 57
},
"_enabled": true,
"_materials": [
......@@ -2576,19 +2852,19 @@
},
"_children": [
{
"__id__": 54
"__id__": 60
}
],
"_active": true,
"_components": [
{
"__id__": 56
"__id__": 62
},
{
"__id__": 57
"__id__": 63
},
{
"__id__": 59
"__id__": 65
}
],
"_prefab": null,
......@@ -2644,13 +2920,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 53
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 61
}
],
"_prefab": null,
......@@ -2706,7 +2982,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 60
},
"_enabled": true,
"_materials": [
......@@ -2738,7 +3014,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 59
},
"_enabled": true,
"_materials": [
......@@ -2760,7 +3036,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 59
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2769,7 +3045,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 58
"__id__": 64
}
],
"_N$interactable": true,
......@@ -2842,7 +3118,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 59
},
"_enabled": true,
"alignMode": 1,
......@@ -2873,13 +3149,13 @@
},
"_children": [
{
"__id__": 61
"__id__": 67
}
],
"_active": false,
"_components": [
{
"__id__": 63
"__id__": 69
}
],
"_prefab": null,
......@@ -2935,13 +3211,13 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 66
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 62
"__id__": 68
}
],
"_prefab": null,
......@@ -2997,7 +3273,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 67
},
"_enabled": true,
"_materials": [
......@@ -3029,7 +3305,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 66
},
"_enabled": true,
"_materials": [
......@@ -3065,19 +3341,19 @@
},
"_children": [
{
"__id__": 65
"__id__": 71
},
{
"__id__": 67
"__id__": 73
}
],
"_active": false,
"_components": [
{
"__id__": 69
"__id__": 75
},
{
"__id__": 70
"__id__": 76
}
],
"_prefab": null,
......@@ -3133,13 +3409,13 @@
"_name": "img_0",
"_objFlags": 0,
"_parent": {
"__id__": 64
"__id__": 70
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 66
"__id__": 72
}
],
"_prefab": null,
......@@ -3195,7 +3471,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 71
},
"_enabled": true,
"_materials": [
......@@ -3227,13 +3503,13 @@
"_name": "img_1",
"_objFlags": 0,
"_parent": {
"__id__": 64
"__id__": 70
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 68
"__id__": 74
}
],
"_prefab": null,
......@@ -3289,7 +3565,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
"__id__": 73
},
"_enabled": true,
"_materials": [
......@@ -3321,7 +3597,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 70
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3389,7 +3665,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 70
},
"_enabled": true,
"alignMode": 1,
......@@ -3420,19 +3696,19 @@
},
"_children": [
{
"__id__": 72
"__id__": 78
},
{
"__id__": 74
"__id__": 80
}
],
"_active": false,
"_components": [
{
"__id__": 76
"__id__": 82
},
{
"__id__": 77
"__id__": 83
}
],
"_prefab": null,
......@@ -3488,13 +3764,13 @@
"_name": "img_0",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 77
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 73
"__id__": 79
}
],
"_prefab": null,
......@@ -3550,7 +3826,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 78
},
"_enabled": true,
"_materials": [
......@@ -3582,13 +3858,13 @@
"_name": "img_1",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 77
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 81
}
],
"_prefab": null,
......@@ -3644,7 +3920,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -3676,7 +3952,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 77
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3744,7 +4020,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 77
},
"_enabled": true,
"alignMode": 1,
......@@ -3802,25 +4078,25 @@
},
"_children": [
{
"__id__": 80
"__id__": 86
},
{
"__id__": 84
"__id__": 90
},
{
"__id__": 87
"__id__": 93
},
{
"__id__": 107
"__id__": 113
}
],
"_active": false,
"_components": [
{
"__id__": 121
"__id__": 127
},
{
"__id__": 122
"__id__": 128
}
],
"_prefab": null,
......@@ -3876,19 +4152,19 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 81
"__id__": 87
},
{
"__id__": 82
"__id__": 88
},
{
"__id__": 83
"__id__": 89
}
],
"_prefab": null,
......@@ -3944,7 +4220,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 86
},
"_enabled": true,
"_materials": [
......@@ -3976,7 +4252,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 86
},
"_enabled": true,
"alignMode": 1,
......@@ -4003,7 +4279,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 86
},
"_enabled": true,
"_id": "97pflT+i1AyY1PE58Dq3+A"
......@@ -4013,16 +4289,16 @@
"_name": "btn_close",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 91
},
{
"__id__": 86
"__id__": 92
}
],
"_prefab": null,
......@@ -4078,7 +4354,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -4110,7 +4386,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 90
},
"_enabled": true,
"alignMode": 1,
......@@ -4137,18 +4413,9 @@
"_name": "card",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 85
},
"_children": [
{
"__id__": 88
},
{
"__id__": 90
},
{
"__id__": 92
},
{
"__id__": 94
},
......@@ -4157,6 +4424,15 @@
},
{
"__id__": 98
},
{
"__id__": 100
},
{
"__id__": 102
},
{
"__id__": 104
}
],
"_active": true,
......@@ -4214,13 +4490,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 87
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 89
"__id__": 95
}
],
"_prefab": null,
......@@ -4276,7 +4552,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4308,13 +4584,13 @@
"_name": "text",
"_objFlags": 0,
"_parent": {
"__id__": 87
"__id__": 93
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 91
"__id__": 97
}
],
"_prefab": null,
......@@ -4370,7 +4646,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 96
},
"_enabled": true,
"_materials": [
......@@ -4403,13 +4679,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 87
"__id__": 93
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 93
"__id__": 99
}
],
"_prefab": null,
......@@ -4465,7 +4741,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 98
},
"_enabled": true,
"_materials": [
......@@ -4497,13 +4773,13 @@
"_name": "image_text_image",
"_objFlags": 0,
"_parent": {
"__id__": 87
"__id__": 93
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 95
"__id__": 101
}
],
"_prefab": null,
......@@ -4559,7 +4835,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
"__id__": 100
},
"_enabled": true,
"_materials": [
......@@ -4591,13 +4867,13 @@
"_name": "image_text_text",
"_objFlags": 0,
"_parent": {
"__id__": 87
"__id__": 93
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 97
"__id__": 103
}
],
"_prefab": null,
......@@ -4653,7 +4929,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 102
},
"_enabled": true,
"_materials": [
......@@ -4686,26 +4962,26 @@
"_name": "voice",
"_objFlags": 0,
"_parent": {
"__id__": 87
"__id__": 93
},
"_children": [
{
"__id__": 99
"__id__": 105
},
{
"__id__": 101
"__id__": 107
},
{
"__id__": 103
"__id__": 109
}
],
"_active": false,
"_components": [
{
"__id__": 105
"__id__": 111
},
{
"__id__": 106
"__id__": 112
}
],
"_prefab": null,
......@@ -4761,13 +5037,13 @@
"_name": "p1",
"_objFlags": 0,
"_parent": {
"__id__": 98
"__id__": 104
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 106
}
],
"_prefab": null,
......@@ -4823,7 +5099,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 105
},
"_enabled": true,
"_materials": [
......@@ -4855,13 +5131,13 @@
"_name": "p2",
"_objFlags": 0,
"_parent": {
"__id__": 98
"__id__": 104
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 102
"__id__": 108
}
],
"_prefab": null,
......@@ -4917,7 +5193,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 107
},
"_enabled": true,
"_materials": [
......@@ -4949,13 +5225,13 @@
"_name": "p3",
"_objFlags": 0,
"_parent": {
"__id__": 98
"__id__": 104
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 104
"__id__": 110
}
],
"_prefab": null,
......@@ -5011,7 +5287,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 109
},
"_enabled": true,
"_materials": [
......@@ -5043,7 +5319,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 104
},
"_enabled": true,
"alignMode": 2,
......@@ -5070,18 +5346,18 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 104
},
"_enabled": true,
"imgList": [
{
"__id__": 99
"__id__": 105
},
{
"__id__": 101
"__id__": 107
},
{
"__id__": 103
"__id__": 109
}
],
"_id": "18O21bAZVMzaUEicSh3NM7"
......@@ -5091,14 +5367,14 @@
"_name": "btn_voice",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 85
},
"_children": [
{
"__id__": 108
"__id__": 114
},
{
"__id__": 110
"__id__": 116
}
],
"_active": true,
......@@ -5156,13 +5432,13 @@
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 107
"__id__": 113
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 115
}
],
"_prefab": null,
......@@ -5218,7 +5494,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 114
},
"_enabled": true,
"_materials": [
......@@ -5250,14 +5526,14 @@
"_name": "ing",
"_objFlags": 0,
"_parent": {
"__id__": 107
"__id__": 113
},
"_children": [
{
"__id__": 111
"__id__": 117
},
{
"__id__": 119
"__id__": 125
}
],
"_active": false,
......@@ -5315,23 +5591,23 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 110
"__id__": 116
},
"_children": [
{
"__id__": 112
"__id__": 118
},
{
"__id__": 114
"__id__": 120
},
{
"__id__": 116
"__id__": 122
}
],
"_active": true,
"_components": [
{
"__id__": 118
"__id__": 124
}
],
"_prefab": null,
......@@ -5387,13 +5663,13 @@
"_name": "fanka_img_circle1",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 117
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 113
"__id__": 119
}
],
"_prefab": null,
......@@ -5449,7 +5725,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
"__id__": 118
},
"_enabled": true,
"_materials": [
......@@ -5481,13 +5757,13 @@
"_name": "fanka_img_circle2",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 117
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 115
"__id__": 121
}
],
"_prefab": null,
......@@ -5543,7 +5819,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 120
},
"_enabled": true,
"_materials": [
......@@ -5575,13 +5851,13 @@
"_name": "fanka_img_circle3",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 117
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 117
"__id__": 123
}
],
"_prefab": null,
......@@ -5637,7 +5913,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 122
},
"_enabled": true,
"_materials": [
......@@ -5669,18 +5945,18 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 111
"__id__": 117
},
"_enabled": true,
"imgList": [
{
"__id__": 112
"__id__": 118
},
{
"__id__": 114
"__id__": 120
},
{
"__id__": 116
"__id__": 122
}
],
"_id": "7eC6d9sttNuZu2bSqk1QTx"
......@@ -5690,13 +5966,13 @@
"_name": "ing",
"_objFlags": 0,
"_parent": {
"__id__": 110
"__id__": 116
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 126
}
],
"_prefab": null,
......@@ -5752,7 +6028,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 125
},
"_enabled": true,
"_materials": [
......@@ -5784,7 +6060,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 85
},
"_enabled": false,
"_materials": [
......@@ -5816,7 +6092,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 85
},
"_enabled": true,
"alignMode": 1,
......@@ -5847,13 +6123,13 @@
},
"_children": [
{
"__id__": 124
"__id__": 130
},
{
"__id__": 126
"__id__": 132
},
{
"__id__": 128
"__id__": 134
}
],
"_active": true,
......@@ -5911,13 +6187,13 @@
"_name": "JJ_Excellent_ske",
"_objFlags": 0,
"_parent": {
"__id__": 123
"__id__": 129
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 125
"__id__": 131
}
],
"_prefab": null,
......@@ -5973,7 +6249,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 130
},
"_enabled": true,
"_materials": [
......@@ -6013,13 +6289,13 @@
"_name": "JJ_Good_ske",
"_objFlags": 0,
"_parent": {
"__id__": 123
"__id__": 129
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 127
"__id__": 133
}
],
"_prefab": null,
......@@ -6075,7 +6351,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 132
},
"_enabled": true,
"_materials": [
......@@ -6115,13 +6391,13 @@
"_name": "JJ_Tryagain_ske",
"_objFlags": 0,
"_parent": {
"__id__": 123
"__id__": 129
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 129
"__id__": 135
}
],
"_prefab": null,
......@@ -6177,7 +6453,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 128
"__id__": 134
},
"_enabled": true,
"_materials": [
......@@ -6221,22 +6497,22 @@
},
"_children": [
{
"__id__": 131
"__id__": 137
},
{
"__id__": 133
"__id__": 139
},
{
"__id__": 135
"__id__": 141
},
{
"__id__": 137
"__id__": 143
},
{
"__id__": 139
"__id__": 145
},
{
"__id__": 141
"__id__": 147
}
],
"_active": false,
......@@ -6294,13 +6570,13 @@
"_name": "point_orange_normal",
"_objFlags": 0,
"_parent": {
"__id__": 130
"__id__": 136
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 132
"__id__": 138
}
],
"_prefab": null,
......@@ -6356,7 +6632,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 131
"__id__": 137
},
"_enabled": true,
"_materials": [
......@@ -6388,13 +6664,13 @@
"_name": "point_orange_right",
"_objFlags": 0,
"_parent": {
"__id__": 130
"__id__": 136
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 134
"__id__": 140
}
],
"_prefab": null,
......@@ -6450,7 +6726,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 133
"__id__": 139
},
"_enabled": true,
"_materials": [
......@@ -6482,13 +6758,13 @@
"_name": "point_orange_select_normal",
"_objFlags": 0,
"_parent": {
"__id__": 130
"__id__": 136
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 136
"__id__": 142
}
],
"_prefab": null,
......@@ -6544,7 +6820,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 135
"__id__": 141
},
"_enabled": true,
"_materials": [
......@@ -6576,13 +6852,13 @@
"_name": "point_orange_select_right",
"_objFlags": 0,
"_parent": {
"__id__": 130
"__id__": 136
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 138
"__id__": 144
}
],
"_prefab": null,
......@@ -6638,7 +6914,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 137
"__id__": 143
},
"_enabled": true,
"_materials": [
......@@ -6670,13 +6946,13 @@
"_name": "point_orange_wrong",
"_objFlags": 0,
"_parent": {
"__id__": 130
"__id__": 136
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 140
"__id__": 146
}
],
"_prefab": null,
......@@ -6732,7 +7008,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 139
"__id__": 145
},
"_enabled": true,
"_materials": [
......@@ -6764,13 +7040,13 @@
"_name": "point_orange_select_wrong",
"_objFlags": 0,
"_parent": {
"__id__": 130
"__id__": 136
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 142
"__id__": 148
}
],
"_prefab": null,
......@@ -6826,7 +7102,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 141
"__id__": 147
},
"_enabled": true,
"_materials": [
......@@ -6862,16 +7138,16 @@
},
"_children": [
{
"__id__": 144
"__id__": 150
}
],
"_active": false,
"_components": [
{
"__id__": 146
"__id__": 152
},
{
"__id__": 147
"__id__": 153
}
],
"_prefab": null,
......@@ -6927,13 +7203,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 143
"__id__": 149
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 145
"__id__": 151
}
],
"_prefab": null,
......@@ -6989,7 +7265,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 150
},
"_enabled": true,
"_materials": [
......@@ -7022,7 +7298,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 143
"__id__": 149
},
"_enabled": true,
"_materials": [
......@@ -7054,7 +7330,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 143
"__id__": 149
},
"_enabled": true,
"_layoutSize": {
......@@ -7092,7 +7368,7 @@
"_active": false,
"_components": [
{
"__id__": 149
"__id__": 155
}
],
"_prefab": null,
......@@ -7148,7 +7424,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
"__id__": 154
},
"_enabled": true,
"_materials": [
......@@ -7186,7 +7462,7 @@
"_active": false,
"_components": [
{
"__id__": 151
"__id__": 157
}
],
"_prefab": null,
......@@ -7242,7 +7518,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 156
},
"_enabled": true,
"_materials": [
......@@ -7280,10 +7556,10 @@
"_active": true,
"_components": [
{
"__id__": 153
"__id__": 159
},
{
"__id__": 154
"__id__": 160
}
],
"_prefab": null,
......@@ -7339,7 +7615,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 158
},
"_enabled": true,
"_materials": [
......@@ -7371,7 +7647,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 158
},
"_enabled": true,
"alignMode": 1,
......@@ -7402,13 +7678,13 @@
},
"_children": [
{
"__id__": 156
"__id__": 162
},
{
"__id__": 159
"__id__": 165
},
{
"__id__": 162
"__id__": 168
}
],
"_active": false,
......@@ -7466,11 +7742,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 155
"__id__": 161
},
"_children": [
{
"__id__": 157
"__id__": 163
}
],
"_active": true,
......@@ -7528,13 +7804,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 156
"__id__": 162
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 158
"__id__": 164
}
],
"_prefab": null,
......@@ -7590,7 +7866,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
"__id__": 163
},
"_enabled": true,
"_materials": [],
......@@ -7621,11 +7897,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 155
"__id__": 161
},
"_children": [
{
"__id__": 160
"__id__": 166
}
],
"_active": true,
......@@ -7683,13 +7959,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 159
"__id__": 165
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 161
"__id__": 167
}
],
"_prefab": null,
......@@ -7745,7 +8021,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
"__id__": 166
},
"_enabled": true,
"_materials": [],
......@@ -7773,18 +8049,9 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 155
"__id__": 161
},
"_children": [
{
"__id__": 163
},
{
"__id__": 165
},
{
"__id__": 167
},
{
"__id__": 169
},
......@@ -7829,6 +8096,15 @@
},
{
"__id__": 197
},
{
"__id__": 199
},
{
"__id__": 201
},
{
"__id__": 203
}
],
"_active": true,
......@@ -7886,13 +8162,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 164
"__id__": 170
}
],
"_prefab": null,
......@@ -7948,7 +8224,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 163
"__id__": 169
},
"_enabled": true,
"_clip": {
......@@ -7967,13 +8243,13 @@
"_name": "tip",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 166
"__id__": 172
}
],
"_prefab": null,
......@@ -8029,7 +8305,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 165
"__id__": 171
},
"_enabled": true,
"_clip": {
......@@ -8048,13 +8324,13 @@
"_name": "tosmall",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 168
"__id__": 174
}
],
"_prefab": null,
......@@ -8110,7 +8386,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 167
"__id__": 173
},
"_enabled": true,
"_clip": {
......@@ -8129,13 +8405,13 @@
"_name": "pagenext",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 170
"__id__": 176
}
],
"_prefab": null,
......@@ -8191,7 +8467,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 175
},
"_enabled": true,
"_clip": {
......@@ -8210,13 +8486,13 @@
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 172
"__id__": 178
}
],
"_prefab": null,
......@@ -8272,7 +8548,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 171
"__id__": 177
},
"_enabled": true,
"_clip": {
......@@ -8291,13 +8567,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 174
"__id__": 180
}
],
"_prefab": null,
......@@ -8353,7 +8629,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
"__id__": 179
},
"_enabled": true,
"_clip": {
......@@ -8372,13 +8648,13 @@
"_name": "touch_voice",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 176
"__id__": 182
}
],
"_prefab": null,
......@@ -8434,7 +8710,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 175
"__id__": 181
},
"_enabled": true,
"_clip": {
......@@ -8453,13 +8729,13 @@
"_name": "end",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 178
"__id__": 184
}
],
"_prefab": null,
......@@ -8515,7 +8791,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 177
"__id__": 183
},
"_enabled": true,
"_clip": {
......@@ -8534,13 +8810,13 @@
"_name": "fanka",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 180
"__id__": 186
}
],
"_prefab": null,
......@@ -8596,7 +8872,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 179
"__id__": 185
},
"_enabled": true,
"_clip": {
......@@ -8615,13 +8891,13 @@
"_name": "try",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 182
"__id__": 188
}
],
"_prefab": null,
......@@ -8677,7 +8953,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 181
"__id__": 187
},
"_enabled": true,
"_clip": {
......@@ -8696,13 +8972,13 @@
"_name": "wait",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 184
"__id__": 190
}
],
"_prefab": null,
......@@ -8758,7 +9034,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 183
"__id__": 189
},
"_enabled": true,
"_clip": {
......@@ -8777,13 +9053,13 @@
"_name": "excellent",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 186
"__id__": 192
}
],
"_prefab": null,
......@@ -8839,7 +9115,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 185
"__id__": 191
},
"_enabled": true,
"_clip": {
......@@ -8858,13 +9134,13 @@
"_name": "good",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 188
"__id__": 194
}
],
"_prefab": null,
......@@ -8920,7 +9196,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 187
"__id__": 193
},
"_enabled": true,
"_clip": {
......@@ -8939,13 +9215,13 @@
"_name": "record_wrong",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 190
"__id__": 196
}
],
"_prefab": null,
......@@ -9001,7 +9277,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 189
"__id__": 195
},
"_enabled": true,
"_clip": {
......@@ -9020,13 +9296,13 @@
"_name": "record_right",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 192
"__id__": 198
}
],
"_prefab": null,
......@@ -9082,7 +9358,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 191
"__id__": 197
},
"_enabled": true,
"_clip": {
......@@ -9101,13 +9377,13 @@
"_name": "touch",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 194
"__id__": 200
}
],
"_prefab": null,
......@@ -9163,7 +9439,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 193
"__id__": 199
},
"_enabled": true,
"_clip": {
......@@ -9182,13 +9458,13 @@
"_name": "move",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 196
"__id__": 202
}
],
"_prefab": null,
......@@ -9244,7 +9520,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 201
},
"_enabled": true,
"_clip": {
......@@ -9263,13 +9539,13 @@
"_name": "background",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 198
"__id__": 204
}
],
"_prefab": null,
......@@ -9325,7 +9601,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 197
"__id__": 203
},
"_enabled": true,
"_clip": {
......@@ -9392,28 +9668,31 @@
},
"_enabled": true,
"label_round": {
"__id__": 34
"__id__": 40
},
"layout_item": {
"__id__": 19
},
"layer_item": {
"__id__": 40
"__id__": 46
},
"layer_item_little": {
"__id__": 60
"__id__": 66
},
"label_title": {
"soundNode": {
"__id__": 33
},
"label_title": {
"__id__": 39
},
"layer_touch": {
"__id__": 13
},
"btn_last": {
"__id__": 64
"__id__": 70
},
"btn_next": {
"__id__": 71
"__id__": 77
},
"card_pos": {
"__id__": 17
......@@ -9422,16 +9701,16 @@
"__id__": 21
},
"btn_start": {
"__id__": 53
"__id__": 59
},
"layout_record": {
"__id__": 79
"__id__": 85
},
"btn_close": {
"__id__": 84
"__id__": 90
},
"bgmNode": {
"__id__": 197
"__id__": 203
},
"bgmNum": 0.5,
"_id": "eaTVUpqahPfZeO9+sUI7RP"
......@@ -9444,12 +9723,6 @@
"__id__": 1
},
"_children": [
{
"__id__": 203
},
{
"__id__": 206
},
{
"__id__": 209
},
......@@ -9467,12 +9740,18 @@
},
{
"__id__": 224
},
{
"__id__": 227
},
{
"__id__": 230
}
],
"_active": false,
"_components": [],
"_prefab": {
"__id__": 227
"__id__": 233
},
"_opacity": 255,
"_color": {
......@@ -9526,17 +9805,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 202
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 204
"__id__": 210
}
],
"_prefab": {
"__id__": 205
"__id__": 211
},
"_opacity": 255,
"_color": {
......@@ -9590,7 +9869,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 203
"__id__": 209
},
"_enabled": true,
"_materials": [
......@@ -9620,7 +9899,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 202
"__id__": 208
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -9633,17 +9912,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 202
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 207
"__id__": 213
}
],
"_prefab": {
"__id__": 208
"__id__": 214
},
"_opacity": 255,
"_color": {
......@@ -9697,7 +9976,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 206
"__id__": 212
},
"_enabled": true,
"_materials": [
......@@ -9727,7 +10006,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 202
"__id__": 208
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -9740,17 +10019,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 202
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 210
"__id__": 216
}
],
"_prefab": {
"__id__": 211
"__id__": 217
},
"_opacity": 255,
"_color": {
......@@ -9804,7 +10083,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 209
"__id__": 215
},
"_enabled": true,
"_materials": [
......@@ -9834,7 +10113,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 202
"__id__": 208
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -9847,17 +10126,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 202
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 213
"__id__": 219
}
],
"_prefab": {
"__id__": 214
"__id__": 220
},
"_opacity": 255,
"_color": {
......@@ -9911,7 +10190,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 212
"__id__": 218
},
"_enabled": true,
"_materials": [
......@@ -9941,7 +10220,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 202
"__id__": 208
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -9954,17 +10233,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 202
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 216
"__id__": 222
}
],
"_prefab": {
"__id__": 217
"__id__": 223
},
"_opacity": 255,
"_color": {
......@@ -10018,7 +10297,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 215
"__id__": 221
},
"_enabled": true,
"_materials": [
......@@ -10048,7 +10327,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 202
"__id__": 208
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -10061,17 +10340,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 202
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 219
"__id__": 225
}
],
"_prefab": {
"__id__": 220
"__id__": 226
},
"_opacity": 255,
"_color": {
......@@ -10125,7 +10404,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 218
"__id__": 224
},
"_enabled": true,
"_materials": [
......@@ -10155,7 +10434,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 202
"__id__": 208
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -10168,17 +10447,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 202
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 222
"__id__": 228
}
],
"_prefab": {
"__id__": 223
"__id__": 229
},
"_opacity": 255,
"_color": {
......@@ -10232,7 +10511,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 221
"__id__": 227
},
"_enabled": true,
"_materials": [
......@@ -10262,7 +10541,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 202
"__id__": 208
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -10275,17 +10554,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 202
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 225
"__id__": 231
}
],
"_prefab": {
"__id__": 226
"__id__": 232
},
"_opacity": 255,
"_color": {
......@@ -10339,7 +10618,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 224
"__id__": 230
},
"_enabled": true,
"_materials": [
......@@ -10369,7 +10648,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 202
"__id__": 208
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -10380,7 +10659,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 202
"__id__": 208
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......
......@@ -51,6 +51,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.initListener();
this.initGame();
this.initBottom();
this.initSound();
this.startGame();
}
protected onDestroy(): void {
......@@ -70,6 +71,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
public layer_item: cc.Node = null;
@property(cc.Node)
public layer_item_little: cc.Node = null;
@property(cc.Node)
public soundNode: cc.Node = null;
_cantouch = null;
private list: Array<{
......@@ -394,9 +397,36 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.resetView();
this.initGame();
this.initBottom();
this.initSound();
this.startGame();
}
initSound() {
console.log("CurrentData: " , this.CurrentData);
if (!this.data.audio_url) {
this.soundNode.active = false;
return;
}
const iconNode = cc.find('icon', this.soundNode);
const animNode = cc.find("anim", this.soundNode);
animNode.active = false;
const anim = animNode.getComponent(cc.Animation);
iconNode.on('touchstart', () => {
this.playAudioByUrl(this.data.audio_url, () => {
iconNode.active = true;
animNode.active = false;
})
animNode.active = true;
iconNode.active = false;
anim.play('sound');
});
}
private rightCount: number;
private errorCount: number;
private totalCount: number;
......
export const defaultData = {
"title": "",
"questions": [
{
"title": "Which animal have wings?",
"options": [
{
"type": "img_txt",
"image": "http://staging-teach.cdn.ireadabc.com/c62b5960641fd7cf29613cc45fb00cd6.png",
"text": "bird",
"audio": 'http://staging-teach.cdn.ireadabc.com/981ebff00a4717b1327b9dcd32b9ad2f_l.mp3'
},
{
"type": "img_txt",
"image": "http://staging-teach.cdn.ireadabc.com/c62b5960641fd7cf29613cc45fb00cd6.png",
"text": "interface",
"audio": 'http://staging-teach.cdn.ireadabc.com/981ebff00a4717b1327b9dcd32b9ad2f_l.mp3'
},
{
"type": "img_txt",
"image": "http://staging-teach.cdn.ireadabc.com/a71f2b71e45ff2525714494f6edd624b.jpg",
"text": "wind",
"audio": 'http://staging-teach.cdn.ireadabc.com/981ebff00a4717b1327b9dcd32b9ad2f_l.mp3'
},
// {
// "type": "txt",
// "image": "",
// "text": "dog"
// }
]
}
]
}
export const defaultData =
{"title":"","questions":[{"title":"This is a title.","options":[{"type":"img","image":"http://staging-teach.cdn.ireadabc.com/94a46aa24d41a280e438b764b2bb123c.png","text":"apple","audio":"http://staging-teach.cdn.ireadabc.com/f5484db3e00a63a12f5197410ca95f0f_l.mp3","audioName":"apple-迅捷文字转语音-1694506758432.mp3"},{"type":"txt","image":"","text":"banana","audio":"http://staging-teach.cdn.ireadabc.com/c0acdb70d3f5f1483e44bae2faa1b25a_l.mp3","audioName":"banan-迅捷文字转语音-1694506764356.mp3"}]}],"audio_url":"http://staging-teach.cdn.ireadabc.com/f5484db3e00a63a12f5197410ca95f0f.mp3"}
// {
// "title": "",
// "questions": [
// {
// "title": "Which animal have wings?",
// "options": [
// {
// "type": "img_txt",
// "image": "http://staging-teach.cdn.ireadabc.com/c62b5960641fd7cf29613cc45fb00cd6.png",
// "text": "bird",
// "audio": 'http://staging-teach.cdn.ireadabc.com/981ebff00a4717b1327b9dcd32b9ad2f_l.mp3'
// },
// {
// "type": "img_txt",
// "image": "http://staging-teach.cdn.ireadabc.com/c62b5960641fd7cf29613cc45fb00cd6.png",
// "text": "interface",
// "audio": 'http://staging-teach.cdn.ireadabc.com/981ebff00a4717b1327b9dcd32b9ad2f_l.mp3'
// },
// {
// "type": "img_txt",
// "image": "http://staging-teach.cdn.ireadabc.com/a71f2b71e45ff2525714494f6edd624b.jpg",
// "text": "wind",
// "audio": 'http://staging-teach.cdn.ireadabc.com/981ebff00a4717b1327b9dcd32b9ad2f_l.mp3'
// },
// // {
// // "type": "txt",
// // "image": "",
// // "text": "dog"
// // }
// ]
// }
// ]
// }
{
"ver": "1.1.2",
"uuid": "52bb7007-ceec-4a56-b3d8-bb94bca91cd4",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "876ea961-54ff-4ebb-9ef1-12a7b3ef316e",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 82,
"height": 80,
"platformSettings": {},
"subMetas": {
"icon_audio_play_1": {
"ver": "1.0.4",
"uuid": "475320f4-2c2a-4da6-9cf6-8ba8ba20a881",
"rawTextureUuid": "876ea961-54ff-4ebb-9ef1-12a7b3ef316e",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 82,
"height": 80,
"rawWidth": 82,
"rawHeight": 80,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "c9146042-9230-47dd-a975-e5e62eba81ac",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 82,
"height": 80,
"platformSettings": {},
"subMetas": {
"icon_audio_play_2": {
"ver": "1.0.4",
"uuid": "a2186f45-b37e-485a-8b15-280856b35cf0",
"rawTextureUuid": "c9146042-9230-47dd-a975-e5e62eba81ac",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 82,
"height": 80,
"rawWidth": 82,
"rawHeight": 80,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "afd552b4-b0aa-4241-a88d-417d9e482136",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 82,
"height": 80,
"platformSettings": {},
"subMetas": {
"icon_audio_play_3": {
"ver": "1.0.4",
"uuid": "dd9335de-476e-4b60-ac36-8f107cf43020",
"rawTextureUuid": "afd552b4-b0aa-4241-a88d-417d9e482136",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 82,
"height": 80,
"rawWidth": 82,
"rawHeight": 80,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"__type__": "cc.AnimationClip",
"_name": "sound",
"_objFlags": 0,
"_native": "",
"_duration": 1.0166666666666666,
"sample": 60,
"speed": 1,
"wrapMode": 2,
"curveData": {
"comps": {
"cc.Sprite": {
"spriteFrame": [
{
"frame": 0,
"value": {
"__uuid__": "475320f4-2c2a-4da6-9cf6-8ba8ba20a881"
}
},
{
"frame": 0.3333333333333333,
"value": {
"__uuid__": "a2186f45-b37e-485a-8b15-280856b35cf0"
}
},
{
"frame": 0.6666666666666666,
"value": {
"__uuid__": "dd9335de-476e-4b60-ac36-8f107cf43020"
}
},
{
"frame": 1,
"value": {
"__uuid__": "475320f4-2c2a-4da6-9cf6-8ba8ba20a881"
}
}
]
}
}
},
"events": []
}
\ No newline at end of file
{
"ver": "2.1.0",
"uuid": "06b33c9f-f254-4e3c-a9c6-021941a4fa94",
"subMetas": {}
}
\ No newline at end of file
......@@ -76,7 +76,21 @@
<div class="model-content">
<div style="padding: 10px;background-color: #fff;">
<div style="margin: 30px; display: flex; align-items: center;">
<h3>标题音频: </h3>
<div style="margin-left: 10px;">
<app-audio-recorder
[audioUrl]="item.audio_url"
(audioUploaded)="onItemAudioUploadSuccess($event, item)"
></app-audio-recorder>
</div>
</div>
<div class="border-dashed" style="margin: 20px;width: 1000px;display: none">
<!-- <span style="font-size: 20px;">标题: </span>
<input type="text" nz-input [(ngModel)]="item.title" (blur)="save()"> -->
<!-- <span style="font-size: 20px;">npc音频: </span>
......
......@@ -13,6 +13,7 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O
item = {
title: "",
audio_url: '',
questions: [],
};
isVisible = false;
......@@ -78,6 +79,11 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O
this.save();
}
onItemAudioUploadSuccess(e, item) {
item.audio_url = e.url;
this.save();
}
deleteBgAudio() {
this.save();
}
......
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