Commit 268fb226 authored by yu's avatar yu

1

parent 858866de
...@@ -252,6 +252,7 @@ cc.Class({ ...@@ -252,6 +252,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");
let layout_long = pg.view.find(this, "card_group/layout_long"); let layout_long = pg.view.find(this, "card_group/layout_long");
let layout_short = pg.view.find(this, "card_group/layout_short");
pg.view.touchOn(btn_record, this.onTouchRecord, this);//注册按钮监听 pg.view.touchOn(btn_record, this.onTouchRecord, this);//注册按钮监听
pg.view.touchOn(btn_next, this.onTouchNext, this); pg.view.touchOn(btn_next, this.onTouchNext, this);
...@@ -261,6 +262,7 @@ cc.Class({ ...@@ -261,6 +262,7 @@ cc.Class({
pg.view.touchOn(btn_picture, this.onTouchPicture, this); pg.view.touchOn(btn_picture, this.onTouchPicture, this);
pg.view.touchOn(btn_carton, this.onTouchCarton, this); pg.view.touchOn(btn_carton, this.onTouchCarton, this);
pg.view.touchOn(icon_ex, this.onTouchWord, this); pg.view.touchOn(icon_ex, this.onTouchWord, this);
pg.view.touchOn(layout_short, this.onTouchWord, this);
pg.view.touchOn(layout_long, this.onTouchWord, this); pg.view.touchOn(layout_long, this.onTouchWord, this);
pg.view.touchOn(btn_mao, this.onTouchCat, this); pg.view.touchOn(btn_mao, this.onTouchCat, this);
}, },
...@@ -585,7 +587,7 @@ cc.Class({ ...@@ -585,7 +587,7 @@ cc.Class({
// }) // })
// pg.audio.playAudioByUrlCall(this._stageData.sound).then((id) => { // pg.audio.playAudioByUrlCall(this._stageData.sound).then((id) => {
audioFinished = true; audioFinished = true;
let time = cc.audioEngine.getDuration(id); // let time = cc.audioEngine.getDuration(id);
this.playCardAudio().then(() => { this.playCardAudio().then(() => {
if (aniFinished && audioFinished) { if (aniFinished && audioFinished) {
this._playing = false; this._playing = false;
......
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