Commit 3599aaa8 authored by Lwd's avatar Lwd

aaaa

parent 1b98c460
......@@ -6,6 +6,7 @@ export class Course {
title: string;
audio_url: string;
}
export class Sheepfold {
......
......@@ -8,6 +8,12 @@
</div>
</div>
<nz-form-control [nzSpan]="18">
<span>标题声音: </span>
<app-audio-recorder [audioUrl]="item.audio_url"
(audioUploaded)="onAudioUploadSuccess($event, item, 'audio_url')">
</app-audio-recorder>
</nz-form-control>
<nz-divider nzText="类别" nzOrientation="left"></nz-divider>
<!-- <div nz-row>
<nz-form-item>
......
{
"ver": "1.1.0",
"uuid": "41ef287f-ba46-4313-a114-676b6eae4bca",
"uuid": "5c0041d0-ccbd-4069-bc12-73a47695ed52",
"subMetas": {}
}
\ No newline at end of file
......@@ -17,10 +17,10 @@
"__id__": 2
},
{
"__id__": 101
"__id__": 103
},
{
"__id__": 127
"__id__": 129
}
],
"_active": false,
......@@ -81,25 +81,25 @@
"__id__": 5
},
{
"__id__": 94
"__id__": 96
}
],
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 98
},
{
"__id__": 97
"__id__": 99
},
{
"__id__": 98
"__id__": 100
},
{
"__id__": 99
"__id__": 101
},
{
"__id__": 100
"__id__": 102
}
],
"_prefab": null,
......@@ -189,7 +189,7 @@
"array": [
0,
0,
234.6928844255829,
355.0704155516199,
0,
0,
0,
......@@ -263,7 +263,7 @@
"__id__": 8
},
{
"__id__": 90
"__id__": 92
}
],
"_active": true,
......@@ -425,25 +425,25 @@
"__id__": 12
},
{
"__id__": 18
"__id__": 20
},
{
"__id__": 50
"__id__": 52
},
{
"__id__": 53
"__id__": 55
},
{
"__id__": 56
"__id__": 58
},
{
"__id__": 70
"__id__": 72
},
{
"__id__": 84
"__id__": 86
},
{
"__id__": 89
"__id__": 91
}
],
"_active": true,
......@@ -639,6 +639,9 @@
},
{
"__id__": 17
},
{
"__id__": 18
}
],
"_prefab": null,
......@@ -866,6 +869,88 @@
"_originalHeight": 0,
"_id": "30udG3x11IJILlcDYWntvI"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 19
}
],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "abUKtv5QRNCLyNL/iuR+Cu"
},
{
"__type__": "cc.ClickEvent",
"target": {
"__id__": 2
},
"component": "",
"_componentId": "8b0b7lMf15OlIK40chbxp64",
"handler": "playAudioTitle",
"customEventData": ""
},
{
"__type__": "cc.Node",
"_name": "Layout",
......@@ -875,16 +960,16 @@
},
"_children": [
{
"__id__": 19
"__id__": 21
},
{
"__id__": 34
"__id__": 36
}
],
"_active": true,
"_components": [
{
"__id__": 49
"__id__": 51
}
],
"_prefab": null,
......@@ -940,12 +1025,9 @@
"_name": "connent_1",
"_objFlags": 0,
"_parent": {
"__id__": 18
},
"_children": [
{
"__id__": 20
},
"_children": [
{
"__id__": 22
},
......@@ -953,16 +1035,19 @@
"__id__": 24
},
{
"__id__": 28
"__id__": 26
},
{
"__id__": 30
},
{
"__id__": 32
}
],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 35
}
],
"_prefab": null,
......@@ -1018,13 +1103,13 @@
"_name": "connent_2",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 21
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 21
"__id__": 23
}
],
"_prefab": null,
......@@ -1080,7 +1165,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
"__id__": 22
},
"_enabled": true,
"_materials": [
......@@ -1112,13 +1197,13 @@
"_name": "connent_4",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 21
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 23
"__id__": 25
}
],
"_prefab": null,
......@@ -1174,7 +1259,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
"__id__": 24
},
"_enabled": true,
"_materials": [
......@@ -1206,17 +1291,17 @@
"_name": "connent_3",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 21
},
"_children": [
{
"__id__": 25
"__id__": 27
}
],
"_active": true,
"_components": [
{
"__id__": 27
"__id__": 29
}
],
"_prefab": null,
......@@ -1272,13 +1357,13 @@
"_name": "Layout",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 26
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 26
"__id__": 28
}
],
"_prefab": null,
......@@ -1334,7 +1419,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
"__id__": 27
},
"_enabled": true,
"_layoutSize": {
......@@ -1366,7 +1451,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 26
},
"_enabled": true,
"_materials": [
......@@ -1398,13 +1483,13 @@
"_name": "db",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 21
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 29
"__id__": 31
}
],
"_prefab": null,
......@@ -1460,7 +1545,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 30
},
"_enabled": true,
"_materials": [
......@@ -1500,16 +1585,16 @@
"_name": "title",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 21
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 31
"__id__": 33
},
{
"__id__": 32
"__id__": 34
}
],
"_prefab": null,
......@@ -1565,7 +1650,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
"__id__": 32
},
"_enabled": true,
"_materials": [
......@@ -1600,7 +1685,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
"__id__": 32
},
"_enabled": true,
"_color": {
......@@ -1618,7 +1703,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 21
},
"_enabled": true,
"_materials": [
......@@ -1650,12 +1735,9 @@
"_name": "connent_1",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 20
},
"_children": [
{
"__id__": 35
},
{
"__id__": 37
},
......@@ -1663,16 +1745,19 @@
"__id__": 39
},
{
"__id__": 43
"__id__": 41
},
{
"__id__": 45
},
{
"__id__": 47
}
],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 50
}
],
"_prefab": null,
......@@ -1728,13 +1813,13 @@
"_name": "connent_2",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 36
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 36
"__id__": 38
}
],
"_prefab": null,
......@@ -1790,7 +1875,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 37
},
"_enabled": true,
"_materials": [
......@@ -1822,13 +1907,13 @@
"_name": "connent_4",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 36
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 38
"__id__": 40
}
],
"_prefab": null,
......@@ -1884,7 +1969,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 39
},
"_enabled": true,
"_materials": [
......@@ -1916,17 +2001,17 @@
"_name": "connent_3",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 36
},
"_children": [
{
"__id__": 40
"__id__": 42
}
],
"_active": true,
"_components": [
{
"__id__": 42
"__id__": 44
}
],
"_prefab": null,
......@@ -1982,13 +2067,13 @@
"_name": "Layout",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 41
"__id__": 43
}
],
"_prefab": null,
......@@ -2044,7 +2129,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 42
},
"_enabled": true,
"_layoutSize": {
......@@ -2076,7 +2161,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 41
},
"_enabled": true,
"_materials": [
......@@ -2108,13 +2193,13 @@
"_name": "db",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 36
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 44
"__id__": 46
}
],
"_prefab": null,
......@@ -2170,7 +2255,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 45
},
"_enabled": true,
"_materials": [
......@@ -2210,16 +2295,16 @@
"_name": "title",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 36
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 48
},
{
"__id__": 47
"__id__": 49
}
],
"_prefab": null,
......@@ -2275,7 +2360,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 47
},
"_enabled": true,
"_materials": [
......@@ -2310,7 +2395,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 47
},
"_enabled": true,
"_color": {
......@@ -2328,7 +2413,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 36
},
"_enabled": true,
"_materials": [
......@@ -2360,7 +2445,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 20
},
"_enabled": true,
"alignMode": 1,
......@@ -2393,10 +2478,10 @@
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 53
},
{
"__id__": 52
"__id__": 54
}
],
"_prefab": null,
......@@ -2452,7 +2537,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 52
},
"_enabled": true,
"_layoutSize": {
......@@ -2484,7 +2569,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 52
},
"_enabled": true,
"alignMode": 2,
......@@ -2517,10 +2602,10 @@
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 56
},
{
"__id__": 55
"__id__": 57
}
],
"_prefab": null,
......@@ -2576,7 +2661,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 55
},
"_enabled": true,
"_layoutSize": {
......@@ -2608,7 +2693,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 55
},
"_enabled": true,
"alignMode": 2,
......@@ -2639,7 +2724,7 @@
},
"_children": [
{
"__id__": 57
"__id__": 59
}
],
"_active": false,
......@@ -2697,12 +2782,9 @@
"_name": "item",
"_objFlags": 0,
"_parent": {
"__id__": 56
},
"_children": [
{
"__id__": 58
},
"_children": [
{
"__id__": 60
},
......@@ -2710,16 +2792,19 @@
"__id__": 62
},
{
"__id__": 66
"__id__": 64
},
{
"__id__": 68
}
],
"_active": true,
"_components": [
{
"__id__": 68
"__id__": 70
},
{
"__id__": 69
"__id__": 71
}
],
"_prefab": null,
......@@ -2775,13 +2860,13 @@
"_name": "item_bg3",
"_objFlags": 0,
"_parent": {
"__id__": 57
"__id__": 59
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 59
"__id__": 61
}
],
"_prefab": null,
......@@ -2837,7 +2922,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 60
},
"_enabled": true,
"_materials": [
......@@ -2869,13 +2954,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 57
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 63
}
],
"_prefab": null,
......@@ -2931,7 +3016,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 62
},
"_enabled": true,
"_materials": [
......@@ -2947,7 +3032,7 @@
"_lineHeight": 32,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "41ef287f-ba46-4313-a114-676b6eae4bca"
"__uuid__": "5c0041d0-ccbd-4069-bc12-73a47695ed52"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
......@@ -2966,17 +3051,17 @@
"_name": "red",
"_objFlags": 0,
"_parent": {
"__id__": 57
"__id__": 59
},
"_children": [
{
"__id__": 63
"__id__": 65
}
],
"_active": false,
"_components": [
{
"__id__": 65
"__id__": 67
}
],
"_prefab": null,
......@@ -3032,13 +3117,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 66
}
],
"_prefab": null,
......@@ -3094,7 +3179,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -3110,7 +3195,7 @@
"_lineHeight": 32,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "41ef287f-ba46-4313-a114-676b6eae4bca"
"__uuid__": "5c0041d0-ccbd-4069-bc12-73a47695ed52"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
......@@ -3129,7 +3214,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -3161,13 +3246,13 @@
"_name": "photo",
"_objFlags": 0,
"_parent": {
"__id__": 57
"__id__": 59
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 67
"__id__": 69
}
],
"_prefab": null,
......@@ -3223,7 +3308,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 68
},
"_enabled": true,
"_materials": [
......@@ -3255,7 +3340,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 57
"__id__": 59
},
"_enabled": true,
"_materials": [
......@@ -3287,20 +3372,20 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 57
"__id__": 59
},
"_enabled": true,
"Item_name": {
"__id__": 61
"__id__": 63
},
"Item_redName": {
"__id__": 64
"__id__": 66
},
"Item_photo": {
"__id__": 66
"__id__": 68
},
"Item_complete": {
"__id__": 58
"__id__": 60
},
"_id": "c6/2WIOWRJ1bavF5ytftPN"
},
......@@ -3313,7 +3398,7 @@
},
"_children": [
{
"__id__": 71
"__id__": 73
}
],
"_active": false,
......@@ -3371,12 +3456,9 @@
"_name": "item",
"_objFlags": 0,
"_parent": {
"__id__": 70
},
"_children": [
{
"__id__": 72
},
"_children": [
{
"__id__": 74
},
......@@ -3384,16 +3466,19 @@
"__id__": 76
},
{
"__id__": 80
"__id__": 78
},
{
"__id__": 82
}
],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 84
},
{
"__id__": 83
"__id__": 85
}
],
"_prefab": null,
......@@ -3449,13 +3534,13 @@
"_name": "item_bg3",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 73
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 73
"__id__": 75
}
],
"_prefab": null,
......@@ -3511,7 +3596,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 74
},
"_enabled": true,
"_materials": [
......@@ -3543,13 +3628,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 77
}
],
"_prefab": null,
......@@ -3605,7 +3690,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 76
},
"_enabled": true,
"_materials": [
......@@ -3621,7 +3706,7 @@
"_lineHeight": 44,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "41ef287f-ba46-4313-a114-676b6eae4bca"
"__uuid__": "5c0041d0-ccbd-4069-bc12-73a47695ed52"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
......@@ -3640,17 +3725,17 @@
"_name": "red",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 73
},
"_children": [
{
"__id__": 77
"__id__": 79
}
],
"_active": false,
"_components": [
{
"__id__": 79
"__id__": 81
}
],
"_prefab": null,
......@@ -3706,13 +3791,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 78
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 78
"__id__": 80
}
],
"_prefab": null,
......@@ -3768,7 +3853,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 79
},
"_enabled": true,
"_materials": [
......@@ -3784,7 +3869,7 @@
"_lineHeight": 44,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "41ef287f-ba46-4313-a114-676b6eae4bca"
"__uuid__": "5c0041d0-ccbd-4069-bc12-73a47695ed52"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
......@@ -3803,7 +3888,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 78
},
"_enabled": true,
"_materials": [
......@@ -3835,13 +3920,13 @@
"_name": "photo",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 73
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 81
"__id__": 83
}
],
"_prefab": null,
......@@ -3897,7 +3982,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 82
},
"_enabled": true,
"_materials": [
......@@ -3929,7 +4014,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 73
},
"_enabled": true,
"_materials": [
......@@ -3961,20 +4046,20 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 73
},
"_enabled": true,
"Item_name": {
"__id__": 75
"__id__": 77
},
"Item_redName": {
"__id__": 78
"__id__": 80
},
"Item_photo": {
"__id__": 80
"__id__": 82
},
"Item_complete": {
"__id__": 72
"__id__": 74
},
"_id": "d3S/vW/XNO7Z5Jrqs6S78C"
},
......@@ -3989,13 +4074,13 @@
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 87
},
{
"__id__": 86
"__id__": 88
},
{
"__id__": 87
"__id__": 89
}
],
"_prefab": null,
......@@ -4051,7 +4136,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 86
},
"_enabled": true,
"_materials": [
......@@ -4083,7 +4168,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 86
},
"_enabled": true,
"alignMode": 1,
......@@ -4110,7 +4195,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 86
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4119,7 +4204,7 @@
"zoomScale": 0.95,
"clickEvents": [
{
"__id__": 88
"__id__": 90
}
],
"_N$interactable": true,
......@@ -4256,10 +4341,10 @@
"_active": false,
"_components": [
{
"__id__": 91
"__id__": 93
},
{
"__id__": 92
"__id__": 94
}
],
"_prefab": null,
......@@ -4315,7 +4400,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 92
},
"_enabled": true,
"_id": "80PylZIy9EbJR4/AZl0xgK"
......@@ -4325,7 +4410,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 92
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4334,7 +4419,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 93
"__id__": 95
}
],
"_N$interactable": true,
......@@ -4413,7 +4498,7 @@
"_active": true,
"_components": [
{
"__id__": 95
"__id__": 97
}
],
"_prefab": null,
......@@ -4469,7 +4554,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
"__id__": 96
},
"_enabled": true,
"eff_btn": {
......@@ -4552,29 +4637,29 @@
"_enabled": true,
"Item_0": [
{
"__id__": 56
"__id__": 58
},
{
"__id__": 70
"__id__": 72
},
{
"__id__": 89
"__id__": 91
}
],
"contentArr_2": [
{
"__id__": 50
"__id__": 52
},
{
"__id__": 53
"__id__": 55
}
],
"contentArr_1": [
{
"__id__": 19
"__id__": 21
},
{
"__id__": 34
"__id__": 36
}
],
"lb_title": {
......@@ -4604,7 +4689,7 @@
}
],
"canvasView": {
"__id__": 96
"__id__": 98
},
"isCanvas": true,
"_id": "5eOVDDzARGnoMLcNXyk5ml"
......@@ -4628,19 +4713,19 @@
},
"_children": [
{
"__id__": 102
"__id__": 104
},
{
"__id__": 107
"__id__": 109
},
{
"__id__": 112
"__id__": 114
},
{
"__id__": 117
"__id__": 119
},
{
"__id__": 122
"__id__": 124
}
],
"_active": true,
......@@ -4698,11 +4783,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 101
"__id__": 103
},
"_children": [
{
"__id__": 103
"__id__": 105
}
],
"_active": true,
......@@ -4760,17 +4845,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 104
},
"_children": [
{
"__id__": 104
"__id__": 106
}
],
"_active": true,
"_components": [
{
"__id__": 106
"__id__": 108
}
],
"_prefab": null,
......@@ -4826,13 +4911,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 103
"__id__": 105
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 105
"__id__": 107
}
],
"_prefab": null,
......@@ -4888,7 +4973,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
"__id__": 106
},
"_enabled": true,
"_materials": [
......@@ -4920,7 +5005,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 105
},
"_enabled": true,
"_materials": [
......@@ -4942,11 +5027,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 101
"__id__": 103
},
"_children": [
{
"__id__": 108
"__id__": 110
}
],
"_active": true,
......@@ -5004,17 +5089,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 107
"__id__": 109
},
"_children": [
{
"__id__": 109
"__id__": 111
}
],
"_active": true,
"_components": [
{
"__id__": 111
"__id__": 113
}
],
"_prefab": null,
......@@ -5070,13 +5155,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 108
"__id__": 110
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 112
}
],
"_prefab": null,
......@@ -5132,7 +5217,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
"__id__": 111
},
"_enabled": true,
"_materials": [
......@@ -5164,7 +5249,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 110
},
"_enabled": true,
"_materials": [
......@@ -5186,11 +5271,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 101
"__id__": 103
},
"_children": [
{
"__id__": 113
"__id__": 115
}
],
"_active": true,
......@@ -5248,17 +5333,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 112
"__id__": 114
},
"_children": [
{
"__id__": 114
"__id__": 116
}
],
"_active": true,
"_components": [
{
"__id__": 116
"__id__": 118
}
],
"_prefab": null,
......@@ -5314,13 +5399,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 113
"__id__": 115
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 115
"__id__": 117
}
],
"_prefab": null,
......@@ -5376,7 +5461,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 116
},
"_enabled": true,
"_materials": [
......@@ -5408,7 +5493,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
"__id__": 115
},
"_enabled": true,
"_materials": [
......@@ -5430,11 +5515,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 101
"__id__": 103
},
"_children": [
{
"__id__": 118
"__id__": 120
}
],
"_active": true,
......@@ -5492,17 +5577,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 117
"__id__": 119
},
"_children": [
{
"__id__": 119
"__id__": 121
}
],
"_active": true,
"_components": [
{
"__id__": 121
"__id__": 123
}
],
"_prefab": null,
......@@ -5558,13 +5643,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 118
"__id__": 120
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 122
}
],
"_prefab": null,
......@@ -5620,7 +5705,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 121
},
"_enabled": true,
"_materials": [
......@@ -5652,7 +5737,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 120
},
"_enabled": true,
"_materials": [
......@@ -5674,11 +5759,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 101
"__id__": 103
},
"_children": [
{
"__id__": 123
"__id__": 125
}
],
"_active": true,
......@@ -5736,17 +5821,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 122
"__id__": 124
},
"_children": [
{
"__id__": 124
"__id__": 126
}
],
"_active": true,
"_components": [
{
"__id__": 126
"__id__": 128
}
],
"_prefab": null,
......@@ -5802,13 +5887,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 123
"__id__": 125
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 125
"__id__": 127
}
],
"_prefab": null,
......@@ -5864,7 +5949,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 126
},
"_enabled": true,
"_materials": [
......@@ -5896,7 +5981,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 125
},
"_enabled": true,
"_materials": [
......@@ -5921,9 +6006,6 @@
"__id__": 1
},
"_children": [
{
"__id__": 128
},
{
"__id__": 130
},
......@@ -5935,6 +6017,9 @@
},
{
"__id__": 136
},
{
"__id__": 138
}
],
"_active": true,
......@@ -5992,13 +6077,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 127
"__id__": 129
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 129
"__id__": 131
}
],
"_prefab": null,
......@@ -6054,7 +6139,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 128
"__id__": 130
},
"_enabled": true,
"_materials": [
......@@ -6062,7 +6147,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "130348e9-f1a0-4858-8d2a-dfd298bc57f1"
......@@ -6086,13 +6171,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 127
"__id__": 129
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 131
"__id__": 133
}
],
"_prefab": null,
......@@ -6148,7 +6233,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 130
"__id__": 132
},
"_enabled": true,
"_materials": [
......@@ -6156,7 +6241,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "130348e9-f1a0-4858-8d2a-dfd298bc57f1"
......@@ -6180,13 +6265,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 127
"__id__": 129
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 133
"__id__": 135
}
],
"_prefab": null,
......@@ -6242,7 +6327,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 134
},
"_enabled": true,
"_materials": [
......@@ -6250,7 +6335,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "130348e9-f1a0-4858-8d2a-dfd298bc57f1"
......@@ -6274,13 +6359,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 127
"__id__": 129
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 135
"__id__": 137
}
],
"_prefab": null,
......@@ -6336,7 +6421,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 136
},
"_enabled": true,
"_materials": [
......@@ -6344,7 +6429,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "130348e9-f1a0-4858-8d2a-dfd298bc57f1"
......@@ -6368,13 +6453,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 127
"__id__": 129
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 137
"__id__": 139
}
],
"_prefab": null,
......@@ -6430,7 +6515,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 136
"__id__": 138
},
"_enabled": true,
"_materials": [
......@@ -6438,7 +6523,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "130348e9-f1a0-4858-8d2a-dfd298bc57f1"
......
......@@ -176,6 +176,15 @@ var game = cc.Class({
// this.setButtonState();
},
//播放标题音效
playAudioTitle: function () {
//获得播放路径
var path = g.data_mgr.data.audio_url;
g.res_mgr.playAudioByUrl(path, (url) => {
g.snd_mgr.playEffect(url, null);
});
},
//重置UI界面
resetUI: function () {
//移除所有子节点
......
......@@ -99,7 +99,7 @@ cc.Class({
var isIntersect_0 = contentArrPos_0.containsRect(posNode_1);
// console.log("坐标" + svLeftBottomPoint.x + "," + svLeftBottomPoint.y + "是否包含" + isIntersect_1);
if (isIntersect_1) {
if (this.node.type == 1) {
if (this.node.type == 2) {
this.Item_complete.active = true;
this.node.isComplent = true;
g.data_mgr.nowNum -= 1;
......@@ -128,7 +128,7 @@ cc.Class({
console.log("被1包含" + isIntersect_1);
} else
if (isIntersect_0) {
if (this.node.type == 2) {
if (this.node.type == 1) {
this.Item_complete.active = true;
this.node.isComplent = true;
g.data_mgr.nowNum -= 1;
......
......@@ -13,7 +13,8 @@ g.data_mgr = {
{ "id": "162373800016117r8ti", "word": "标题1" },
{ "id": "1623738000162o9u566", "word": "标题2" }],
"sheepArr": [{ "sheepfoldId": "162373800016117r8ti", "word": "aaa", "picUrl": "http://staging-teach.cdn.ireadabc.com/77d34b5a7f2895e9319d4485a84a1b2b.png" }, { "word": "aa", "sheepfoldId": "1623738000162o9u566", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, { "sheepfoldId": "1623738000162o9u566", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png", "word": "fgsdfg" }, { "sheepfoldId": "162373800016117r8ti", "picUrl": "http://staging-teach.cdn.ireadabc.com/77d34b5a7f2895e9319d4485a84a1b2b.png", "word": "gdfa" }],
"title": "asdfa"
"title": "asdfa",
"audio_url": "http://staging-teach.cdn.ireadabc.com/032ce2b956871f7bc7b200d0ebbb7afc.mp3"
}
const data = dataJson;
// const data = JSON.parse(dataJson);
......
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