Commit 165901a1 authored by Tt's avatar Tt

back修改完成

parent d00d1152
{
"ver": "1.1.2",
"uuid": "19a64a93-34ed-4e65-9303-d0a268c1803c",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.1.0",
"uuid": "927f6c73-f3af-4c69-a990-9dc6668dbb70",
"subMetas": {}
}
\ No newline at end of file
// pg.event.emit('npc_layer_back_init',{ })
// pg.event.emit('npc_voice_play_voice_start') // pg.event.emit('npc_voice_play_voice_start')
// pg.event.emit('npc_voice_play_voice_end') // pg.event.emit('npc_voice_play_voice_end')
...@@ -14,25 +15,50 @@ export default class LayerBack extends cc.Component { ...@@ -14,25 +15,50 @@ export default class LayerBack extends cc.Component {
this.initView(); this.initView();
this.initEvent(); this.initEvent();
} }
private label_title: cc.Node;
initView() { initView() {
this.btn_back = pg.view.find(this, 'btn_back') this.btn_back = pg.view.find(this, 'btn_back')
this.img_npc_voice = pg.view.find(this, 'img_npc_voice') this.label_title = pg.view.find(this, 'label_title')
this.img_npc_voice = pg.view.find(this.label_title, 'img_npc_voice')
pg.view.touchOn(this.img_npc_voice, this.playVoiceStart, this);
}
private npcTitle: string;
private npcAudio: string;
updateView(data) {
this.npcTitle = data.npcTitle
this.npcAudio = data.npcAudio
pg.view.visible(this.img_npc_voice, this.npcAudio)
pg.view.visible(this.label_title, this.npcTitle)
pg.view.setString(this.label_title, this.npcTitle);
} }
initEvent() { initEvent() {
pg.view.touchOn(this.btn_back, this.onTouchBack, this) pg.view.touchOn(this.btn_back, this.onTouchBack, this)
pg.event.on('npc_layer_back_init', (data) => {
pg.event.on('npc_voice_play_voice_start', () => { this.updateView(data);
if (!this.npcAudio) {
pg.event.emit('npc_voice_play_voice_end');
} else {
this.playVoiceStart(); this.playVoiceStart();
}) }
pg.event.on('npc_voice_play_voice_end', () => {
this.playVoiceEnd();
}) })
} }
private playVoiceCount: number; private playVoiceCount: number;
private audioId: number;
playVoiceStart() { playVoiceStart() {
if (this.playVoiceCount > 0) return; if (this.playVoiceCount > 0) {
if (this.audioId) cc.audioEngine.stopEffect(this.audioId);
this.playVoiceEnd();
}
this.playVoiceCount = 0; this.playVoiceCount = 0;
this.schedule(this.playVoiceRunning, 0.3) this.schedule(this.playVoiceRunning, 0.3)
pg.audio.playAudioByUrl(this.npcAudio, () => {
this.playVoiceEnd();
pg.event.emit('npc_voice_play_voice_end')
}, (audioId) => {
this.audioId = audioId;
});
} }
playVoiceRunning() { playVoiceRunning() {
this.playVoiceCount++; this.playVoiceCount++;
......
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 19 "__id__": 22
}, },
{ {
"__id__": 20 "__id__": 23
} }
], ],
"_prefab": { "_prefab": {
"__id__": 21 "__id__": 24
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 960,
0, 540,
0, 0,
0, 0,
0, 0,
...@@ -286,14 +286,14 @@ ...@@ -286,14 +286,14 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
}, },
"fileId": "61ulP3c3dDLb+4SfgnWK1F", "fileId": "61ulP3c3dDLb+4SfgnWK1F",
"sync": false "sync": false
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img_npc_voice", "_name": "label_title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1 "__id__": 1
...@@ -301,22 +301,90 @@ ...@@ -301,22 +301,90 @@
"_children": [ "_children": [
{ {
"__id__": 8 "__id__": 8
}
],
"_active": true,
"_components": [
{
"__id__": 20
}
],
"_prefab": {
"__id__": 21
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 188,
"g": 132,
"b": 235,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 150.74,
"height": 63
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-685.473,
441.1,
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": ""
}, },
{ {
"__id__": 11 "__type__": "cc.Node",
"_name": "img_npc_voice",
"_objFlags": 0,
"_parent": {
"__id__": 7
}, },
"_children": [
{ {
"__id__": 14 "__id__": 9
},
{
"__id__": 12
},
{
"__id__": 15
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 17 "__id__": 18
} }
], ],
"_prefab": { "_prefab": {
"__id__": 18 "__id__": 19
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -328,8 +396,8 @@ ...@@ -328,8 +396,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 100,
"height": 0 "height": 100
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -340,8 +408,8 @@ ...@@ -340,8 +408,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-638.532, 208.95399999999995,
437.61, 0,
0, 0,
0, 0,
0, 0,
...@@ -370,17 +438,17 @@ ...@@ -370,17 +438,17 @@
"_name": "p1", "_name": "p1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 8
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 9 "__id__": 10
} }
], ],
"_prefab": { "_prefab": {
"__id__": 10 "__id__": 11
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -434,7 +502,7 @@ ...@@ -434,7 +502,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 8 "__id__": 9
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -467,9 +535,9 @@ ...@@ -467,9 +535,9 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
}, },
"fileId": "eeSSmA+sZKe4zFitN7jaL3", "fileId": "24sc3KKz1GwYD9fN1vST/m",
"sync": false "sync": false
}, },
{ {
...@@ -477,17 +545,17 @@ ...@@ -477,17 +545,17 @@
"_name": "p2", "_name": "p2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 8
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 12 "__id__": 13
} }
], ],
"_prefab": { "_prefab": {
"__id__": 13 "__id__": 14
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -541,7 +609,7 @@ ...@@ -541,7 +609,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 11 "__id__": 12
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -574,9 +642,9 @@ ...@@ -574,9 +642,9 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
}, },
"fileId": "29QTrf+y1JVa+D/t6K2NFr", "fileId": "3eNvEzM/JP56UZzdtTQAIN",
"sync": false "sync": false
}, },
{ {
...@@ -584,17 +652,17 @@ ...@@ -584,17 +652,17 @@
"_name": "p3", "_name": "p3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 7 "__id__": 8
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 15 "__id__": 16
} }
], ],
"_prefab": { "_prefab": {
"__id__": 16 "__id__": 17
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -648,7 +716,7 @@ ...@@ -648,7 +716,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 14 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -681,9 +749,9 @@ ...@@ -681,9 +749,9 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
}, },
"fileId": "4anvaDTjZFOb9U0HkCAMR2", "fileId": "72yribDepLjZha4CRHI/xf",
"sync": false "sync": false
}, },
{ {
...@@ -691,15 +759,15 @@ ...@@ -691,15 +759,15 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 7 "__id__": 8
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 2,
"_target": null, "_target": null,
"_alignFlags": 9, "_alignFlags": 32,
"_left": 321.46799999999996, "_left": 0,
"_right": 0, "_right": -108.21399999999997,
"_top": 102.38999999999999, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -719,9 +787,55 @@ ...@@ -719,9 +787,55 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
},
"fileId": "e4KS5h7tdFiJnCxI3YJ5LQ",
"sync": false
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "I Spell",
"_N$string": "I Spell",
"_fontSize": 50,
"_lineHeight": 50,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "927f6c73-f3af-4c69-a990-9dc6668dbb70"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
}, },
"fileId": "fft5aHS35DjoYobvKkISue", "fileId": "0aBC7NPVlMNKQpHcVkCq5H",
"sync": false "sync": false
}, },
{ {
...@@ -767,7 +881,7 @@ ...@@ -767,7 +881,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
}, },
"fileId": "", "fileId": "",
"sync": false "sync": false
......
{
"ver": "1.1.2",
"uuid": "508c4cc0-7802-495f-8c13-85a2a81c52cd",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
...@@ -87,25 +87,25 @@ ...@@ -87,25 +87,25 @@
"__id__": 72 "__id__": 72
}, },
{ {
"__id__": 93 "__id__": 96
}, },
{ {
"__id__": 133 "__id__": 136
}, },
{ {
"__id__": 178 "__id__": 181
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 188 "__id__": 191
}, },
{ {
"__id__": 189 "__id__": 192
}, },
{ {
"__id__": 190 "__id__": 193
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3209,7 +3209,7 @@ ...@@ -3209,7 +3209,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "layer_back", "_name": "layer_back_hy01_danci",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
...@@ -3225,14 +3225,14 @@ ...@@ -3225,14 +3225,14 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 93
}, },
{ {
"__id__": 91 "__id__": 94
} }
], ],
"_prefab": { "_prefab": {
"__id__": 92 "__id__": 95
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3279,7 +3279,7 @@ ...@@ -3279,7 +3279,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "11R4aMkKxKgZS52TPi3Nka" "_id": "50SZ8bvDhJjZcPGq8LOvjM"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -3349,7 +3349,7 @@ ...@@ -3349,7 +3349,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "e3/u7X6t1KLaH9XlXAOrJm" "_id": "2fkSMQb9hFPYfsncsktdQ7"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -3381,7 +3381,7 @@ ...@@ -3381,7 +3381,7 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "f7X/OvJMJAKItzCh1RaWHk" "_id": "36xdk/1TpM1Zrp0LPtXW+1"
}, },
{ {
"__type__": "cc.Button", "__type__": "cc.Button",
...@@ -3449,7 +3449,7 @@ ...@@ -3449,7 +3449,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": null, "_N$target": null,
"_id": "a8LvosQQhILKJFhhxutTB8" "_id": "0f9uEQLahDwr3LHmjjUViV"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
...@@ -3476,7 +3476,7 @@ ...@@ -3476,7 +3476,7 @@
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 0,
"_originalHeight": 0, "_originalHeight": 0,
"_id": "aaGC5/NexPZ5I/gqgK2m6O" "_id": "a261XpetxLRLI5nkp7UWhC"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -3491,7 +3491,7 @@ ...@@ -3491,7 +3491,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img_npc_voice", "_name": "label_title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 72 "__id__": 72
...@@ -3499,22 +3499,90 @@ ...@@ -3499,22 +3499,90 @@
"_children": [ "_children": [
{ {
"__id__": 79 "__id__": 79
}
],
"_active": true,
"_components": [
{
"__id__": 91
}
],
"_prefab": {
"__id__": 92
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 188,
"g": 132,
"b": 235,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 150.74,
"height": 63
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-685.473,
441.1,
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": "cak2MqEUVFvLZVA9RvpNDi"
}, },
{ {
"__id__": 82 "__type__": "cc.Node",
"_name": "img_npc_voice",
"_objFlags": 0,
"_parent": {
"__id__": 78
},
"_children": [
{
"__id__": 80
}, },
{ {
"__id__": 85 "__id__": 83
},
{
"__id__": 86
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 88 "__id__": 89
} }
], ],
"_prefab": { "_prefab": {
"__id__": 89 "__id__": 90
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3526,8 +3594,8 @@ ...@@ -3526,8 +3594,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 100,
"height": 0 "height": 100
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3538,8 +3606,8 @@ ...@@ -3538,8 +3606,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-638.532, 208.95399999999995,
437.61, 0,
0, 0,
0, 0,
0, 0,
...@@ -3561,24 +3629,24 @@ ...@@ -3561,24 +3629,24 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "02JmJLHoBLmpd5DRGG9RAV" "_id": "c3514rpbRPlpEYURhqvScq"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "p1", "_name": "p1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 78 "__id__": 79
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 80 "__id__": 81
} }
], ],
"_prefab": { "_prefab": {
"__id__": 81 "__id__": 82
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3625,14 +3693,14 @@ ...@@ -3625,14 +3693,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "86WW6eeC1H0oa6CbV0+0hf" "_id": "9e4EzvPnlKX6Rpc7adgb3k"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 79 "__id__": 80
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3657,7 +3725,7 @@ ...@@ -3657,7 +3725,7 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "adqN/+bRlFr7ECzwsxP8fp" "_id": "1aszYC70JIj4+l8bt5cQyW"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -3667,7 +3735,7 @@ ...@@ -3667,7 +3735,7 @@
"asset": { "asset": {
"__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d" "__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
}, },
"fileId": "eeSSmA+sZKe4zFitN7jaL3", "fileId": "24sc3KKz1GwYD9fN1vST/m",
"sync": false "sync": false
}, },
{ {
...@@ -3675,17 +3743,17 @@ ...@@ -3675,17 +3743,17 @@
"_name": "p2", "_name": "p2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 78 "__id__": 79
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 83 "__id__": 84
} }
], ],
"_prefab": { "_prefab": {
"__id__": 84 "__id__": 85
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3732,14 +3800,14 @@ ...@@ -3732,14 +3800,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "8b/yqWLINAo5PQHYXVLGOl" "_id": "8dsqsZLmNPGJmFATGN6HCt"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 82 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3764,7 +3832,7 @@ ...@@ -3764,7 +3832,7 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "bdn7Ok2VFCWJQgjlHo25B/" "_id": "c5EjtpxuBIc5NnMSQ0+sEP"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -3774,7 +3842,7 @@ ...@@ -3774,7 +3842,7 @@
"asset": { "asset": {
"__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d" "__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
}, },
"fileId": "29QTrf+y1JVa+D/t6K2NFr", "fileId": "3eNvEzM/JP56UZzdtTQAIN",
"sync": false "sync": false
}, },
{ {
...@@ -3782,17 +3850,17 @@ ...@@ -3782,17 +3850,17 @@
"_name": "p3", "_name": "p3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 78 "__id__": 79
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 86 "__id__": 87
} }
], ],
"_prefab": { "_prefab": {
"__id__": 87 "__id__": 88
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3839,14 +3907,14 @@ ...@@ -3839,14 +3907,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "a6pst1KBFIhZOwHBKpnkkf" "_id": "58vwhA0GZNqYbhDdKYzrWZ"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 86
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3871,7 +3939,7 @@ ...@@ -3871,7 +3939,7 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "cbPOmZOt5MlqtCwgkqTopZ" "_id": "4d0W2W0+dJ16y/HXSnxIDQ"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -3881,7 +3949,7 @@ ...@@ -3881,7 +3949,7 @@
"asset": { "asset": {
"__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d" "__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
}, },
"fileId": "4anvaDTjZFOb9U0HkCAMR2", "fileId": "72yribDepLjZha4CRHI/xf",
"sync": false "sync": false
}, },
{ {
...@@ -3889,15 +3957,15 @@ ...@@ -3889,15 +3957,15 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 79
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 2,
"_target": null, "_target": null,
"_alignFlags": 9, "_alignFlags": 32,
"_left": 321.46799999999996, "_left": 0,
"_right": 0, "_right": -108.21399999999997,
"_top": 102.38999999999999, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -3909,7 +3977,53 @@ ...@@ -3909,7 +3977,53 @@
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 0,
"_originalHeight": 0, "_originalHeight": 0,
"_id": "f5afMkm3hH2b/nq0d9au4y" "_id": "e1HCFbUcRHEL/muwETSiF0"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 72
},
"asset": {
"__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
},
"fileId": "e4KS5h7tdFiJnCxI3YJ5LQ",
"sync": false
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "I Spell",
"_N$string": "I Spell",
"_fontSize": 50,
"_lineHeight": 50,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "927f6c73-f3af-4c69-a990-9dc6668dbb70"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "52AhGdeelPop1vDWhZxB6a"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -3919,7 +4033,7 @@ ...@@ -3919,7 +4033,7 @@
"asset": { "asset": {
"__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d" "__uuid__": "0b87ca13-07e1-4237-ab3b-7f27c69deb2d"
}, },
"fileId": "fft5aHS35DjoYobvKkISue", "fileId": "0aBC7NPVlMNKQpHcVkCq5H",
"sync": false "sync": false
}, },
{ {
...@@ -3947,7 +4061,7 @@ ...@@ -3947,7 +4061,7 @@
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 0,
"_originalHeight": 0, "_originalHeight": 0,
"_id": "216iSx2p5LIph0DbkDcBbK" "_id": "a37Z0ZFidJNZ+hNV0Q37pu"
}, },
{ {
"__type__": "7ab71itR/hJz4giCFo5yFB1", "__type__": "7ab71itR/hJz4giCFo5yFB1",
...@@ -3957,7 +4071,7 @@ ...@@ -3957,7 +4071,7 @@
"__id__": 72 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_id": "4bOu5J5BNMRbgcr/N6dJzl" "_id": "763HGmSipBDY2qC8rvvStU"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -3979,20 +4093,20 @@ ...@@ -3979,20 +4093,20 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 94 "__id__": 97
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 130 "__id__": 133
}, },
{ {
"__id__": 131 "__id__": 134
} }
], ],
"_prefab": { "_prefab": {
"__id__": 132 "__id__": 135
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4046,12 +4160,9 @@ ...@@ -4046,12 +4160,9 @@
"_name": "layout_record", "_name": "layout_record",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 93 "__id__": 96
}, },
"_children": [ "_children": [
{
"__id__": 95
},
{ {
"__id__": 98 "__id__": 98
}, },
...@@ -4069,16 +4180,19 @@ ...@@ -4069,16 +4180,19 @@
}, },
{ {
"__id__": 113 "__id__": 113
},
{
"__id__": 116
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 128 "__id__": 131
} }
], ],
"_prefab": { "_prefab": {
"__id__": 129 "__id__": 132
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4132,17 +4246,17 @@ ...@@ -4132,17 +4246,17 @@
"_name": "voice_white", "_name": "voice_white",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 97
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 99
} }
], ],
"_prefab": { "_prefab": {
"__id__": 97 "__id__": 100
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4196,7 +4310,7 @@ ...@@ -4196,7 +4310,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4226,7 +4340,7 @@ ...@@ -4226,7 +4340,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 93 "__id__": 96
}, },
"asset": { "asset": {
"__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363" "__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363"
...@@ -4239,17 +4353,17 @@ ...@@ -4239,17 +4353,17 @@
"_name": "record_bg", "_name": "record_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 97
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 102
} }
], ],
"_prefab": { "_prefab": {
"__id__": 100 "__id__": 103
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4303,7 +4417,7 @@ ...@@ -4303,7 +4417,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 98 "__id__": 101
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4333,7 +4447,7 @@ ...@@ -4333,7 +4447,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 93 "__id__": 96
}, },
"asset": { "asset": {
"__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363" "__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363"
...@@ -4346,17 +4460,17 @@ ...@@ -4346,17 +4460,17 @@
"_name": "record_icon", "_name": "record_icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 97
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 102 "__id__": 105
} }
], ],
"_prefab": { "_prefab": {
"__id__": 103 "__id__": 106
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4410,7 +4524,7 @@ ...@@ -4410,7 +4524,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4440,7 +4554,7 @@ ...@@ -4440,7 +4554,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 93 "__id__": 96
}, },
"asset": { "asset": {
"__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363" "__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363"
...@@ -4453,17 +4567,17 @@ ...@@ -4453,17 +4567,17 @@
"_name": "record_time", "_name": "record_time",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 97
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 105 "__id__": 108
} }
], ],
"_prefab": { "_prefab": {
"__id__": 106 "__id__": 109
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4517,7 +4631,7 @@ ...@@ -4517,7 +4631,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 104 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4547,7 +4661,7 @@ ...@@ -4547,7 +4661,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 93 "__id__": 96
}, },
"asset": { "asset": {
"__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363" "__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363"
...@@ -4560,17 +4674,17 @@ ...@@ -4560,17 +4674,17 @@
"_name": "AniNode", "_name": "AniNode",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 97
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 111
} }
], ],
"_prefab": { "_prefab": {
"__id__": 109 "__id__": 112
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4624,7 +4738,7 @@ ...@@ -4624,7 +4738,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 110
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4662,7 +4776,7 @@ ...@@ -4662,7 +4776,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 93 "__id__": 96
}, },
"asset": { "asset": {
"__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363" "__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363"
...@@ -4675,17 +4789,17 @@ ...@@ -4675,17 +4789,17 @@
"_name": "btn_record", "_name": "btn_record",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 97
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 114
} }
], ],
"_prefab": { "_prefab": {
"__id__": 112 "__id__": 115
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4739,7 +4853,7 @@ ...@@ -4739,7 +4853,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4805,7 +4919,7 @@ ...@@ -4805,7 +4919,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 93 "__id__": 96
}, },
"asset": { "asset": {
"__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363" "__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363"
...@@ -4818,12 +4932,9 @@ ...@@ -4818,12 +4932,9 @@
"_name": "btn_play", "_name": "btn_play",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 97
}, },
"_children": [ "_children": [
{
"__id__": 114
},
{ {
"__id__": 117 "__id__": 117
}, },
...@@ -4832,16 +4943,19 @@ ...@@ -4832,16 +4943,19 @@
}, },
{ {
"__id__": 123 "__id__": 123
},
{
"__id__": 126
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 126 "__id__": 129
} }
], ],
"_prefab": { "_prefab": {
"__id__": 127 "__id__": 130
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4895,17 +5009,17 @@ ...@@ -4895,17 +5009,17 @@
"_name": "p1", "_name": "p1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 113 "__id__": 116
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 115 "__id__": 118
} }
], ],
"_prefab": { "_prefab": {
"__id__": 116 "__id__": 119
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4959,7 +5073,7 @@ ...@@ -4959,7 +5073,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 114 "__id__": 117
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4989,7 +5103,7 @@ ...@@ -4989,7 +5103,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 93 "__id__": 96
}, },
"asset": { "asset": {
"__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363" "__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363"
...@@ -5002,17 +5116,17 @@ ...@@ -5002,17 +5116,17 @@
"_name": "p0", "_name": "p0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 113 "__id__": 116
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 118 "__id__": 121
} }
], ],
"_prefab": { "_prefab": {
"__id__": 119 "__id__": 122
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -5066,7 +5180,7 @@ ...@@ -5066,7 +5180,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 117 "__id__": 120
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5096,7 +5210,7 @@ ...@@ -5096,7 +5210,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 93 "__id__": 96
}, },
"asset": { "asset": {
"__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363" "__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363"
...@@ -5109,17 +5223,17 @@ ...@@ -5109,17 +5223,17 @@
"_name": "p2", "_name": "p2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 113 "__id__": 116
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 121 "__id__": 124
} }
], ],
"_prefab": { "_prefab": {
"__id__": 122 "__id__": 125
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -5173,7 +5287,7 @@ ...@@ -5173,7 +5287,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 120 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5203,7 +5317,7 @@ ...@@ -5203,7 +5317,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 93 "__id__": 96
}, },
"asset": { "asset": {
"__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363" "__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363"
...@@ -5216,17 +5330,17 @@ ...@@ -5216,17 +5330,17 @@
"_name": "p3", "_name": "p3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 113 "__id__": 116
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 124 "__id__": 127
} }
], ],
"_prefab": { "_prefab": {
"__id__": 125 "__id__": 128
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -5280,7 +5394,7 @@ ...@@ -5280,7 +5394,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 126
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5310,7 +5424,7 @@ ...@@ -5310,7 +5424,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 93 "__id__": 96
}, },
"asset": { "asset": {
"__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363" "__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363"
...@@ -5323,7 +5437,7 @@ ...@@ -5323,7 +5437,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 113 "__id__": 116
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5348,7 +5462,7 @@ ...@@ -5348,7 +5462,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 93 "__id__": 96
}, },
"asset": { "asset": {
"__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363" "__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363"
...@@ -5361,7 +5475,7 @@ ...@@ -5361,7 +5475,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 94 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5386,7 +5500,7 @@ ...@@ -5386,7 +5500,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 93 "__id__": 96
}, },
"asset": { "asset": {
"__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363" "__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363"
...@@ -5399,7 +5513,7 @@ ...@@ -5399,7 +5513,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5426,7 +5540,7 @@ ...@@ -5426,7 +5540,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"_id": "28SYbspDNAfqMNbpyAm+q/" "_id": "28SYbspDNAfqMNbpyAm+q/"
...@@ -5434,7 +5548,7 @@ ...@@ -5434,7 +5548,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 93 "__id__": 96
}, },
"asset": { "asset": {
"__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363" "__uuid__": "35fbe4f1-249e-4263-90a1-de923c148363"
...@@ -5451,29 +5565,29 @@ ...@@ -5451,29 +5565,29 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 134 "__id__": 137
}, },
{ {
"__id__": 148 "__id__": 151
}, },
{ {
"__id__": 157 "__id__": 160
}, },
{ {
"__id__": 166 "__id__": 169
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 175 "__id__": 178
}, },
{ {
"__id__": 176 "__id__": 179
} }
], ],
"_prefab": { "_prefab": {
"__id__": 177 "__id__": 180
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -5527,12 +5641,9 @@ ...@@ -5527,12 +5641,9 @@
"_name": "voice", "_name": "voice",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 133 "__id__": 136
}, },
"_children": [ "_children": [
{
"__id__": 135
},
{ {
"__id__": 138 "__id__": 138
}, },
...@@ -5541,12 +5652,15 @@ ...@@ -5541,12 +5652,15 @@
}, },
{ {
"__id__": 144 "__id__": 144
},
{
"__id__": 147
} }
], ],
"_active": false, "_active": false,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 147 "__id__": 150
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -5600,17 +5714,17 @@ ...@@ -5600,17 +5714,17 @@
"_name": "excellent", "_name": "excellent",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 134 "__id__": 137
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 136 "__id__": 139
} }
], ],
"_prefab": { "_prefab": {
"__id__": 137 "__id__": 140
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -5664,7 +5778,7 @@ ...@@ -5664,7 +5778,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 135 "__id__": 138
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5681,7 +5795,7 @@ ...@@ -5681,7 +5795,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -5694,17 +5808,17 @@ ...@@ -5694,17 +5808,17 @@
"_name": "good", "_name": "good",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 134 "__id__": 137
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 139 "__id__": 142
} }
], ],
"_prefab": { "_prefab": {
"__id__": 140 "__id__": 143
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -5758,7 +5872,7 @@ ...@@ -5758,7 +5872,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 138 "__id__": 141
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5775,7 +5889,7 @@ ...@@ -5775,7 +5889,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -5788,17 +5902,17 @@ ...@@ -5788,17 +5902,17 @@
"_name": "tryagain", "_name": "tryagain",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 134 "__id__": 137
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 142 "__id__": 145
} }
], ],
"_prefab": { "_prefab": {
"__id__": 143 "__id__": 146
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -5852,7 +5966,7 @@ ...@@ -5852,7 +5966,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 144
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5869,7 +5983,7 @@ ...@@ -5869,7 +5983,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -5882,17 +5996,17 @@ ...@@ -5882,17 +5996,17 @@
"_name": "ani", "_name": "ani",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 134 "__id__": 137
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 145 "__id__": 148
} }
], ],
"_prefab": { "_prefab": {
"__id__": 146 "__id__": 149
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -5946,7 +6060,7 @@ ...@@ -5946,7 +6060,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 144 "__id__": 147
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5963,7 +6077,7 @@ ...@@ -5963,7 +6077,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -5974,7 +6088,7 @@ ...@@ -5974,7 +6088,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -5987,24 +6101,24 @@ ...@@ -5987,24 +6101,24 @@
"_name": "layout_excellent", "_name": "layout_excellent",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 133 "__id__": 136
}, },
"_children": [ "_children": [
{ {
"__id__": 149 "__id__": 152
}, },
{ {
"__id__": 152 "__id__": 155
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 155 "__id__": 158
} }
], ],
"_prefab": { "_prefab": {
"__id__": 156 "__id__": 159
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -6058,17 +6172,17 @@ ...@@ -6058,17 +6172,17 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 148 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 150 "__id__": 153
} }
], ],
"_prefab": { "_prefab": {
"__id__": 151 "__id__": 154
}, },
"_opacity": 150, "_opacity": 150,
"_color": { "_color": {
...@@ -6122,7 +6236,7 @@ ...@@ -6122,7 +6236,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 149 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6152,7 +6266,7 @@ ...@@ -6152,7 +6266,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -6165,17 +6279,17 @@ ...@@ -6165,17 +6279,17 @@
"_name": "AniNode", "_name": "AniNode",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 148 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 153 "__id__": 156
} }
], ],
"_prefab": { "_prefab": {
"__id__": 154 "__id__": 157
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -6229,7 +6343,7 @@ ...@@ -6229,7 +6343,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 152 "__id__": 155
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6267,7 +6381,7 @@ ...@@ -6267,7 +6381,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -6280,7 +6394,7 @@ ...@@ -6280,7 +6394,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 148 "__id__": 151
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6305,7 +6419,7 @@ ...@@ -6305,7 +6419,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -6318,24 +6432,24 @@ ...@@ -6318,24 +6432,24 @@
"_name": "layout_good", "_name": "layout_good",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 133 "__id__": 136
}, },
"_children": [ "_children": [
{ {
"__id__": 158 "__id__": 161
}, },
{ {
"__id__": 161 "__id__": 164
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 164 "__id__": 167
} }
], ],
"_prefab": { "_prefab": {
"__id__": 165 "__id__": 168
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -6389,17 +6503,17 @@ ...@@ -6389,17 +6503,17 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 157 "__id__": 160
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 159 "__id__": 162
} }
], ],
"_prefab": { "_prefab": {
"__id__": 160 "__id__": 163
}, },
"_opacity": 150, "_opacity": 150,
"_color": { "_color": {
...@@ -6453,7 +6567,7 @@ ...@@ -6453,7 +6567,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 158 "__id__": 161
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6483,7 +6597,7 @@ ...@@ -6483,7 +6597,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -6496,17 +6610,17 @@ ...@@ -6496,17 +6610,17 @@
"_name": "AniNode", "_name": "AniNode",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 157 "__id__": 160
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 162 "__id__": 165
} }
], ],
"_prefab": { "_prefab": {
"__id__": 163 "__id__": 166
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -6560,7 +6674,7 @@ ...@@ -6560,7 +6674,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 161 "__id__": 164
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6598,7 +6712,7 @@ ...@@ -6598,7 +6712,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -6611,7 +6725,7 @@ ...@@ -6611,7 +6725,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 157 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6636,7 +6750,7 @@ ...@@ -6636,7 +6750,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -6649,24 +6763,24 @@ ...@@ -6649,24 +6763,24 @@
"_name": "layout_tryagain", "_name": "layout_tryagain",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 133 "__id__": 136
}, },
"_children": [ "_children": [
{ {
"__id__": 167 "__id__": 170
}, },
{ {
"__id__": 170 "__id__": 173
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 173 "__id__": 176
} }
], ],
"_prefab": { "_prefab": {
"__id__": 174 "__id__": 177
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -6720,17 +6834,17 @@ ...@@ -6720,17 +6834,17 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 166 "__id__": 169
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 168 "__id__": 171
} }
], ],
"_prefab": { "_prefab": {
"__id__": 169 "__id__": 172
}, },
"_opacity": 150, "_opacity": 150,
"_color": { "_color": {
...@@ -6784,7 +6898,7 @@ ...@@ -6784,7 +6898,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 167 "__id__": 170
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6814,7 +6928,7 @@ ...@@ -6814,7 +6928,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -6827,17 +6941,17 @@ ...@@ -6827,17 +6941,17 @@
"_name": "AniNode", "_name": "AniNode",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 166 "__id__": 169
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 171 "__id__": 174
} }
], ],
"_prefab": { "_prefab": {
"__id__": 172 "__id__": 175
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -6891,7 +7005,7 @@ ...@@ -6891,7 +7005,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 170 "__id__": 173
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6929,7 +7043,7 @@ ...@@ -6929,7 +7043,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -6942,7 +7056,7 @@ ...@@ -6942,7 +7056,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 166 "__id__": 169
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6967,7 +7081,7 @@ ...@@ -6967,7 +7081,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -6980,7 +7094,7 @@ ...@@ -6980,7 +7094,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 133 "__id__": 136
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -7007,7 +7121,7 @@ ...@@ -7007,7 +7121,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 133 "__id__": 136
}, },
"_enabled": true, "_enabled": true,
"_id": "f8RLolwXVG8YWO7i32J+zq" "_id": "f8RLolwXVG8YWO7i32J+zq"
...@@ -7015,7 +7129,7 @@ ...@@ -7015,7 +7129,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 133 "__id__": 136
}, },
"asset": { "asset": {
"__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc" "__uuid__": "b4ac88a3-938b-460f-841e-8f69789677bc"
...@@ -7031,14 +7145,14 @@ ...@@ -7031,14 +7145,14 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 179
},
{ {
"__id__": 182 "__id__": 182
}, },
{ {
"__id__": 185 "__id__": 185
},
{
"__id__": 188
} }
], ],
"_active": false, "_active": false,
...@@ -7096,11 +7210,11 @@ ...@@ -7096,11 +7210,11 @@
"_name": "font", "_name": "font",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 178 "__id__": 181
}, },
"_children": [ "_children": [
{ {
"__id__": 180 "__id__": 183
} }
], ],
"_active": true, "_active": true,
...@@ -7158,13 +7272,13 @@ ...@@ -7158,13 +7272,13 @@
"_name": "BRLNSDB", "_name": "BRLNSDB",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 179 "__id__": 182
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 181 "__id__": 184
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7220,7 +7334,7 @@ ...@@ -7220,7 +7334,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 180 "__id__": 183
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -7251,11 +7365,11 @@ ...@@ -7251,11 +7365,11 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 178 "__id__": 181
}, },
"_children": [ "_children": [
{ {
"__id__": 183 "__id__": 186
} }
], ],
"_active": true, "_active": true,
...@@ -7313,13 +7427,13 @@ ...@@ -7313,13 +7427,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 182 "__id__": 185
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 184 "__id__": 187
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7375,7 +7489,7 @@ ...@@ -7375,7 +7489,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 183 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -7403,11 +7517,11 @@ ...@@ -7403,11 +7517,11 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 178 "__id__": 181
}, },
"_children": [ "_children": [
{ {
"__id__": 186 "__id__": 189
} }
], ],
"_active": true, "_active": true,
...@@ -7465,13 +7579,13 @@ ...@@ -7465,13 +7579,13 @@
"_name": "btn", "_name": "btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 185 "__id__": 188
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 187 "__id__": 190
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7527,7 +7641,7 @@ ...@@ -7527,7 +7641,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 186 "__id__": 189
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
......
...@@ -33,6 +33,10 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -33,6 +33,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.initView(); this.initView();
this.initListener(); this.initListener();
this.initGame(); this.initGame();
pg.event.on('npc_voice_play_voice_end', () => {
this.startGame();
})
pg.event.emit('npc_layer_back_init', this.data)
} }
_cantouch = null; _cantouch = null;
...@@ -93,7 +97,8 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -93,7 +97,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
let nextLayer = this.createLittleLayer(); let nextLayer = this.createLittleLayer();
this.updateLayer(nextLayer, this.NextData) this.updateLayer(nextLayer, this.NextData)
this.layers.push(nextLayer) this.layers.push(nextLayer)
}
startGame() {
this.startPlay(); this.startPlay();
} }
startPlay() { startPlay() {
......
...@@ -3,6 +3,8 @@ export const defaultData = ...@@ -3,6 +3,8 @@ export const defaultData =
"recordFlag": false, "recordFlag": false,
"title": "test", "title": "test",
"audio_url": '', "audio_url": '',
npcTitle: "I show info",
npcAudio: "http://staging-teach.cdn.ireadabc.com/43839adb578c7e01456748b8a176a0c3_l.mp3",
"questionText": "", "questionText": "",
"questionTextAudio": "", "questionTextAudio": "",
"questions": [ "questions": [
......
...@@ -78,19 +78,18 @@ ...@@ -78,19 +78,18 @@
<div class="border-dashed" style="margin: 20px;width: 1000px;"> <div class="border-dashed" style="margin: 20px;width: 1000px;">
<span style="font-size: 20px;">标题: </span> <span style="font-size: 20px;">标题: </span>
<input type="text" nz-input [(ngModel)]="item.title" (blur)="save()"> <input type="text" nz-input [(ngModel)]="item.npcTitle" (blur)="save()">
<!-- <span style="font-size: 20px;">题目说明: </span> <span style="font-size: 20px;">npc音频: </span>
<input type="text" nz-input [(ngModel)]="item.questionText" (blur)="save()">
<span style="font-size: 20px;">题目说明音频: </span>
<div style="display:flex ;"> <div style="display:flex ;">
<div> <div>
<app-audio-recorder [audioUrl]="item.questionTextAudio" <app-audio-recorder [audioUrl]="item.npcAudio"
(audioUploaded)="onAudioUploadSuccess($event, 'questionTextAudio',item,'audioName')"></app-audio-recorder> (audioUploaded)="onAudioUploadSuccess($event, 'npcAudio',item,'npcAudioName')">
</app-audio-recorder>
</div> </div>
<div style="margin: 5px"> <div style="margin: 5px">
<span>{{ item.audioName}}</span> <span>{{ item.npcAudioName}}</span>
</div>
</div> </div>
</div> -->
</div> </div>
<div class="border-dashed" style="margin: 20px;width: 1000px;"> <div class="border-dashed" style="margin: 20px;width: 1000px;">
......
...@@ -13,7 +13,9 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O ...@@ -13,7 +13,9 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O
item = { item = {
recordFlag: false, recordFlag: false,
title: "", npcTitle: "",
npcAudio: "",
npcAudioName: '',
questionText: "", questionText: "",
questionTextAudio: "", questionTextAudio: "",
questions: [{ questions: [{
...@@ -26,6 +28,13 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O ...@@ -26,6 +28,13 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O
audioName: "" audioName: ""
}; };
init(): void {
if (!this.item.npcTitle) this.item.npcTitle = '';
if (!this.item.npcAudio) this.item.npcAudio = '';
if (!this.item.npcAudioName) this.item.npcAudioName = '';
console.log(new MetaFormCreator().create());
}
isVisible = false; isVisible = false;
deleteTitle = "是否删除题目"; deleteTitle = "是否删除题目";
deleteCallback = function () { }; deleteCallback = function () { };
...@@ -43,9 +52,6 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O ...@@ -43,9 +52,6 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O
} }
init(): void {
console.log(new MetaFormCreator().create());
}
removeoption(i, j) { removeoption(i, j) {
this.openDelete("确定删除选项?", () => { this.openDelete("确定删除选项?", () => {
......
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