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

egret/src/mainScene/MainScene.ts

@@ -1124,8 +1124,12 @@ export default class MainScene extends Scene {
                         lat.element = null
                     }
                 } else {
-                    //如果有格子。无元素，是生成口
-                    if (lat && !lat.element && lat.isGenerate) {
+                    //如果有格子。无元素，是生成口，且上方没有能掉落的格子时（若有，遍历上面格子时掉落）
+                    if (lat &&
+                        !lat.element &&
+                        lat.isGenerate &&
+                        !Tool.judgeFall(this.lattices[index - Tool.colNum])
+                    ) {
                         anis.push({ ele: null, indexs: [{ index: index, type: FallType.STRIGHT }] });
                         Tool.removeEle(index, this.emptys)
                     }
@@ -2476,10 +2480,10 @@ export default class MainScene extends Scene {
                     updateMainTimerAfterGetData();//submit之后再判断一次home,更新倒计时
                 });
                 const submitData = DataManager.ins.getData('hc_submit').data;
-                if(submitData.option) {
+                if (submitData.option) {
                     Loading2.instace.hide();
-                    PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL, { level: this.chapter,option:submitData.option });
-                } else{
+                    PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL, { level: this.chapter, option: submitData.option });
+                } else {
                     Loading2.instace.hide();
                     PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter });
                 }

egret/src/panels/TurntablePanel/Turntable.ts

@@ -56,6 +56,9 @@ export default class Turntable extends Panel {
 
     initEvents() {
         super.initEvents();
+        if(this.data.onceAgain) {     // 再抽一次
+            return;
+        }
         this["closeBtn"].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap_closeBtn, this);
         this.start_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapStart, this);
         this.rulebtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapRulebtn, this);

egret/src/something/chapters/Chapter3.ts

@@ -264,6 +264,22 @@ export const Chapters3: ChapterData[] = [
                 { index: 37, type: 0 },
                 { index: 38, type: 0 },
                 { index: 39, type: 0 },
+                
+                { index: 45, type: 0 },
+                { index: 46, type: 0 },
+                { index: 47, type: 0 },
+                { index: 48, type: 0 },
+                
+                { index: 54, type: 0 },
+                { index: 55, type: 0 },
+                { index: 56, type: 0 },
+                { index: 57, type: 0 },
+                
+                { index: 63, type: 0 },
+                { index: 64, type: 0 },
+                { index: 65, type: 0 },
+                { index: 66, type: 0 },
+
             ]
         }
     },

mock/config.js

@@ -46,7 +46,7 @@ const config = {
         data: './happyclear/openTreasureBox.json'
     },
     '/customActivity/happyclear/home': {
-        data: './happyclear/home.json'
+        data: './happyclear/homemax.json'
     },
     '/customActivity/happyclear/getLevelInfo': {
         data: './happyclear/getLevelInfo.json'