Commit 765aeedf authored by Tt's avatar Tt

部分bug修改

parent 531fc82d
This diff is collapsed.
...@@ -277,7 +277,7 @@ cc.Class({ ...@@ -277,7 +277,7 @@ cc.Class({
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_replay, false); this.hideRestartBtn();
pg.view.visible(btn_record, false); pg.view.visible(btn_record, false);
pg.view.visible(end, false);//不显示的内容用false pg.view.visible(end, false);//不显示的内容用false
pg.view.visible(end_success, false); pg.view.visible(end_success, false);
...@@ -328,7 +328,7 @@ cc.Class({ ...@@ -328,7 +328,7 @@ cc.Class({
pg.view.visible(btn_replay, false); this.hideRestartBtn();
pg.view.visible(btn_record, false); pg.view.visible(btn_record, false);
this.playPartAni() this.playPartAni()
this.playWordAni().then(() => { this.playWordAni().then(() => {
...@@ -364,7 +364,7 @@ cc.Class({ ...@@ -364,7 +364,7 @@ cc.Class({
pg.view.visible(icon_hand, false); pg.view.visible(icon_hand, false);
pg.view.visible(btn_record, false); pg.view.visible(btn_record, false);
pg.view.visible(btn_replay, false); this.hideRestartBtn();
pg.view.visible(btn_recording, true); pg.view.visible(btn_recording, true);
pg.view.visible(progress, true); pg.view.visible(progress, true);
}, },
...@@ -416,7 +416,10 @@ cc.Class({ ...@@ -416,7 +416,10 @@ cc.Class({
let btn_picture = pg.view.find(this, "btn_picture"); let btn_picture = pg.view.find(this, "btn_picture");
// 一局失败弹出tryagain,同时下方录音按钮明亮并出现提示 // 一局失败弹出tryagain,同时下方录音按钮明亮并出现提示
this.playSFX("audio_tryagain"); this.playSFX("audio_tryagain").then(() => {
pg.view.visible(bg_tryagain, false);
pg.view.visible(end, false);
})
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);
...@@ -510,7 +513,7 @@ cc.Class({ ...@@ -510,7 +513,7 @@ cc.Class({
dragonDisplay.playAnimation(this.animationName, 1);//animation所有的动画名称 dragonDisplay.playAnimation(this.animationName, 1);//animation所有的动画名称
}); });
}, },
playWordAni() { playWordAni(jumpWait) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let btn_replay = pg.view.find(this, "btn_replay") let btn_replay = pg.view.find(this, "btn_replay")
let btn_recording = pg.view.find(this, "btn_recording") let btn_recording = pg.view.find(this, "btn_recording")
...@@ -531,6 +534,26 @@ cc.Class({ ...@@ -531,6 +534,26 @@ cc.Class({
this._playing = true; this._playing = true;
icon_ex_txt.active = false; icon_ex_txt.active = false;
icon_ex.active = false; icon_ex.active = false;
if (jumpWait) {
pg.view.visible(icon_ex, true);
let icon_ex_word = this._stageData.word;
let aniFinished = false;
let audioFinished = false;
this.wordAni(icon_ex_txt, icon_ex_word).then(() => {
aniFinished = true;
if (aniFinished && audioFinished) {
this._playing = false;
resolve('');
}
})
pg.audio.playAudioByUrl(this._stageData.sound).then(() => {
audioFinished = true;
if (aniFinished && audioFinished) {
this._playing = false;
resolve('');
}
})
} else {
this._timeoutIds.push(setTimeout(() => { this._timeoutIds.push(setTimeout(() => {
pg.view.visible(icon_ex, true); pg.view.visible(icon_ex, true);
let icon_ex_word = this._stageData.word; let icon_ex_word = this._stageData.word;
...@@ -551,6 +574,7 @@ cc.Class({ ...@@ -551,6 +574,7 @@ cc.Class({
} }
}) })
}, 1000 * 2)); }, 1000 * 2));
}
}); });
}, },
playRecordAudio() { playRecordAudio() {
...@@ -573,7 +597,7 @@ cc.Class({ ...@@ -573,7 +597,7 @@ cc.Class({
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); pg.view.visible(btn_record, true);
pg.view.visible(btn_replay, true); this.showRestartBtn();
if (this._audio_record) { if (this._audio_record) {
this._playing = false; this._playing = false;
resolve(""); resolve("");
...@@ -653,7 +677,7 @@ cc.Class({ ...@@ -653,7 +677,7 @@ cc.Class({
"fluency": 60, "fluency": 60,
"rhythm": 90, "rhythm": 90,
"kernel_version": "5.2.4", "kernel_version": "5.2.4",
"overall": 75, "overall": 25,//75
"integrity": 100, "integrity": 100,
"duration": "6.779", "duration": "6.779",
"rear_tone": "fall", "rear_tone": "fall",
...@@ -670,6 +694,7 @@ cc.Class({ ...@@ -670,6 +694,7 @@ cc.Class({
}, },
recrodEnd(data) { recrodEnd(data) {
let score = data.result.overall; let score = data.result.overall;
score = (score / 100) * 40 + (100 - 40);
// score = 40; // score = 40;
if (score > 50) { if (score > 50) {
GameManager.getIns().setState(3); GameManager.getIns().setState(3);
...@@ -711,7 +736,7 @@ cc.Class({ ...@@ -711,7 +736,7 @@ cc.Class({
}, },
onTouchWord() { onTouchWord() {
if (this._playing) return; if (this._playing) return;
this.playWordAni(); this.playWordAni(true);
}, },
onTouchCat() { onTouchCat() {
if (this._playing) return; if (this._playing) return;
...@@ -745,7 +770,7 @@ cc.Class({ ...@@ -745,7 +770,7 @@ cc.Class({
let btn_record = pg.view.find(this, "btn_record") let btn_record = pg.view.find(this, "btn_record")
let btn_recording = pg.view.find(this, "btn_recording") let btn_recording = pg.view.find(this, "btn_recording")
let progress = pg.view.find(this, "progress") let progress = pg.view.find(this, "progress")
pg.view.visible(btn_replay, false);//隐藏 this.hideRestartBtn();//隐藏
pg.view.visible(btn_record, false); pg.view.visible(btn_record, false);
pg.view.visible(btn_recording, true);//显示 pg.view.visible(btn_recording, true);//显示
pg.view.visible(progress, true); pg.view.visible(progress, true);
...@@ -759,7 +784,7 @@ cc.Class({ ...@@ -759,7 +784,7 @@ cc.Class({
let end = pg.view.find(this, "end") let end = pg.view.find(this, "end")
let ant_ske = pg.view.find(this, "ant_ske") let ant_ske = pg.view.find(this, "ant_ske")
let ax_ske = pg.view.find(this, "ax_ske") let ax_ske = pg.view.find(this, "ax_ske")
pg.view.visible(btn_replay, false); this.hideRestartBtn();
pg.view.visible(btn_record, false); pg.view.visible(btn_record, false);
pg.view.visible(btn_recording, false); pg.view.visible(btn_recording, false);
pg.view.visible(progress, false); pg.view.visible(progress, false);
...@@ -773,10 +798,8 @@ cc.Class({ ...@@ -773,10 +798,8 @@ cc.Class({
initStep2() { initStep2() {
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")
pg.view.visible(btn_replay, true); this.showRestartBtn();
pg.view.visible(btn_record, true); pg.view.visible(btn_record, true);
}, },
initStep3() { initStep3() {
...@@ -792,7 +815,39 @@ cc.Class({ ...@@ -792,7 +815,39 @@ cc.Class({
//显示replay
showRestartBtn() {
const btn = cc.find('Canvas/btn_replay');
if (btn.canClick) {
return;
}
btn.active = true;
btn.canClick = true;
const circle = cc.find('Canvas/btn_replay/btn_restart_circle');
cc.tween(circle)
.set({ scale: 0.8, opacity: 255 })
.to(2, { scale: 1.2, opacity: 0 })
.union()
.repeatForever()
.start();
},
hideRestartBtn() {
console.log('hideRestartBtn');
const btn = cc.find('Canvas/btn_replay');
if (!btn.canClick) {
return;
}
btn.canClick = false;
btn.active = false;
const circle = cc.find('Canvas/btn_replay/btn_restart_circle');
circle.stopAllActions();
circle.scale = 0.8;
circle.opacity = 255;
},
// //
...@@ -814,8 +869,6 @@ cc.Class({ ...@@ -814,8 +869,6 @@ cc.Class({
this.createFireworkAni().then(() => { this.createFireworkAni().then(() => {
// 游戏结束时需要调用这个方法通知系统作业完成 // 游戏结束时需要调用这个方法通知系统作业完成
onHomeworkFinish(); onHomeworkFinish();
// pg.view.visible(this.btn_replay, true);
}) })
}, },
......
...@@ -20,6 +20,11 @@ class GameManager { ...@@ -20,6 +20,11 @@ class GameManager {
console.log(`init`); console.log(`init`);
} }
parseData(data) { parseData(data) {
this._list = [];
this._stage = 0;//关卡
this._state = 0;//状态
this._cat = {};
this._tryagain = {};
console.log(data); console.log(data);
this._cat = data.contentObj.picArr.cat; this._cat = data.contentObj.picArr.cat;
this._tryagain = data.contentObj.picArr.tryagain; this._tryagain = data.contentObj.picArr.tryagain;
......
{
"ver": "2.3.5",
"uuid": "5e1cc31e-9ab3-4cb1-b57c-c83e08e1c58d",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 262,
"height": 268,
"platformSettings": {},
"subMetas": {
"btn_restart": {
"ver": "1.0.4",
"uuid": "3f3258fc-f4c1-4862-bc12-6467ec15b5b3",
"rawTextureUuid": "5e1cc31e-9ab3-4cb1-b57c-c83e08e1c58d",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 262,
"height": 268,
"rawWidth": 262,
"rawHeight": 268,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "69bdf5db-fc29-42d1-bf66-c20cf0dbe674",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 409,
"height": 409,
"platformSettings": {},
"subMetas": {
"btn_restart_circle": {
"ver": "1.0.4",
"uuid": "b34babe1-0856-4403-9446-7b6e2bbe9f15",
"rawTextureUuid": "69bdf5db-fc29-42d1-bf66-c20cf0dbe674",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 409,
"height": 409,
"rawWidth": 409,
"rawHeight": 409,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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