Commit ffd47509 authored by Tt's avatar Tt

增加音效

parent b3a11f82
......@@ -5,7 +5,14 @@
<div style="width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: left;">
<span style="font-weight: 700; font-size: 30px; vertical-align:middle;">标题:</span>
<input (blur)="saveItem()" [(ngModel)]="biaoti.title" type="text"
style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
style="width: 750px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
<div style="display: flex; justify-items: center; padding-top: 10px">
<app-audio-recorder [audioUrl]="biaoti.audio_url"
(audioUploaded)="onAudioUploadSuccessByItem($event, biaoti)">
</app-audio-recorder>
</div>
</div>
</div>
......@@ -17,7 +24,12 @@
<div style="width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: left;">
<span style="font-weight: 700; font-size: 30px; vertical-align:middle;">主类:</span>
<input (blur)="saveItem()" [(ngModel)]="zhulei.title" type="text"
style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
style="width: 750px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
<div style="display: flex; justify-items: center; padding-top: 10px">
<app-audio-recorder [audioUrl]="zhulei.audio_url"
(audioUploaded)="onAudioUploadSuccessByItem($event, zhulei)">
</app-audio-recorder>
</div>
</div>
</div>
......@@ -29,7 +41,12 @@
<div style="width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: left;">
<span style="font-weight: 700; font-size: 30px; vertical-align:middle;">分类{{c+1}}:</span>
<input (blur)="saveItem()" [(ngModel)]="fenlei.title" type="text"
style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
style="width: 750px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
<div style="display: flex; justify-items: center; padding-top: 10px">
<app-audio-recorder [audioUrl]="fenlei.audio_url"
(audioUploaded)="onAudioUploadSuccessByItem($event, fenlei)">
</app-audio-recorder>
</div>
</div>
</div>
......@@ -45,7 +62,12 @@
<span>删除</span>
</button>
<input (blur)="saveItem()" [(ngModel)]="sonlei.title" type="text"
style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
style="width: 750px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
<div style="display: flex; justify-items: center; padding-top: 10px">
<app-audio-recorder [audioUrl]="sonlei.audio_url"
(audioUploaded)="onAudioUploadSuccessByItem($event, sonlei)">
</app-audio-recorder>
</div>
</div>
</div>
......
......@@ -90,11 +90,11 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
getDefaultPicArr() {
let arr = [];
let biaoti = { title: "", child: [] };
let zhulei = { title: "", child: [] };
let biaoti = { title: "", child: [], audio_url: "" };
let zhulei = { title: "", child: [], audio_url: "" };
for (let m = 0; m < 2; m++) {
let fenlei = { title: "", child: [] };
let sonlei = { title: "", child: [] };
let fenlei = { title: "", child: [], audio_url: "" };
let sonlei = { title: "", child: [], audio_url: "" };
let item = this.cardItemData();
sonlei.child.push(item);
fenlei.child.push(sonlei);
......@@ -145,7 +145,8 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
if (length < 6) {
let cla = {
title: "",
child: []
child: [],
audio_url: ""
};
for (let i = 0; i < 1; i++) {
let item = this.cardItemData();
......
......@@ -47,6 +47,9 @@ function retData() {
}
}
// let item = { "contentObj": { "picArr": [{ "title": "fff", "child": [{ "title": "ddd", "child": [{ "title": "aaa", "child": [{ "title": "fff", "child": [{ "cardId": "", "title": "1", "pic_url": "http://staging-teach.cdn.ireadabc.com/88b1cd55a3e2ff70447331078c0e2941.png", "audio_url": "" }] }] }, { "title": "bbb", "child": [{ "title": "ee", "child": [{ "cardId": "", "title": "2", "pic_url": "http://staging-teach.cdn.ireadabc.com/fde35aaec618529b0b2b6cb3a18d1f85.png", "audio_url": "" }] }] }] }] }] } }
item = { "contentObj": { "picArr": [{ "title": "title", "child": [{ "title": "main", "child": [{ "title": "sub1", "child": [{ "title": "son1", "child": [{ "cardId": "", "title": "a", "pic_url": "http://staging-teach.cdn.ireadabc.com/a6f90512ef5ce6fed55599cc367ba8aa.png", "audio_url": "" }], "audio_url": "http://staging-teach.cdn.ireadabc.com/784cd4188bf126d6c3c9395d9a807619.mp3" }], "audio_url": "http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8.mp3" }, { "title": "sub2", "child": [{ "title": "son21", "child": [{ "cardId": "", "title": "q1", "pic_url": "http://staging-teach.cdn.ireadabc.com/fde35aaec618529b0b2b6cb3a18d1f85.png", "audio_url": "" }], "audio_url": "http://staging-teach.cdn.ireadabc.com/784cd4188bf126d6c3c9395d9a807619.mp3" }, { "title": "son22", "child": [{ "cardId": "", "title": "q2", "pic_url": "http://staging-teach.cdn.ireadabc.com/756083716a8ab9f2b6b66331e659845d.png", "audio_url": "" }], "audio_url": "http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8.mp3" }, { "title": "son23", "child": [{ "cardId": "", "title": "q4", "pic_url": "http://staging-teach.cdn.ireadabc.com/b0f3c1a415015b254692a5d536b5b3fa.png", "audio_url": "" }], "audio_url": "http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8.mp3" }], "audio_url": "http://staging-teach.cdn.ireadabc.com/0b42398a12e1b2f075e9965e4d608765.mp3" }], "audio_url": "http://staging-teach.cdn.ireadabc.com/784cd4188bf126d6c3c9395d9a807619.mp3" }], "audio_url": "http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8.mp3" }] } };
return item;
}
export const itemData = retData();
\ No newline at end of file
......@@ -8,8 +8,9 @@ class Card {
}
}
class defClass {
constructor(id, title, type) {
constructor(id, title, audio_url, type) {
this.id = id;
this.audio_url = audio_url;
this.type = type;
this.title = title;
this.child = [];
......@@ -67,15 +68,15 @@ class GameManager {
this._title = obj[0];
for (let i = 0; i < obj[0].child.length; i++) {
let zhulei = obj[0].child[i];
let zhuleiClass = new defClass(zhulei.id, zhulei.title, 0);
let zhuleiClass = new defClass(zhulei.id, zhulei.title, zhulei.audio_url, 0);
for (let a = 0; a < zhulei.child.length; a++) {
let fenlei = zhulei.child[a];
let fenleiClass = new defClass(fenId, fenlei.title, 0);
let fenleiClass = new defClass(fenId, fenlei.title, fenlei.audio_url, 0);
fenId++;//只有1和2
for (let b = 0; b < fenlei.child.length; b++) {
sonId++;
let sonlei = fenlei.child[b];
let sonleiClass = new defClass(sonId, sonlei.title, a);
let sonleiClass = new defClass(sonId, sonlei.title, sonlei.audio_url, a);
for (let c = 0; c < sonlei.child.length; c++) {
let card = sonlei.child[c];
cardId++;
......
......@@ -84,67 +84,67 @@
"__id__": 46
},
{
"__id__": 64
"__id__": 67
},
{
"__id__": 66
"__id__": 69
},
{
"__id__": 67
"__id__": 70
},
{
"__id__": 74
"__id__": 78
},
{
"__id__": 75
"__id__": 79
},
{
"__id__": 95
"__id__": 99
},
{
"__id__": 97
"__id__": 101
},
{
"__id__": 101
"__id__": 105
},
{
"__id__": 104
"__id__": 108
},
{
"__id__": 105
"__id__": 109
},
{
"__id__": 106
"__id__": 110
},
{
"__id__": 108
"__id__": 112
},
{
"__id__": 114
"__id__": 118
},
{
"__id__": 127
"__id__": 131
},
{
"__id__": 153
"__id__": 157
},
{
"__id__": 155
"__id__": 159
},
{
"__id__": 157
"__id__": 161
}
],
"_active": true,
"_components": [
{
"__id__": 159
"__id__": 163
},
{
"__id__": 160
"__id__": 164
},
{
"__id__": 161
"__id__": 165
}
],
"_prefab": null,
......@@ -2311,10 +2311,10 @@
"__id__": 47
},
{
"__id__": 53
"__id__": 54
},
{
"__id__": 59
"__id__": 61
}
],
"_active": true,
......@@ -2386,6 +2386,9 @@
"_components": [
{
"__id__": 52
},
{
"__id__": 53
}
],
"_prefab": null,
......@@ -2659,6 +2662,76 @@
"_atlas": null,
"_id": "ddD9Y9o9ZOA56cyfQFZpK7"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_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": {
"__id__": 47
},
"_id": "e9hETjbwFN6ofBSoo7woie"
},
{
"__type__": "cc.Node",
"_name": "sub_1",
......@@ -2668,16 +2741,19 @@
},
"_children": [
{
"__id__": 54
"__id__": 55
},
{
"__id__": 56
"__id__": 57
}
],
"_active": true,
"_components": [
{
"__id__": 58
"__id__": 59
},
{
"__id__": 60
}
],
"_prefab": null,
......@@ -2733,13 +2809,13 @@
"_name": "combined-shape_3",
"_objFlags": 0,
"_parent": {
"__id__": 53
"__id__": 54
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 56
}
],
"_prefab": null,
......@@ -2795,7 +2871,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -2827,13 +2903,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 53
"__id__": 54
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 57
"__id__": 58
}
],
"_prefab": null,
......@@ -2889,7 +2965,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
"__id__": 57
},
"_enabled": true,
"_materials": [
......@@ -2924,7 +3000,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 54
},
"_enabled": true,
"_materials": [
......@@ -2951,6 +3027,76 @@
"_atlas": null,
"_id": "09rFGySzdO/bfBMfqsDCbM"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_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": {
"__id__": 54
},
"_id": "8cGgjvgvhL/LuPKRoVnVQq"
},
{
"__type__": "cc.Node",
"_name": "main",
......@@ -2960,14 +3106,18 @@
},
"_children": [
{
"__id__": 60
"__id__": 62
},
{
"__id__": 62
"__id__": 64
}
],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 66
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -3021,13 +3171,13 @@
"_name": "oval-18",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 61
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 63
}
],
"_prefab": null,
......@@ -3083,7 +3233,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 62
},
"_enabled": true,
"_materials": [
......@@ -3115,13 +3265,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 61
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 63
"__id__": 65
}
],
"_prefab": null,
......@@ -3177,7 +3327,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -3207,6 +3357,76 @@
"_N$cacheMode": 0,
"_id": "4dOWUWrcJLNoAOLcPD5MkO"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_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": {
"__id__": 61
},
"_id": "f41Ic5OXhCRpAxS/kMIRiA"
},
{
"__type__": "cc.Node",
"_name": "box",
......@@ -3218,7 +3438,7 @@
"_active": false,
"_components": [
{
"__id__": 65
"__id__": 68
}
],
"_prefab": null,
......@@ -3274,7 +3494,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 67
},
"_enabled": true,
"_materials": [
......@@ -3368,17 +3588,21 @@
},
"_children": [
{
"__id__": 68
"__id__": 71
},
{
"__id__": 70
"__id__": 73
},
{
"__id__": 72
"__id__": 75
}
],
"_active": false,
"_components": [],
"_components": [
{
"__id__": 77
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -3390,8 +3614,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
"width": 190,
"height": 80
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -3432,13 +3656,13 @@
"_name": "bg_blue",
"_objFlags": 0,
"_parent": {
"__id__": 67
"__id__": 70
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 69
"__id__": 72
}
],
"_prefab": null,
......@@ -3494,7 +3718,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 71
},
"_enabled": true,
"_materials": [
......@@ -3526,13 +3750,13 @@
"_name": "bg_green",
"_objFlags": 0,
"_parent": {
"__id__": 67
"__id__": 70
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 74
}
],
"_prefab": null,
......@@ -3588,7 +3812,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 73
},
"_enabled": true,
"_materials": [
......@@ -3620,13 +3844,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 67
"__id__": 70
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 73
"__id__": 76
}
],
"_prefab": null,
......@@ -3682,7 +3906,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 75
},
"_enabled": true,
"_materials": [
......@@ -3712,6 +3936,76 @@
"_N$cacheMode": 0,
"_id": "3e8K9UCwlJnYOUZovAaY0F"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_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": {
"__id__": 70
},
"_id": "176BYmeDpPZ68HlISEHa8t"
},
{
"__type__": "cc.Node",
"_name": "sons",
......@@ -3778,12 +4072,6 @@
"__id__": 2
},
"_children": [
{
"__id__": 76
},
{
"__id__": 78
},
{
"__id__": 80
},
......@@ -3793,14 +4081,20 @@
{
"__id__": 84
},
{
"__id__": 86
},
{
"__id__": 88
},
{
"__id__": 92
}
],
"_active": false,
"_components": [
{
"__id__": 94
"__id__": 98
}
],
"_prefab": null,
......@@ -3856,13 +4150,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 81
}
],
"_prefab": null,
......@@ -3918,7 +4212,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -3950,13 +4244,13 @@
"_name": "chose",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 79
"__id__": 83
}
],
"_prefab": null,
......@@ -4012,7 +4306,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 82
},
"_enabled": true,
"_materials": [
......@@ -4044,13 +4338,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 79
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 81
"__id__": 85
}
],
"_prefab": null,
......@@ -4106,7 +4400,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 84
},
"_enabled": true,
"_materials": [
......@@ -4138,13 +4432,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 83
"__id__": 87
}
],
"_prefab": null,
......@@ -4200,7 +4494,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
"__id__": 86
},
"_enabled": true,
"_materials": [
......@@ -4210,8 +4504,8 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "rerg",
"_N$string": "rerg",
"_string": "",
"_N$string": "",
"_fontSize": 35,
"_lineHeight": 50,
"_enableWrapText": false,
......@@ -4235,17 +4529,17 @@
"_name": "fail",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 79
},
"_children": [
{
"__id__": 85
"__id__": 89
}
],
"_active": false,
"_components": [
{
"__id__": 87
"__id__": 91
}
],
"_prefab": null,
......@@ -4301,13 +4595,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 84
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 86
"__id__": 90
}
],
"_prefab": null,
......@@ -4363,7 +4657,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 89
},
"_enabled": true,
"_materials": [
......@@ -4398,7 +4692,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -4430,20 +4724,20 @@
"_name": "success",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 79
},
"_children": [
{
"__id__": 89
"__id__": 93
},
{
"__id__": 91
"__id__": 95
}
],
"_active": false,
"_components": [
{
"__id__": 93
"__id__": 97
}
],
"_prefab": null,
......@@ -4499,13 +4793,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 88
"__id__": 92
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 94
}
],
"_prefab": null,
......@@ -4561,7 +4855,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
"__id__": 93
},
"_enabled": true,
"_materials": [
......@@ -4596,13 +4890,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 88
"__id__": 92
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 92
"__id__": 96
}
],
"_prefab": null,
......@@ -4658,7 +4952,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
"__id__": 95
},
"_enabled": true,
"_materials": [
......@@ -4690,7 +4984,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
"__id__": 92
},
"_enabled": true,
"_materials": [
......@@ -4722,7 +5016,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 79
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4783,7 +5077,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 75
"__id__": 79
},
"_id": "58IQ76yf1KT71BqZoNtHOV"
},
......@@ -4798,7 +5092,7 @@
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 100
}
],
"_prefab": null,
......@@ -4854,7 +5148,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
"__id__": 99
},
"_enabled": true,
"r_width": 0,
......@@ -4881,13 +5175,13 @@
"_active": true,
"_components": [
{
"__id__": 98
"__id__": 102
},
{
"__id__": 99
"__id__": 103
},
{
"__id__": 100
"__id__": 104
}
],
"_prefab": null,
......@@ -4943,7 +5237,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 101
},
"_enabled": true,
"_materials": [
......@@ -4975,7 +5269,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 101
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5036,7 +5330,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 97
"__id__": 101
},
"_id": "86ErSTSUhP26kFUGhhqqPn"
},
......@@ -5045,7 +5339,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 101
},
"_enabled": true,
"r_width": 0,
......@@ -5072,10 +5366,10 @@
"_active": true,
"_components": [
{
"__id__": 102
"__id__": 106
},
{
"__id__": 103
"__id__": 107
}
],
"_prefab": null,
......@@ -5131,7 +5425,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 105
},
"_enabled": true,
"_layoutSize": {
......@@ -5163,7 +5457,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 105
},
"_enabled": true,
"alignMode": 1,
......@@ -5312,7 +5606,7 @@
"_active": true,
"_components": [
{
"__id__": 107
"__id__": 111
}
],
"_prefab": null,
......@@ -5368,7 +5662,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 110
},
"_enabled": true,
"_materials": [
......@@ -5412,13 +5706,13 @@
},
"_children": [
{
"__id__": 109
"__id__": 113
}
],
"_active": true,
"_components": [
{
"__id__": 113
"__id__": 117
}
],
"_prefab": null,
......@@ -5474,17 +5768,17 @@
"_name": "Star",
"_objFlags": 0,
"_parent": {
"__id__": 108
"__id__": 112
},
"_children": [
{
"__id__": 110
"__id__": 114
}
],
"_active": false,
"_components": [
{
"__id__": 112
"__id__": 116
}
],
"_prefab": null,
......@@ -5540,13 +5834,13 @@
"_name": "StarBig",
"_objFlags": 0,
"_parent": {
"__id__": 109
"__id__": 113
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 111
"__id__": 115
}
],
"_prefab": null,
......@@ -5602,7 +5896,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 110
"__id__": 114
},
"_enabled": true,
"_materials": [
......@@ -5634,7 +5928,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
"__id__": 113
},
"_enabled": true,
"_materials": [
......@@ -5666,7 +5960,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 112
},
"_enabled": true,
"_materials": [
......@@ -5701,12 +5995,6 @@
"__id__": 2
},
"_children": [
{
"__id__": 115
},
{
"__id__": 117
},
{
"__id__": 119
},
......@@ -5718,6 +6006,12 @@
},
{
"__id__": 125
},
{
"__id__": 127
},
{
"__id__": 129
}
],
"_active": true,
......@@ -5775,13 +6069,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 114
"__id__": 118
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 116
"__id__": 120
}
],
"_prefab": null,
......@@ -5837,7 +6131,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
"__id__": 119
},
"_enabled": true,
"_materials": [
......@@ -5869,13 +6163,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 114
"__id__": 118
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 118
"__id__": 122
}
],
"_prefab": null,
......@@ -5931,7 +6225,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 121
},
"_enabled": true,
"_materials": [
......@@ -5963,13 +6257,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 114
"__id__": 118
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 124
}
],
"_prefab": null,
......@@ -6025,7 +6319,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 123
},
"_enabled": true,
"_materials": [
......@@ -6057,13 +6351,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 114
"__id__": 118
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 122
"__id__": 126
}
],
"_prefab": null,
......@@ -6119,7 +6413,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 121
"__id__": 125
},
"_enabled": true,
"_materials": [
......@@ -6151,13 +6445,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 114
"__id__": 118
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 124
"__id__": 128
}
],
"_prefab": null,
......@@ -6213,7 +6507,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 127
},
"_enabled": true,
"_materials": [
......@@ -6245,13 +6539,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 114
"__id__": 118
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 126
"__id__": 130
}
],
"_prefab": null,
......@@ -6307,7 +6601,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 125
"__id__": 129
},
"_enabled": true,
"_materials": [
......@@ -6343,19 +6637,19 @@
},
"_children": [
{
"__id__": 128
"__id__": 132
},
{
"__id__": 133
"__id__": 137
},
{
"__id__": 138
"__id__": 142
},
{
"__id__": 143
"__id__": 147
},
{
"__id__": 148
"__id__": 152
}
],
"_active": true,
......@@ -6413,11 +6707,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 127
"__id__": 131
},
"_children": [
{
"__id__": 129
"__id__": 133
}
],
"_active": true,
......@@ -6475,17 +6769,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 128
"__id__": 132
},
"_children": [
{
"__id__": 130
"__id__": 134
}
],
"_active": true,
"_components": [
{
"__id__": 132
"__id__": 136
}
],
"_prefab": null,
......@@ -6541,13 +6835,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 129
"__id__": 133
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 131
"__id__": 135
}
],
"_prefab": null,
......@@ -6603,7 +6897,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 130
"__id__": 134
},
"_enabled": true,
"_materials": [
......@@ -6635,7 +6929,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 129
"__id__": 133
},
"_enabled": true,
"_materials": [
......@@ -6657,11 +6951,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 127
"__id__": 131
},
"_children": [
{
"__id__": 134
"__id__": 138
}
],
"_active": true,
......@@ -6719,17 +7013,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 133
"__id__": 137
},
"_children": [
{
"__id__": 135
"__id__": 139
}
],
"_active": true,
"_components": [
{
"__id__": 137
"__id__": 141
}
],
"_prefab": null,
......@@ -6785,13 +7079,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 134
"__id__": 138
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 136
"__id__": 140
}
],
"_prefab": null,
......@@ -6847,7 +7141,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 135
"__id__": 139
},
"_enabled": true,
"_materials": [
......@@ -6879,7 +7173,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 138
},
"_enabled": true,
"_materials": [
......@@ -6901,11 +7195,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 127
"__id__": 131
},
"_children": [
{
"__id__": 139
"__id__": 143
}
],
"_active": true,
......@@ -6963,17 +7257,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 138
"__id__": 142
},
"_children": [
{
"__id__": 140
"__id__": 144
}
],
"_active": true,
"_components": [
{
"__id__": 142
"__id__": 146
}
],
"_prefab": null,
......@@ -7029,13 +7323,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 143
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 141
"__id__": 145
}
],
"_prefab": null,
......@@ -7091,7 +7385,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 144
},
"_enabled": true,
"_materials": [
......@@ -7123,7 +7417,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 139
"__id__": 143
},
"_enabled": true,
"_materials": [
......@@ -7145,11 +7439,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 127
"__id__": 131
},
"_children": [
{
"__id__": 144
"__id__": 148
}
],
"_active": true,
......@@ -7207,17 +7501,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 143
"__id__": 147
},
"_children": [
{
"__id__": 145
"__id__": 149
}
],
"_active": true,
"_components": [
{
"__id__": 147
"__id__": 151
}
],
"_prefab": null,
......@@ -7273,13 +7567,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 144
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 146
"__id__": 150
}
],
"_prefab": null,
......@@ -7335,7 +7629,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 149
},
"_enabled": true,
"_materials": [
......@@ -7367,7 +7661,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 148
},
"_enabled": true,
"_materials": [
......@@ -7389,11 +7683,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 127
"__id__": 131
},
"_children": [
{
"__id__": 149
"__id__": 153
}
],
"_active": true,
......@@ -7451,17 +7745,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 148
"__id__": 152
},
"_children": [
{
"__id__": 150
"__id__": 154
}
],
"_active": true,
"_components": [
{
"__id__": 152
"__id__": 156
}
],
"_prefab": null,
......@@ -7517,13 +7811,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 149
"__id__": 153
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 151
"__id__": 155
}
],
"_prefab": null,
......@@ -7579,7 +7873,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 154
},
"_enabled": true,
"_materials": [
......@@ -7611,7 +7905,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 149
"__id__": 153
},
"_enabled": true,
"_materials": [
......@@ -7639,7 +7933,7 @@
"_active": true,
"_components": [
{
"__id__": 154
"__id__": 158
}
],
"_prefab": null,
......@@ -7695,7 +7989,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 153
"__id__": 157
},
"_enabled": true,
"_clip": {
......@@ -7720,7 +8014,7 @@
"_active": true,
"_components": [
{
"__id__": 156
"__id__": 160
}
],
"_prefab": null,
......@@ -7776,7 +8070,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 155
"__id__": 159
},
"_enabled": true,
"_clip": {
......@@ -7801,7 +8095,7 @@
"_active": true,
"_components": [
{
"__id__": 158
"__id__": 162
}
],
"_prefab": null,
......@@ -7857,7 +8151,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
"__id__": 161
},
"_enabled": true,
"_clip": {
......
......@@ -187,9 +187,15 @@ cc.Class({
pg.view.setString(pg.view.find(this, "title/txt"), this._title);
//刷新主类
pg.view.setString(pg.view.find(this, "main/main/txt"), this._zhuClass.title);
pg.view.touchOn(pg.view.find(this, "main/main"), this.onTouchVoice, this);
pg.view.find(this, "main/main").data = this._zhuClass;
//刷新分类
pg.view.setString(pg.view.find(this, "main/sub_0/txt"), this._zhuClass.child[0].title);
pg.view.setString(pg.view.find(this, "main/sub_1/txt"), this._zhuClass.child[1].title);
pg.view.find(this, "main/sub_0").data = this._zhuClass.child[0];
pg.view.find(this, "main/sub_1").data = this._zhuClass.child[1];
pg.view.touchOn(pg.view.find(this, "main/sub_0"), this.onTouchVoice, this);
pg.view.touchOn(pg.view.find(this, "main/sub_1"), this.onTouchVoice, this);
setTimeout(() => {
this.fixTxtSize([pg.view.find(this, "main/sub_0/txt"), pg.view.find(this, "main/sub_1/txt")])
}, 30);
......@@ -256,6 +262,7 @@ cc.Class({
txtArr.push(pg.view.find(itemClone, 'txt'));
pg.view.visible(pg.view.find(itemClone, "bg_blue"), data.type == 0);
pg.view.visible(pg.view.find(itemClone, "bg_green"), data.type == 1);
pg.view.touchOn(itemClone, this.onTouchVoice, this);
parent.addChild(itemClone);
}
setTimeout(() => {
......@@ -662,6 +669,11 @@ cc.Class({
};
}
},
//
onTouchVoice(touch) {
let item = touch.target;
pg.audio.playAudioByUrl(item.data.audio_url);
},
//回合结束
groupEnd() {
for (let i = 0; i < this._boxItems.length; i++) {
......
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