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

egret/libs/new_wx/components/Toast2.ts

@@ -12,7 +12,7 @@ export default class Toast2 extends ComponentBase {
     toastLabel:eui.Label;
     start() {
         this.touchEnabled=false;
-        this.touchChildren=false;
+        // this.touchChildren=false;
         this.toastLabel.textFlow  =  (new HtmlTextParser).parser('<u>继续闯关赢好礼</u>');
         this.toastLabel.addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{
             if(SceneCtrl.instance.currentScene instanceof MainScene){

egret/resource/skins/FailSkin.exml

@@ -18,4 +18,5 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
+	<e:Label text="闯关成功即可获得现金券、\n游戏道具等更多好礼哦~" y="477.24" anchorOffsetX="0" width="578.54" anchorOffsetY="0" height="81.52" horizontalCenter="0" textAlign="center" verticalAlign="middle" textColor="0xf54501" size="25" lineSpacing="15"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/MapSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="MapSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Rect id="rectbg" width="750" height="1206" visible="false"/>
+	<e:Rect id="rectbg" width="750" height="1206"/>
 	<e:Scroller id="scroll" width="750" height="1624" x="0" y="0" scrollPolicyH="off" scrollPolicyV="on" locked="true">
 		<e:Group id="scrollGroup">
 		</e:Group>

egret/src/mainScene/MainScene.ts

@@ -387,7 +387,7 @@ export default class MainScene extends Scene {
         this.propBtnCon.hammerBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_hammerBtn, this)
         this.propBtnCon.stepBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_stepBtn, this)
         //初始化道具信息 
-        this.updatePropNum();
+        this.updateScene();
         //选择框 无需加入场景
         var textureChoosed: egret.Texture = RES.getRes("chooseRect_png")
         this.choosed = new eui.Image(textureChoosed);
@@ -753,7 +753,7 @@ export default class MainScene extends Scene {
     /**
      * 更新三个道具
      */
-    updatePropNum() {
+    updateScene() {
         this.propBtnCon.boomBtn.propNumShow.count = getPropNums(PropType.BOOM);
         this.propBtnCon.hammerBtn.propNumShow.count = getPropNums(PropType.HAMMER);
         this.propBtnCon.stepBtn.propNumShow.count = getPropNums(PropType.CHANCE_NUM);
@@ -1020,7 +1020,7 @@ export default class MainScene extends Scene {
                 //如果有返回数据，没有说明是网络问题，不发home
                 //更新道具数量
                 NetManager.ins.hc_home(() => {
-                    this.updatePropNum();
+                    this.updateScene();
                 }, window['collectRuleId']);
             }
         }, prop)

egret/src/mapScene/MapScene.ts

@@ -295,7 +295,20 @@ export default class MapScene extends Scene {
 
     onAllPanelHide = () => {
         if(!localStorage.getItem('activityguide')) {
+            NetManager.ins.hbRainBaseInfo((success, res) => {
+                if(!success) {
+                    if(res.code == "600054" || res.code == "600055") {
+                        this['guide'].visible = false;
+                    }
+                    return;
+                }
+                const data = res.data;
+                if(!data.currentSession && !data.nextSession) {
+                    this['guide'].visible = false;
+                    return;
+                }
                 this['guide'].visible = true;
+            });
         }
     }
 

egret/src/panels/Buy1Panel.ts

@@ -8,6 +8,7 @@ import setGlow from "../setGlow";
 import getHomeData from "../getHomeData";
 import { showToast2 } from "../../libs/new_wx/ctrls/toastCtrl2";
 import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
+import MainScene from "../mainScene/MainScene";
 
 export default class Buy1Panel extends Panel {
     buyBtn: eui.Button
@@ -39,7 +40,12 @@ export default class Buy1Panel extends Panel {
             this.buyBtn.enabled = true;
             if (success) {
                 this.hidePanel();
+                if(SceneCtrl.instance.currentScene instanceof MainScene){
+                    showToast('兑换成功');
+                }else {
                     showToast2();
+                }
+                
                 NetManager.ins.hc_home(() => {
                     SceneCtrl.instance.updateScene();
                 }, window['collectRuleId']);

egret/src/panels/Buy2Panel.ts

@@ -8,6 +8,7 @@ import setGlow from "../setGlow";
 import getHomeData from "../getHomeData";
 import { showToast2 } from "../../libs/new_wx/ctrls/toastCtrl2";
 import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
+import MainScene from "../mainScene/MainScene";
 
 export default class Buy2Panel extends Panel {
     onTouchTap_closeBtn(){
@@ -33,7 +34,11 @@ export default class Buy2Panel extends Panel {
         NetManager.ins.hc_exchange((success) => {
             this.buyBtn.enabled = true;
             if (success) {
+                if(SceneCtrl.instance.currentScene instanceof MainScene){
+                    showToast('兑换成功');
+                }else {
                     showToast2();
+                }
                 this.hidePanel();
                 NetManager.ins.hc_home(() => {
                     SceneCtrl.instance.updateScene();

egret/src/panels/Buy3Panel.ts

@@ -8,6 +8,7 @@ import setGlow from "../setGlow";
 import getHomeData from "../getHomeData";
 import { showToast2 } from "../../libs/new_wx/ctrls/toastCtrl2";
 import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
+import MainScene from "../mainScene/MainScene";
 
 export default class Buy3Panel extends Panel {
     onTouchTap_closeBtn(){
@@ -34,7 +35,11 @@ export default class Buy3Panel extends Panel {
         NetManager.ins.hc_exchange((success) => {
             this.buyBtn.enabled = true;
             if (success) {
+                if(SceneCtrl.instance.currentScene instanceof MainScene){
+                    showToast('兑换成功');
+                }else {
                     showToast2();
+                }
                 this.hidePanel();
                 NetManager.ins.hc_home(() => {
                     SceneCtrl.instance.updateScene();