猩猩功能暂存

egret/src/mainScene/MainScene.ts

@@ -2629,8 +2629,7 @@ export default class MainScene extends Scene {
         //     return;
         // }
         if(this.freepongoArr.length==1){//拍块
-            console.log("有猩猩需要消除");
-            // console.log("一只猩猩拍块");
+            console.log("一只猩猩拍块");
             // this.pongoPaiKuang(this.freepongoArr[0]);
             // var pongotl = this.freepongoArr.shift();
             // if(this.gopongoArr.indexOf(pongotl)==-1){
@@ -2639,7 +2638,6 @@ export default class MainScene extends Scene {
             for(var cp=0;cp<this.freepongoArr.length;cp++){
                 var cptl = this.freepongoArr[cp];
                 if(this.lattices[cptl]&&this.lattices[cptl].element&&this.lattices[cptl].element.inPongoPart=="tl"){
-                    console.log("播放猩猩消除特效");
                     var pongoele = this.lattices[cptl].element;
                     pongoele.mainScene = this;
                     pongoele.changePongoStat("body");
@@ -2662,7 +2660,7 @@ export default class MainScene extends Scene {
             return;
         }
         if(this.freepongoArr.length>1){//清场
-            console.log("有多只猩猩需要消除");
+            // console.log("多只猩猩清场",this.freepongoArr.length,JSON.stringify(this.freepongoArr));
             // this.pongoClearScene();
             // for(var fp=this.freepongoArr.length-1;fp>=0;fp--){
             //     var fptl = this.freepongoArr.splice(fp,1)[0];
@@ -2673,7 +2671,6 @@ export default class MainScene extends Scene {
             for(var cp=0;cp<this.freepongoArr.length;cp++){
                 var cptl = this.freepongoArr[cp];
                 if(this.lattices[cptl]&&this.lattices[cptl].element&&this.lattices[cptl].element.inPongoPart=="tl"){
-                    console.log("播放猩猩消除特效");
                     var pongoele = this.lattices[cptl].element;
                     pongoele.mainScene = this;
                     pongoele.changePongoStat("body");
@@ -3335,6 +3332,14 @@ export default class MainScene extends Scene {
                 var prccol = prcdata.col;
                 if(prcrow>=0&&prcrow<Tool.rowNum&&prccol>=0&&prccol<Tool.colNum){
                     this.checkPongoHVEle(prcrow,prccol,"hor");
+
+                    for(var np=0;np<pcannostatArr.length;np++){
+                        var npdata = pcannostatArr[np];
+                        var canaddhor = this.addCannoStatByHor(np,prcrow,prccol);
+                        if(canaddhor){
+                            npdata.ineffect = true;
+                        }
+                    }
                 }
             }
             for(var pc1=0;pc1<pongoc.length;pc1++){
@@ -3343,6 +3348,14 @@ export default class MainScene extends Scene {
                 var prccol = prcdata.col;
                 if(prcrow>=0&&prcrow<Tool.rowNum&&prccol>=0&&prccol<Tool.colNum){
                     this.checkPongoHVEle(prcrow,prccol,"vir");
+
+                    for(var np=0;np<pcannostatArr.length;np++){
+                        var npdata = pcannostatArr[np];
+                        var canaddver = this.addCannoStatByVer(np,prcrow,prccol);
+                        if(canaddver){
+                            npdata.ineffect = true;
+                        }
+                    }
                 }
             }
 
@@ -5101,18 +5114,29 @@ export default class MainScene extends Scene {
      * 猩猩的相关消除
      */
     clearPongoEle(pongoidx:number){
-        console.log("猩猩的相关消除");
         if(this.freepongoArr.length==1){
             this.pongoPaiKuang(this.freepongoArr[0]);
         }else if(this.freepongoArr.length>1){
             this.pongoClearScene();
         }
+        // if(this.gopongoArr.indexOf(pongoidx)==-1){
+        //     this.gopongoArr.push(pongoidx);
+        // }
+        // if(this.gopongoArr.length==this.freepongoArr.length){
+        //     console.log("猩猩开始消除",JSON.stringify(this.gopongoArr),JSON.stringify(this.freepongoArr))
+        //     this.gopongoArr = new Array();
+        //     this.freepongoArr = new Array();
+        // }
+    }
+    checkEliminatePongo(pongoidx:number){
         if(this.gopongoArr.indexOf(pongoidx)==-1){
             this.gopongoArr.push(pongoidx);
         }
         if(this.gopongoArr.length==this.freepongoArr.length){
+            // console.log("猩猩开始消除",JSON.stringify(this.gopongoArr),JSON.stringify(this.freepongoArr))
             this.gopongoArr = new Array();
             this.freepongoArr = new Array();
+            this.eliminate();
         }
     }
 }
\ No newline at end of file

egret/src/something/chapters/Chapter24.ts

@@ -47,8 +47,8 @@ export const Chapters24: ChapterData[] = [
          1, 1, 1, 1, 1, 2, 2, 2, 1,
          1, 1, 1, 1, 1, 2, 2, 1, 1,
          1, 4, 4, 1, 1, 2, 1, 2, 1,
-         23, 23, 23, 23, 1, 23, 23, 23, 23,
-         23, 23, 23, 23, 1, 23, 23, 23, 23 
+         23, 23, 23, 23, 1, 1, 1, 23, 23,
+         23, 23, 23, 23, 1, 1, 1, 23, 23 
       ], baseElements: [ 
          0, 0, 0, 0, 0, 0, 0, 0, 0,
          0, 0, 0, 0, 0, 0, 0, 0, 0,

egret/src/something/class/Element.ts

@@ -321,7 +321,7 @@ export class Element extends eui.Component {
         this.pongoMvend = 101;
 
         this.pongoMoveClip.addEventListener(egret.Event.ENTER_FRAME,this.pongoFrameAni,this);
-        egret.ticker.$startTick(this.update,this);
+        // egret.ticker.$startTick(this.update,this);
     }
     initPongoMvLeftJio(){
         var boxwidth = 80;
@@ -351,7 +351,7 @@ export class Element extends eui.Component {
     //调整猩猩显示
     changePongoStop(type:string){
         var curframe = this.pongoMoveClip.currentFrame;
-        console.log("当前猩猩cur"+curframe);
+        // console.log("当前猩猩cur"+curframe);
         if(type=="add"){
             curframe += 10;
         }else if(type=="cut"){
@@ -398,7 +398,7 @@ export class Element extends eui.Component {
         // }
         if(curframe==(this.pongoMvend-1)){
             if(this.ispongoMvloop){
-                console.log("重播猩猩");
+                // console.log("重播猩猩");
                 this.pongoMoveClip.gotoAndPlay(this.pongoMvstart,1);
             }else{
                 if((curframe==230||curframe==350)&&this.goFree){
@@ -419,7 +419,8 @@ export class Element extends eui.Component {
                             alpha:0.2
                         },600)
                         .call(()=>{
-                            this.mainScene.eliminate();
+                            // this.mainScene.eliminate();
+                            this.mainScene.checkEliminatePongo(this.index);
                         })
                     }
                 }
@@ -428,14 +429,12 @@ export class Element extends eui.Component {
     }
     //猩猩脚的动画
     pongoRmLeftJio(){
-        console.log("猩猩左脚动画播放完毕");
         this.pongoMvLeftJio.stop();
         if(this.pongoMvLeftJio.parent){
             this.pongoMvLeftJio.parent.removeChild(this.pongoMvLeftJio);
         }
     }
     pongoRmRightJio(){
-        console.log("猩猩右脚动画播放完毕");
         this.pongoMvRightJio.stop();
         if(this.pongoMvRightJio.parent){
             this.pongoMvRightJio.parent.removeChild(this.pongoMvRightJio);
@@ -536,7 +535,6 @@ export class Element extends eui.Component {
                 this.lessPart.push(part);
             }
         }
-        console.log("剩余显示",this.lessPart);
     }
     update(t:number){
         // if(this.pongoMoveClip&&this.pongoMoveClip.numChildren>10){
@@ -550,7 +548,6 @@ export class Element extends eui.Component {
     }
     addDisable(){
         if(this.inPongoPart&&this.inPongoPart=="tl"){
-            console.log("猩猩消除ticker");
             if(this.pongoMoveClip&&this.pongoMoveClip.parent){
                 this.pongoMoveClip.parent.removeChild(this.pongoMoveClip);
             }