Commit 143e72b8 authored by 范雪寒's avatar 范雪寒

Merge branch 'master' of http://vcs.ireadabc.com/template/op_09

parents a037c3f2 7825df5c
...@@ -379,7 +379,7 @@ cc.Class({ ...@@ -379,7 +379,7 @@ cc.Class({
coolCatSpeakStart(cb) { coolCatSpeakStart(cb) {
const cat = cc.find('Canvas/bg/catFrame/CoolCat'); const cat = cc.find('Canvas/bg/catFrame/CoolCat');
playDragonBoneAnimation(cat, 'begin', -1); playDragonBoneAnimation(cat, 'begin', -1);
this.playEffect('CoolCatBegin', () => { this.playAudioByUrl(this.data.startAudio, () => {
playDragonBoneAnimation(cat, 'normal', -1); playDragonBoneAnimation(cat, 'normal', -1);
cb(); cb();
}); });
...@@ -388,7 +388,7 @@ cc.Class({ ...@@ -388,7 +388,7 @@ cc.Class({
coolCatSpeakRight(cb) { coolCatSpeakRight(cb) {
const cat = cc.find('Canvas/bg/catFrame/CoolCat'); const cat = cc.find('Canvas/bg/catFrame/CoolCat');
playDragonBoneAnimation(cat, 'right', -1); playDragonBoneAnimation(cat, 'right', -1);
this.playAudioByUrl(this.data.startAudio, () => { this.playEffect('CoolCatRight', () => {
playDragonBoneAnimation(cat, 'normal', -1); playDragonBoneAnimation(cat, 'normal', -1);
cb(); cb();
}); });
...@@ -397,7 +397,7 @@ cc.Class({ ...@@ -397,7 +397,7 @@ cc.Class({
coolCatSpeakWrong(cb) { coolCatSpeakWrong(cb) {
const cat = cc.find('Canvas/bg/catFrame/CoolCat'); const cat = cc.find('Canvas/bg/catFrame/CoolCat');
playDragonBoneAnimation(cat, 'wrong', -1); playDragonBoneAnimation(cat, 'wrong', -1);
this.playAudioByUrl(this.data.endAudio, () => { this.playEffect('CoolCatWrong', () => {
playDragonBoneAnimation(cat, 'normal', -1); playDragonBoneAnimation(cat, 'normal', -1);
cb(); cb();
}); });
...@@ -406,10 +406,10 @@ cc.Class({ ...@@ -406,10 +406,10 @@ cc.Class({
coolCatSpeakEnd(cb) { coolCatSpeakEnd(cb) {
const cat = cc.find('Canvas/bg/catFrame/CoolCat'); const cat = cc.find('Canvas/bg/catFrame/CoolCat');
playDragonBoneAnimation(cat, 'finish', -1); playDragonBoneAnimation(cat, 'finish', -1);
this.playEffect('CoolCatFinish', () => { this.playAudioByUrl(this.data.endAudio, () => {
playDragonBoneAnimation(cat, 'normal', -1); playDragonBoneAnimation(cat, 'normal', -1);
cb();
}); });
cb();
}, },
......
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