Commit a4158b3d authored by Tt's avatar Tt

调整

parent 59ff78e9
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
"array": [ "array": [
0, 0,
14.835, 14.835,
374.2116752554217, 374.85187173202104,
0, 0,
0, 0,
0, 0,
...@@ -4166,8 +4166,8 @@ ...@@ -4166,8 +4166,8 @@
0, 0,
0, 0,
1, 1,
1, 1.2,
1, 1.2,
1 1
] ]
}, },
......
...@@ -425,7 +425,8 @@ cc.Class({ ...@@ -425,7 +425,8 @@ cc.Class({
pg.view.visible(end, true); pg.view.visible(end, true);
pg.view.visible(bg_tryagain, true); pg.view.visible(bg_tryagain, true);
pg.view.visible(btn_recording, false); pg.view.visible(btn_recording, false);
pg.view.visible(btn_record, true); let isFinal = GameManager.getIns().isFinalRound;
pg.view.visible(btn_record, !isFinal);
pg.view.visible(progress, false); pg.view.visible(progress, false);
this._playing = true; this._playing = true;
...@@ -600,17 +601,19 @@ cc.Class({ ...@@ -600,17 +601,19 @@ cc.Class({
let icon_ex_txt = pg.view.find(icon_ex, "txt"); let icon_ex_txt = pg.view.find(icon_ex, "txt");
let icon_hand = pg.view.find(this, "icon_hand"); let icon_hand = pg.view.find(this, "icon_hand");
let btn_picture = pg.view.find(this, "btn_picture"); let btn_picture = pg.view.find(this, "btn_picture");
pg.view.visible(btn_record, true); let isFinal = GameManager.getIns().isFinalRound;
pg.view.visible(btn_record, !isFinal);
// pg.view.visible(btn_record, true);
this.showRestartBtn(); this.showRestartBtn();
if (this._audio_record) { if (this._audio_record) {
this._playing = false; this._playing = false;
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('');
}) // })
} }
}); });
}, },
...@@ -818,7 +821,9 @@ cc.Class({ ...@@ -818,7 +821,9 @@ cc.Class({
let btn_replay = pg.view.find(this, "btn_replay") let btn_replay = pg.view.find(this, "btn_replay")
let btn_record = pg.view.find(this, "btn_record") let btn_record = pg.view.find(this, "btn_record")
this.showRestartBtn(); this.showRestartBtn();
pg.view.visible(btn_record, true); let isFinal = GameManager.getIns().isFinalRound;
pg.view.visible(btn_record, !isFinal);
// pg.view.visible(btn_record, true);
}, },
initStep3() { initStep3() {
......
...@@ -61,6 +61,9 @@ class GameManager { ...@@ -61,6 +61,9 @@ class GameManager {
this._stage++; this._stage++;
return this._stage >= this._list.length; return this._stage >= this._list.length;
} }
get isFinalRound() {
return this._stage + 1 >= this._list.length;
}
} }
export default GameManager; export default GameManager;
\ No newline at end of file
...@@ -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