l

egret/resource/TextureMerger/common.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/commmon_okbtn1.png","../assets/common/lightani.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["..\\assets\\common\\toast.png","..\\assets\\common\\closeCommonBtn.png","..\\assets\\common\\btn.png","..\\assets\\common\\alertbg.png","..\\assets\\common\\按钮 副本 4.png","..\\assets\\common\\按钮 副本 3.png","..\\assets\\common\\share_btn2.png","..\\assets\\common\\share_btn1.png","..\\assets\\common\\commmon_okbtn1.png","..\\assets\\common\\lightani.png"]}
\ No newline at end of file

egret/resource/TextureMerger/main.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main","version":5,"files":["../assets/mainScene/yezi1.png","../assets/mainScene/unlightedStar.png","../assets/mainScene/targetBoard.png","../assets/mainScene/stepsBoard.png","../assets/mainScene/stepNumber9.png","../assets/mainScene/stepNumber8.png","../assets/mainScene/stepNumber7.png","../assets/mainScene/stepNumber6.png","../assets/mainScene/stepNumber5.png","../assets/mainScene/stepNumber4.png","../assets/mainScene/stepNumber3.png","../assets/mainScene/stepNumber2.png","../assets/mainScene/stepNumber1.png","../assets/mainScene/stepNumber0.png","../assets/mainScene/stepBtn.png","../assets/mainScene/starProgress.png","../assets/mainScene/setting.png","../assets/mainScene/scoreNumber9.png","../assets/mainScene/scoreNumber8.png","../assets/mainScene/scoreNumber7.png","../assets/mainScene/scoreNumber6.png","../assets/mainScene/scoreNumber5.png","../assets/mainScene/scoreNumber4.png","../assets/mainScene/scoreNumber3.png","../assets/mainScene/scoreNumber2.png","../assets/mainScene/scoreNumber1.png","../assets/mainScene/scoreNumber0.png","../assets/mainScene/rock6.png","../assets/mainScene/rock5.png","../assets/mainScene/rock4.png","../assets/mainScene/rock3.png","../assets/mainScene/rock2.png","../assets/mainScene/rock1.png","../assets/mainScene/rightMark.png","../assets/mainScene/rightArrow.png","../assets/mainScene/rectLat.png","../assets/mainScene/progressDown.png","../assets/mainScene/playSceneBg.png","../assets/mainScene/magicLionBg.png","../assets/mainScene/magicLion.png","../assets/mainScene/lockUp.png","../assets/mainScene/lockDown.png","../assets/mainScene/lineLight.png","../assets/mainScene/lightedStar.png","../assets/mainScene/leftArrow.png","../assets/mainScene/ice6.png","../assets/mainScene/ice5.png","../assets/mainScene/ice4.png","../assets/mainScene/ice3.png","../assets/mainScene/ice2.png","../assets/mainScene/ice1.png","../assets/mainScene/hammerBtn.png","../assets/mainScene/eleDis9.png","../assets/mainScene/eleDis8.png","../assets/mainScene/eleDis7.png","../assets/mainScene/eleDis6.png","../assets/mainScene/eleDis5.png","../assets/mainScene/eleDis4.png","../assets/mainScene/eleDis3.png","../assets/mainScene/eleDis2.png","../assets/mainScene/eleDis12.png","../assets/mainScene/eleDis11.png","../assets/mainScene/eleDis10.png","../assets/mainScene/eleDis1.png","../assets/mainScene/ele5.png","../assets/mainScene/ele42.png","../assets/mainScene/ele41.png","../assets/mainScene/ele40.png","../assets/mainScene/ele4.png","../assets/mainScene/ele32.png","../assets/mainScene/ele31.png","../assets/mainScene/ele30.png","../assets/mainScene/ele3.png","../assets/mainScene/ele22.png","../assets/mainScene/ele21.png","../assets/mainScene/ele20.png","../assets/mainScene/ele2.png","../assets/mainScene/ele12.png","../assets/mainScene/ele11.png","../assets/mainScene/ele10.png","../assets/mainScene/ele1.png","../assets/mainScene/ele02.png","../assets/mainScene/ele01.png","../assets/mainScene/ele00.png","../assets/mainScene/ele0.png","../assets/mainScene/dangqianfenshu.png","../assets/mainScene/chooseRect.png","../assets/mainScene/boomBtn.png","../assets/mainScene/boom9.png","../assets/mainScene/boom8.png","../assets/mainScene/boom7.png","../assets/mainScene/boom6.png","../assets/mainScene/boom5.png","../assets/mainScene/boom4.png","../assets/mainScene/boom3.png","../assets/mainScene/boom2.png","../assets/mainScene/boom18.png","../assets/mainScene/boom17.png","../assets/mainScene/boom16.png","../assets/mainScene/boom15.png","../assets/mainScene/boom14.png","../assets/mainScene/boom13.png","../assets/mainScene/boom12.png","../assets/mainScene/boom11.png","../assets/mainScene/boom10.png","../assets/mainScene/boom1.png","../assets/mainScene/mainSoundBtnOn.png","../assets/mainScene/mainSettingBg.png","../assets/mainScene/mainQuestionBtn.png","../assets/mainScene/mainMusicBtnOn.png","../assets/mainScene/mainQuitBtn.png","../assets/mainScene/mainSoundBtnOff.png","../assets/mainScene/mainMusicBtnOff.png","../assets/mainScene/targetNumber9.png","../assets/mainScene/targetNumber8.png","../assets/mainScene/targetNumber7.png","../assets/mainScene/targetNumber6.png","../assets/mainScene/targetNumber5.png","../assets/mainScene/targetNumber4.png","../assets/mainScene/targetNumber3.png","../assets/mainScene/targetNumber2.png","../assets/mainScene/targetNumber1.png","../assets/mainScene/targetNumber0.png","../assets/mainScene/ele7.png","../assets/mainScene/ele6.png","../assets/mainScene/bonusFra9.png","../assets/mainScene/bonusFra8.png","../assets/mainScene/bonusFra7.png","../assets/mainScene/bonusFra6.png","../assets/mainScene/bonusFra5.png","../assets/mainScene/bonusFra4.png","../assets/mainScene/bonusFra3.png","../assets/mainScene/bonusFra27.png","../assets/mainScene/bonusFra26.png","../assets/mainScene/bonusFra25.png","../assets/mainScene/bonusFra24.png","../assets/mainScene/bonusFra23.png","../assets/mainScene/bonusFra22.png","../assets/mainScene/bonusFra21.png","../assets/mainScene/bonusFra20.png","../assets/mainScene/bonusFra2.png","../assets/mainScene/bonusFra19.png","../assets/mainScene/bonusFra18.png","../assets/mainScene/bonusFra17.png","../assets/mainScene/bonusFra16.png","../assets/mainScene/bonusFra15.png","../assets/mainScene/bonusFra14.png","../assets/mainScene/bonusFra13.png","../assets/mainScene/bonusFra12.png","../assets/mainScene/bonusFra11.png","../assets/mainScene/bonusFra10.png","../assets/mainScene/bonusFra1.png","../assets/mainScene/bonusShoot.png","../assets/mainScene/guideTxt5.png","../assets/mainScene/guideTxt4.png","../assets/mainScene/guideTxt3.png","../assets/mainScene/guideTxt2.png","../assets/mainScene/guideTxt1.png","../assets/mainScene/guideKnowBtn.png","../assets/mainScene/guideBg.png","../assets/mainScene/propNum9.png","../assets/mainScene/propNum8.png","../assets/mainScene/propNum7.png","../assets/mainScene/propNum6.png","../assets/mainScene/propNum5.png","../assets/mainScene/propNum4.png","../assets/mainScene/propNum3.png","../assets/mainScene/propNum2.png","../assets/mainScene/propNum1.png","../assets/mainScene/propNum0.png","../assets/mainScene/propNumBg.png","../assets/mainScene/bonusTime.png","../assets/mainScene/eleDis19.png","../assets/mainScene/eleDis18.png","../assets/mainScene/eleDis17.png","../assets/mainScene/eleDis16.png","../assets/mainScene/eleDis15.png","../assets/mainScene/eleDis14.png","../assets/mainScene/eleDis13.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main","version":5,"files":["..\\assets\\mainScene\\yezi1.png","..\\assets\\mainScene\\unlightedStar.png","..\\assets\\mainScene\\targetBoard.png","..\\assets\\mainScene\\stepsBoard.png","..\\assets\\mainScene\\stepNumber9.png","..\\assets\\mainScene\\stepNumber8.png","..\\assets\\mainScene\\stepNumber7.png","..\\assets\\mainScene\\stepNumber6.png","..\\assets\\mainScene\\stepNumber5.png","..\\assets\\mainScene\\stepNumber4.png","..\\assets\\mainScene\\stepNumber3.png","..\\assets\\mainScene\\stepNumber2.png","..\\assets\\mainScene\\stepNumber1.png","..\\assets\\mainScene\\stepNumber0.png","..\\assets\\mainScene\\stepBtn.png","..\\assets\\mainScene\\starProgress.png","..\\assets\\mainScene\\setting.png","..\\assets\\mainScene\\scoreNumber9.png","..\\assets\\mainScene\\scoreNumber8.png","..\\assets\\mainScene\\scoreNumber7.png","..\\assets\\mainScene\\scoreNumber6.png","..\\assets\\mainScene\\scoreNumber5.png","..\\assets\\mainScene\\scoreNumber4.png","..\\assets\\mainScene\\scoreNumber3.png","..\\assets\\mainScene\\scoreNumber2.png","..\\assets\\mainScene\\scoreNumber1.png","..\\assets\\mainScene\\scoreNumber0.png","..\\assets\\mainScene\\rock6.png","..\\assets\\mainScene\\rock5.png","..\\assets\\mainScene\\rock4.png","..\\assets\\mainScene\\rock3.png","..\\assets\\mainScene\\rock2.png","..\\assets\\mainScene\\rock1.png","..\\assets\\mainScene\\rightMark.png","..\\assets\\mainScene\\rightArrow.png","..\\assets\\mainScene\\rectLat.png","..\\assets\\mainScene\\progressDown.png","..\\assets\\mainScene\\playSceneBg.png","..\\assets\\mainScene\\magicLionBg.png","..\\assets\\mainScene\\magicLion.png","..\\assets\\mainScene\\lockUp.png","..\\assets\\mainScene\\lockDown.png","..\\assets\\mainScene\\lineLight.png","..\\assets\\mainScene\\lightedStar.png","..\\assets\\mainScene\\leftArrow.png","..\\assets\\mainScene\\ice6.png","..\\assets\\mainScene\\ice5.png","..\\assets\\mainScene\\ice4.png","..\\assets\\mainScene\\ice3.png","..\\assets\\mainScene\\ice2.png","..\\assets\\mainScene\\ice1.png","..\\assets\\mainScene\\hammerBtn.png","..\\assets\\mainScene\\eleDis9.png","..\\assets\\mainScene\\eleDis8.png","..\\assets\\mainScene\\eleDis7.png","..\\assets\\mainScene\\eleDis6.png","..\\assets\\mainScene\\eleDis5.png","..\\assets\\mainScene\\eleDis4.png","..\\assets\\mainScene\\eleDis3.png","..\\assets\\mainScene\\eleDis2.png","..\\assets\\mainScene\\eleDis12.png","..\\assets\\mainScene\\eleDis11.png","..\\assets\\mainScene\\eleDis10.png","..\\assets\\mainScene\\eleDis1.png","..\\assets\\mainScene\\ele5.png","..\\assets\\mainScene\\ele42.png","..\\assets\\mainScene\\ele41.png","..\\assets\\mainScene\\ele40.png","..\\assets\\mainScene\\ele4.png","..\\assets\\mainScene\\ele32.png","..\\assets\\mainScene\\ele31.png","..\\assets\\mainScene\\ele30.png","..\\assets\\mainScene\\ele3.png","..\\assets\\mainScene\\ele22.png","..\\assets\\mainScene\\ele21.png","..\\assets\\mainScene\\ele20.png","..\\assets\\mainScene\\ele2.png","..\\assets\\mainScene\\ele12.png","..\\assets\\mainScene\\ele11.png","..\\assets\\mainScene\\ele10.png","..\\assets\\mainScene\\ele1.png","..\\assets\\mainScene\\ele02.png","..\\assets\\mainScene\\ele01.png","..\\assets\\mainScene\\ele00.png","..\\assets\\mainScene\\ele0.png","..\\assets\\mainScene\\dangqianfenshu.png","..\\assets\\mainScene\\chooseRect.png","..\\assets\\mainScene\\boomBtn.png","..\\assets\\mainScene\\boom9.png","..\\assets\\mainScene\\boom8.png","..\\assets\\mainScene\\boom7.png","..\\assets\\mainScene\\boom6.png","..\\assets\\mainScene\\boom5.png","..\\assets\\mainScene\\boom4.png","..\\assets\\mainScene\\boom3.png","..\\assets\\mainScene\\boom2.png","..\\assets\\mainScene\\boom18.png","..\\assets\\mainScene\\boom17.png","..\\assets\\mainScene\\boom16.png","..\\assets\\mainScene\\boom15.png","..\\assets\\mainScene\\boom14.png","..\\assets\\mainScene\\boom13.png","..\\assets\\mainScene\\boom12.png","..\\assets\\mainScene\\boom11.png","..\\assets\\mainScene\\boom10.png","..\\assets\\mainScene\\boom1.png","..\\assets\\mainScene\\mainSoundBtnOn.png","..\\assets\\mainScene\\mainSettingBg.png","..\\assets\\mainScene\\mainQuestionBtn.png","..\\assets\\mainScene\\mainMusicBtnOn.png","..\\assets\\mainScene\\mainQuitBtn.png","..\\assets\\mainScene\\mainSoundBtnOff.png","..\\assets\\mainScene\\mainMusicBtnOff.png","..\\assets\\mainScene\\targetNumber9.png","..\\assets\\mainScene\\targetNumber8.png","..\\assets\\mainScene\\targetNumber7.png","..\\assets\\mainScene\\targetNumber6.png","..\\assets\\mainScene\\targetNumber5.png","..\\assets\\mainScene\\targetNumber4.png","..\\assets\\mainScene\\targetNumber3.png","..\\assets\\mainScene\\targetNumber2.png","..\\assets\\mainScene\\targetNumber1.png","..\\assets\\mainScene\\targetNumber0.png","..\\assets\\mainScene\\ele7.png","..\\assets\\mainScene\\ele6.png","..\\assets\\mainScene\\bonusFra9.png","..\\assets\\mainScene\\bonusFra8.png","..\\assets\\mainScene\\bonusFra7.png","..\\assets\\mainScene\\bonusFra6.png","..\\assets\\mainScene\\bonusFra5.png","..\\assets\\mainScene\\bonusFra4.png","..\\assets\\mainScene\\bonusFra3.png","..\\assets\\mainScene\\bonusFra27.png","..\\assets\\mainScene\\bonusFra26.png","..\\assets\\mainScene\\bonusFra25.png","..\\assets\\mainScene\\bonusFra24.png","..\\assets\\mainScene\\bonusFra23.png","..\\assets\\mainScene\\bonusFra22.png","..\\assets\\mainScene\\bonusFra21.png","..\\assets\\mainScene\\bonusFra20.png","..\\assets\\mainScene\\bonusFra2.png","..\\assets\\mainScene\\bonusFra19.png","..\\assets\\mainScene\\bonusFra18.png","..\\assets\\mainScene\\bonusFra17.png","..\\assets\\mainScene\\bonusFra16.png","..\\assets\\mainScene\\bonusFra15.png","..\\assets\\mainScene\\bonusFra14.png","..\\assets\\mainScene\\bonusFra13.png","..\\assets\\mainScene\\bonusFra12.png","..\\assets\\mainScene\\bonusFra11.png","..\\assets\\mainScene\\bonusFra10.png","..\\assets\\mainScene\\bonusFra1.png","..\\assets\\mainScene\\bonusShoot.png","..\\assets\\mainScene\\guideTxt5.png","..\\assets\\mainScene\\guideTxt4.png","..\\assets\\mainScene\\guideTxt3.png","..\\assets\\mainScene\\guideTxt2.png","..\\assets\\mainScene\\guideTxt1.png","..\\assets\\mainScene\\guideKnowBtn.png","..\\assets\\mainScene\\guideBg.png","..\\assets\\mainScene\\propNum9.png","..\\assets\\mainScene\\propNum8.png","..\\assets\\mainScene\\propNum7.png","..\\assets\\mainScene\\propNum6.png","..\\assets\\mainScene\\propNum5.png","..\\assets\\mainScene\\propNum4.png","..\\assets\\mainScene\\propNum3.png","..\\assets\\mainScene\\propNum2.png","..\\assets\\mainScene\\propNum1.png","..\\assets\\mainScene\\propNum0.png","..\\assets\\mainScene\\propNumBg.png","..\\assets\\mainScene\\bonusTime.png","..\\assets\\mainScene\\eleDis19.png","..\\assets\\mainScene\\eleDis18.png","..\\assets\\mainScene\\eleDis17.png","..\\assets\\mainScene\\eleDis16.png","..\\assets\\mainScene\\eleDis15.png","..\\assets\\mainScene\\eleDis14.png","..\\assets\\mainScene\\eleDis13.png"]}
\ No newline at end of file

egret/src/mainScene/MainScene.ts

@@ -1018,13 +1018,10 @@ export default class MainScene extends Scene {
      * @param callback 所有fall完成后的回调,检查三消，
      */
     fall(callback: Function) {
-        //记录一个对象和位置信息[obj,index]的数组，如果obj是null则生成，index位置上方
-        // var anis = [];
-        //排序从小到大
-        // emptys.sort(function (a, b) { return a > b ? 1 : -1 })
-        //先找完竖直的，
+        //去重一次
+        Tool.removeReapty(this.emptys);
+        //注释里的备用
         var anis = this.fallVertical();
-        //然后找斜落得
         anis = anis.concat(this.fallSkew());
         if (!anis.length) {
             //如果没有能掉落的就直接回调
@@ -1079,55 +1076,6 @@ export default class MainScene extends Scene {
         }
         return anis;
     }
-    private fallVertical1() {
-        var verticalAnis = []
-        //先把竖直的掉落完，掉满后
-        for (var m = 0; m < Tool.colNum; m++) {
-            //同一列
-            for (var n = Tool.rowNum - 1; n >= 0; n--) {
-                var index = Tool.rcToIndex(n, m);
-                let lat = this.lattices[index];
-                if (Tool.judgeFall(lat)) {
-                    var emptyIndex = Tool.findBottom(lat, this.emptys, this.lattices)
-                    if (emptyIndex != null) {
-                        verticalAnis.push([lat.element, this.emptys[emptyIndex]]);
-                        //去掉一个
-                        this.emptys.splice(emptyIndex, 1);
-                        //加上一个
-                        this.emptys.push(index);
-                        lat.element = null
-                    }
-                    //找最下面的那个空格
-                    var latDown, indexDown;
-                    if (lat.down != null) {
-                        latDown = this.lattices[lat.down];
-                        indexDown = lat.down;
-                    } else {
-                        latDown = this.lattices[index + Tool.colNum]
-                        indexDown = index + Tool.colNum;
-                    }
-                    //下方有格子，并且再this.empty中
-                    var emptyIndex = this.emptys.indexOf(indexDown)
-                    if (emptyIndex > -1) {
-
-                        verticalAnis.push([lat.element, indexDown]);
-                        //去掉一个
-                        this.emptys.splice(emptyIndex, 1);
-                        //加上一个
-                        this.emptys.push(index);
-                        lat.element = null
-                    }
-                } else {
-                    //如果有格子。无元素，是生成口
-                    if (lat && !lat.element && lat.isGenerate) {
-                        verticalAnis.push([null, index]);
-                        Tool.removeEle(index, this.emptys)
-                    }
-                }
-            }
-        }
-        return verticalAnis;
-    }
 
     private fallSkew() {
         //记录一个对象和位置信息[obj,index]的数组，如果obj是null则生成，index位置上方
@@ -1240,7 +1188,7 @@ export default class MainScene extends Scene {
             obj.fallAni()
             //执行Tween
             egret.Tween.get(obj)
-                .to({ x: position[0], y: position[1] }, 180/*, egret.Ease.cubicOut*/)
+                .to({ x: position[0], y: position[1] }, 100/*, egret.Ease.cubicOut*/)
                 .call(() => {
                     obj.x = position[0];
                     obj.y = position[1];
@@ -1263,7 +1211,6 @@ export default class MainScene extends Scene {
         }
 
     }
-
     /**
      * 只关心交换后元素的可消除
      * 或者冰淇淋的掉落

egret/src/something/Tool.ts

@@ -4,6 +4,8 @@ import { Lattice } from "./class/Lattice";
 import { ElementType } from "./enum/ElementType";
 import { PassType } from "./enum/PassType";
 import { EffectType } from "./enum/EffectType";
+import { Pool } from "./Pool";
+import { RecoverName } from "./enum/RecoverName";
 
 export class Tool {
     public static rowNum = 9;
@@ -585,6 +587,34 @@ export class Tool {
         return e && "number" == typeof e.length && e.length ? e[Math.floor(Math.random() * e.length)] : ("number" != typeof n && (n = e || 1, e = 0), e + Math.random() * (n - e))
     }
 
+    /**
+     * 数字数组去重
+     */
+    public static removeReapty(arr: number[]) {
+        var obj = {};
+        for (var i = arr.length - 1; i >= 0; i--) {
+            if (obj[arr[i]]) {
+                //有出现的的，去掉
+                arr.splice(i, 1)
+            } else {
+                obj[arr[i]] = true
+            }
+        }
+    }
+    /**
+     * 获得元素
+     * @param type 
+     */
+    public static getElement(type: ElementType) {
+        let obj = Pool.takeOut(RecoverName.ELEMENT);
+        if (!obj) {
+            obj = new Element(type)
+        } else {
+            obj.reset(type)
+        }
+        return obj
+    }
+
     /**
      * 返回个十百等，0是个位
      * 78[ 8, 7]