代码暂存

egret/src/mainScene/MainScene.ts

@@ -2316,11 +2316,24 @@ export default class MainScene extends Scene {
      * 执行消除，应该是一个迭代，只要eliminatedElements有东西就一直执行
      * 掉落后的逻辑很复杂
      */
-    eliminate() {
+    eliminate(data:Array<{ineffect:boolean,addnum:number}>=null) {
+        var pcannostatArr:Array<{ineffect:boolean,addnum:number}>;
+        if(data){
+            pcannostatArr = data;
+        }else{
+            for(var p=0;p<this.cannoArr.length;p++){
+                var pcannodata = {
+                    ineffect:false,
+                    addnum:0,
+                }
+                pcannostatArr.push(pcannodata);
+            }
+        }
+
         //如果是是带组合特效的，组合时的特效本身的算分在effectCombination内，暂不计
         if (this.isManual) {
             this.isManual = false;
-            this.effectCombination()
+            this.effectCombination();
         } else {
             //先消除有旋转的消除完就置空
             this.rotateEliminate()
@@ -2665,7 +2678,8 @@ export default class MainScene extends Scene {
     /**
      * 特效元素的组合效果
      */
-    effectCombination() {
+    effectCombination(pcannostatArr:Array<{ineffect:boolean,addnum:number}>=null) {
+
         var one = this.eliminatedElements[0];
         var two = this.eliminatedElements[1];
         let lat1 = this.lattices[one];