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

egret/resource/TextureMerger/map.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png","../assets/map/map明日可领.png","../assets/map/map今日可领.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png","../assets/map/map明日可领.png","../assets/map/map今日可领.png","../assets/map/map刮现金红包.png","../assets/map/map大转盘.png"]}
\ No newline at end of file

egret/src/mainScene/MainScene.ts

@@ -409,8 +409,8 @@ export default class MainScene extends Scene {
             if (!recycles || !recycles.length) {
                 var endRowNumHash = {}, endRowNum: number = 0;;
                 for (var i = 0; i < this.chapterData.map.lattices.length; i++) {
-                    var lat = this.chapterData.map.lattices[i];
-                    if (!lat[i]) continue;
+                    var d = this.chapterData.map.lattices[i];
+                    if (!d) continue;
                     var rc = Tool.indexToRc(i);
                     const [row, col] = rc;
                     //不用考虑0
@@ -428,6 +428,7 @@ export default class MainScene extends Scene {
                     const { index, row } = endRowNumHash[key];
                     if (endRowNum == row) this.recycleIndexs.push(index)
                 }
+                console
             }
             //如果有数据，直接用数据，
             else {
@@ -1081,7 +1082,6 @@ export default class MainScene extends Scene {
     }
     /**
      * 竖直掉落,一格判断,,没有按竖直生成口从上到下，所以有点问题
-     * 逻辑要重写
      */
     private fallVertical() {
         var anis: FallAniData[] = []

egret/src/panels/ScratchPanel.ts

@@ -220,8 +220,8 @@ class ScratchItem extends eui.ItemRenderer {
                 if(!success) {
                     return;
                 }
-                let shareCode = res.data;   // 分享码
-                CFG.wxShareLink = window['h5URL'] + "&shareCode=" + shareCode; // 分享链接
+                let shareCode2 = res.data;   // 分享码
+                CFG.wxShareLink = window['h5URL'] + "&shareCode2=" + shareCode2; // 分享链接
                 CFG.wxShareTitle = '狮狮连萌超好玩~我已经玩到第一了！';
                 CFG.wxShareDesc = '我在萌狮消消乐等你来挑战哦';
                 CFG.wxShareImg = "http://yun.duiba.com.cn/db_games/xiaoxiaole2.jpg";
@@ -230,7 +230,7 @@ class ScratchItem extends eui.ItemRenderer {
                     window["invokeWX"]();
                 } else {//端内
                     this.data.wxShareTip.visible = false;
-                    window["inviteShare"](shareCode);
+                    window["inviteShare"](shareCode2);
                 }
             }, this.data.scratchTaskId);
         }, this);

egret/src/something/interface/MapData.ts

@@ -38,7 +38,7 @@ export interface MapData {
      */
     elements?: number[];
     /**
-     * 9*9的格子
+     * 9*9的格子，不修改写null或[]
      * 十位是基础元素类型，对应数字减1就是基础元素类型
      * 个位是特效类型（0表示无特效），对应数字减1就是特效类型
      * 10

egret/src/something/logic/AiControl.ts

@@ -33,7 +33,7 @@ export class AiControl {
      */
     private eggs: number[];
     /**
-     * 判断是否还有气泡，暂时不考虑气泡能再生
+     * 判断是否还有气泡，气泡能生成，没用了
      */
     private hasBubble: boolean;
     /**
@@ -52,7 +52,7 @@ export class AiControl {
      */
     init(lattices: Lattice[]) {
         this.hasJelly = judgeJellyExist(lattices);
-        this.hasBubble = judgeBubbleExist(lattices);
+        // this.hasBubble = judgeBubbleExist(lattices);
         this.hasHairball = judgeHairballExist(lattices);
         this.eggs = getEggs(lattices);
     }
@@ -227,11 +227,11 @@ export class AiControl {
      * @param callback 
      */
     bubbleMotion(thisObj: MainScene, callback: Function) {
-        //无气泡，直接回调
-        if (!this.hasBubble) {
-            callback();
-            return
-        }
+        //无气泡，直接回调，气泡能生成，不能直接判断
+        // if (!this.hasBubble) {
+        //     callback();
+        //     return
+        // }
         //找出所有的气泡，必须按顺序，从左到右，从上到下
         var indexs: number[] = [];
         for (var i = 0; i < thisObj.lattices.length; i++) {
@@ -244,7 +244,7 @@ export class AiControl {
         //没有气泡，直接回调，
         if (!indexs.length) {
             //标记无气泡
-            this.hasBubble = false;
+            // this.hasBubble = false;
             callback();
             return
         }
@@ -262,7 +262,7 @@ export class AiControl {
             ele.resetType(type);
             ele.visible = false;
             //变色动画
-            let bubbleAni: BubbleAni = Pool.takeOut(RecoverName.JELLYSPREAD_ANI)
+            let bubbleAni: BubbleAni = Pool.takeOut(RecoverName.BUBBLE_ANI)
             if (!bubbleAni) {
                 bubbleAni = new BubbleAni()
             }
@@ -270,7 +270,9 @@ export class AiControl {
             var p = Tool.getPositionByIndex(index);
             bubbleAni.x = p[0];
             bubbleAni.y = p[1];
-            thisObj.addChild(bubbleAni);
+            //估计得加在元素容器那一层，不然wonderfull等toast会被动画盖掉，
+            //其他也有问题的，考虑这方面，估计暂时就果冻和气泡，因为这俩动画在toast后面
+            thisObj.elementContainer.addChild(bubbleAni);
             //播放动画
             bubbleAni.play(fromType, type, () => {
                 //显示