Commit cd23ce87 authored by Tt's avatar Tt

52调整

parent 8fe2b528
...@@ -555,6 +555,7 @@ cc.Class({ ...@@ -555,6 +555,7 @@ cc.Class({
icon_ex.active = false; icon_ex.active = false;
pg.view.visible(pg.view.find(this, "card_group/slider"), false); pg.view.visible(pg.view.find(this, "card_group/slider"), false);
this.showCardLayout(); this.showCardLayout();
this.setMaoAni("begin");
if (jumpWait) { if (jumpWait) {
pg.view.visible(pg.view.find(this, "card_group/slider"), true); pg.view.visible(pg.view.find(this, "card_group/slider"), true);
// pg.view.visible(icon_ex, true); // pg.view.visible(icon_ex, true);
...@@ -572,6 +573,7 @@ cc.Class({ ...@@ -572,6 +573,7 @@ cc.Class({
audioFinished = true; audioFinished = true;
let time = cc.audioEngine.getDuration(id); let time = cc.audioEngine.getDuration(id);
this.showCardAction(time + 1).then(() => { this.showCardAction(time + 1).then(() => {
this.setMaoAni("normal");
this.showSliderAction(1).then(() => { this.showSliderAction(1).then(() => {
if (aniFinished && audioFinished) { if (aniFinished && audioFinished) {
this._playing = false; this._playing = false;
...@@ -598,6 +600,7 @@ cc.Class({ ...@@ -598,6 +600,7 @@ cc.Class({
audioFinished = true; audioFinished = true;
let time = cc.audioEngine.getDuration(id); let time = cc.audioEngine.getDuration(id);
this.showCardAction(time + 1).then(() => { this.showCardAction(time + 1).then(() => {
this.setMaoAni("normal");
this.showSliderAction(1).then(() => { this.showSliderAction(1).then(() => {
if (aniFinished && audioFinished) { if (aniFinished && audioFinished) {
this._playing = false; this._playing = false;
...@@ -636,10 +639,10 @@ cc.Class({ ...@@ -636,10 +639,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('');
}) // })
} }
}); });
}, },
...@@ -839,6 +842,11 @@ cc.Class({ ...@@ -839,6 +842,11 @@ cc.Class({
text.color = new cc.Color(nr, ng, nb); text.color = new cc.Color(nr, ng, nb);
}) })
}, },
setMaoAni(aniName) {
let mao_ske = cc.find("mao_ske", this.node);
let ske = mao_ske.getComponent(dragonBones.ArmatureDisplay).playAnimation(aniName);
},
//按钮触发,使用的方法 //按钮触发,使用的方法
onTouchRecord() { onTouchRecord() {
this.nextStage(); this.nextStage();
...@@ -948,6 +956,7 @@ cc.Class({ ...@@ -948,6 +956,7 @@ cc.Class({
if (isOver) { if (isOver) {
//执行总结束的内容 //执行总结束的内容
GameManager.getIns().setState(5); GameManager.getIns().setState(5);
this.setMaoAni("finish");
this.initLayout() this.initLayout()
} else { } else {
this.initSingleData();//刷新当前关卡所使用的的数据 this.initSingleData();//刷新当前关卡所使用的的数据
......
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