Commit 51e27ab6 authored by Tt's avatar Tt

调整业务

parent 64548efa
...@@ -1122,8 +1122,8 @@ ...@@ -1122,8 +1122,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1088, "width": 1138,
"height": 800 "height": 850
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1202,10 +1202,10 @@ ...@@ -1202,10 +1202,10 @@
"alignMode": 2, "alignMode": 2,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": 0, "_left": -50,
"_right": 0, "_right": -50,
"_top": 0, "_top": -50,
"_bottom": 0, "_bottom": -50,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -3577,7 +3577,7 @@ ...@@ -3577,7 +3577,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 100, "width": 100,
"height": 126 "height": 100.8
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3589,7 +3589,7 @@ ...@@ -3589,7 +3589,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
0, 6,
0, 0,
0, 0,
0, 0,
...@@ -3611,7 +3611,7 @@ ...@@ -3611,7 +3611,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "81nWvhKqxDM63sLzjAzGRE" "_id": "6cLgUYBX9LJJd5b0+qVtFz"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -3628,10 +3628,10 @@ ...@@ -3628,10 +3628,10 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "cba", "_string": "a",
"_N$string": "cba", "_N$string": "a",
"_fontSize": 100, "_fontSize": 80,
"_lineHeight": 100, "_lineHeight": 80,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "f0adf7cd-b2db-4a5a-87fe-4d818a6a6b89" "__uuid__": "f0adf7cd-b2db-4a5a-87fe-4d818a6a6b89"
...@@ -3646,7 +3646,7 @@ ...@@ -3646,7 +3646,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "3bvZXPpWZNOpwqBF3GukPA" "_id": "6ekY+F/EJFKJ+Pt51Af/UO"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -3695,7 +3695,7 @@ ...@@ -3695,7 +3695,7 @@
"__id__": 77 "__id__": 77
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 80 "__id__": 80
...@@ -3892,7 +3892,7 @@ ...@@ -3892,7 +3892,7 @@
1, 1,
1, 1,
1, 1,
1 0
] ]
}, },
"_eulerAngles": { "_eulerAngles": {
......
...@@ -566,10 +566,12 @@ cc.Class({ ...@@ -566,10 +566,12 @@ cc.Class({
audioFinished = true; audioFinished = true;
let time = cc.audioEngine.getDuration(id); let time = cc.audioEngine.getDuration(id);
this.showSliderAction(time).then(() => { this.showSliderAction(time).then(() => {
if (aniFinished && audioFinished) { pg.audio.playAudioByUrlCall(this._stageData.sound, () => {
this._playing = false; if (aniFinished && audioFinished) {
resolve(''); this._playing = false;
} resolve('');
}
})
}); });
}) })
} else { } else {
...@@ -590,10 +592,12 @@ cc.Class({ ...@@ -590,10 +592,12 @@ cc.Class({
audioFinished = true; audioFinished = true;
let time = cc.audioEngine.getDuration(id); let time = cc.audioEngine.getDuration(id);
this.showSliderAction(time).then(() => { this.showSliderAction(time).then(() => {
if (aniFinished && audioFinished) { pg.audio.playAudioByUrlCall(this._stageData.sound, () => {
this._playing = false; if (aniFinished && audioFinished) {
resolve(''); this._playing = false;
} resolve('');
}
});
}); });
}) })
}, 1000 * 2)); }, 1000 * 2));
...@@ -626,10 +630,10 @@ cc.Class({ ...@@ -626,10 +630,10 @@ cc.Class({
resolve(""); resolve("");
} else { } else {
this._audio_record = true; this._audio_record = true;
pg.audio.playAudioByUrl(this._cat.record).then(() => { // pg.audio.playAudioByUrl(this._cat.record).then(() => {
this._playing = false; this._playing = false;
resolve(''); resolve('');
}) // })
} }
}); });
}, },
...@@ -706,6 +710,8 @@ cc.Class({ ...@@ -706,6 +710,8 @@ cc.Class({
let card_group = cc.find("card_group", this.node); let card_group = cc.find("card_group", this.node);
let slider = cc.find("slider", card_group); let slider = cc.find("slider", card_group);
slider.action = true; slider.action = true;
let handle = cc.find("Handle", slider);
handle.active = true;
let sl = slider.getComponent(cc.Slider) let sl = slider.getComponent(cc.Slider)
sl.progress = 0; sl.progress = 0;
let t = time / 10; let t = time / 10;
...@@ -722,6 +728,10 @@ cc.Class({ ...@@ -722,6 +728,10 @@ cc.Class({
.to(t, { progress: 1 }).call(() => { .to(t, { progress: 1 }).call(() => {
this.setCardColor(sl.progress); this.setCardColor(sl.progress);
this.hideBox(); this.hideBox();
let handle = cc.find("Handle", slider);
handle.active = false;
})
.delay(0.5).call(() => {
return resolve("") return resolve("")
}) })
.start(); .start();
......
...@@ -69,7 +69,7 @@ export const defaultData = { ...@@ -69,7 +69,7 @@ export const defaultData = {
} }
], ],
"bgImg": "http://staging-teach.cdn.ireadabc.com/0600790c4336c3839d90756aca5da45e.png", "bgImg": "http://staging-teach.cdn.ireadabc.com/0600790c4336c3839d90756aca5da45e.png",
"wordAudio": "http://staging-teach.cdn.ireadabc.com/ab3538f7d4d57ac1abd740bd32f06b2d.mp3", "wordAudio": "http://staging-teach.cdn.ireadabc.com/aaeb274c49f400c26b05583d481aca09.mp3",
"imgAni": { "imgAni": {
"ske": { "ske": {
"url": "http://staging-teach.cdn.ireadabc.com/dd4ede22a761f1f8ec261c93a5306f5c.json", "url": "http://staging-teach.cdn.ireadabc.com/dd4ede22a761f1f8ec261c93a5306f5c.json",
......
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
(audioUploaded)="onAudioUploadSuccess($event, picArr.cat,'start')"> (audioUploaded)="onAudioUploadSuccess($event, picArr.cat,'start')">
</app-audio-recorder> </app-audio-recorder>
</div> </div>
<span>猫咪录音引导音频</span> <!-- <span>猫咪录音引导音频</span>
<div style="display: flex; justify-items: center; padding-top: 10px"> <div style="display: flex; justify-items: center; padding-top: 10px">
<app-audio-recorder [audioUrl]="picArr.cat.record" <app-audio-recorder [audioUrl]="picArr.cat.record"
(audioUploaded)="onAudioUploadSuccess($event, picArr.cat,'record')"> (audioUploaded)="onAudioUploadSuccess($event, picArr.cat,'record')">
</app-audio-recorder> </app-audio-recorder>
</div> </div> -->
<span>猫咪待机音频</span> <span>猫咪待机音频</span>
<div style="display: flex; justify-items: center; padding-top: 10px"> <div style="display: flex; justify-items: center; padding-top: 10px">
<app-audio-recorder [audioUrl]="picArr.cat.wait" <app-audio-recorder [audioUrl]="picArr.cat.wait"
......
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