Merge branch 'hotfix20200330_' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into hotfix20200330_

8a5ee75a · wildfirecode · e30311d9 · e5f98ab7 · 8a5ee75a · 8a5ee75a
Commit 8a5ee75a authored Mar 27, 2020 by wildfirecode
Expand all Show whitespace changes
Inline Side-by-side

Showing with 183 additions and 46 deletions

MainScene.ts egret/src/mainScene/MainScene.ts +181 -44

Element.ts egret/src/something/class/Element.ts +2 -2

No files found.
--- a/egret/src/mainScene/MainScene.ts
+++ b/egret/src/mainScene/MainScene.ts
--- a/egret/src/something/class/Element.ts
+++ b/egret/src/something/class/Element.ts
@@ -219,7 +219,7 @@ export class Element extends eui.Component {
    }
    changeShowCannoStat(){
        this.cannolab.text = this._cannoStat+"";
-        this.cannoMoveClip.gotoAndPlay(this.cannoStat[this._cannoStat]);
+        this.cannoMoveClip&&this.cannoMoveClip.gotoAndPlay(this.cannoStat[this._cannoStat]);
    }
    checkCannoStat(){
        if(this._cannoStat==3){
@@ -511,7 +511,7 @@ export class Element extends eui.Component {
    listenCn(){
        var statend = this.cannoStat[this._cannoStat+1];
        if(this.cannoMoveClip.currentFrame>=statend){
-            console.log("炮台阶段动画播放完毕",this.cannoMoveClip.currentFrame);
+            // console.log("炮台阶段动画播放完毕",this.cannoMoveClip.currentFrame);
            this.cannoMoveClip.stop();
        }
    }