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

egret/libs/new_wx/components/NoPrizePanel.ts

@@ -14,7 +14,7 @@ export default class NoPrizePanel extends Panel {
     start(data) {
         super.start();
         this._level = parseInt(data.level + '');
-        this['lvTxt'].text = `关卡${this._level}`
+        this['lvTxt'].text = `关卡${this._level}`;
 
         //0224需求，去掉炫耀按钮，继续闯关按钮居中
         this['shareBtn'].visible = false;

egret/resource/default.res.json

@@ -181,7 +181,7 @@
 			"name": "hbprize"
 		},
 		{
-			"keys": "hbNoPrize_bg_png,hbNoPrize_btn_png",
+			"keys": "hbNoPrize_bg_png,hbNoPrize_btn_png,hbnoprizebg2_png",
 			"name": "hbnoprize"
 		},
 		{
@@ -5372,6 +5372,11 @@
 			"url": "assets/common/common_box_btn.png",
 			"type": "image",
 			"name": "common_box_btn_png"
+		},
+		{
+			"url": "assets/hbNoPrize/hbnoprizebg2.png",
+			"type": "image",
+			"name": "hbnoprizebg2_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/HbNoPrize2Skin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
+        xmlns:w="http://ns.egret.com/wing">
+	<e:Image y="177" horizontalCenter="0" source="hbnoprizebg2_png"/>
+	<e:Button id="closeBtn" label="" x="590.91" y="177">
+		<e:skinName>
+			<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
+				<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png"
+				         source.disabled="closeCommonBtn_png" />
+				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0" />
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
+	<e:Button id="ok_btn" label="" y="738.76" anchorOffsetX="186.36" anchorOffsetY="63.15" horizontalCenter="0">
+		<e:skinName>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="hbNoPrize_btn_png" source.down="hbNoPrize_btn_png" source.disabled="hbNoPrize_btn_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/HbNoPrizeSkin.exml

@@ -11,7 +11,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="ok_btn" label="" y="563" anchorOffsetX="150" anchorOffsetY="48" horizontalCenter="0">
+	<e:Button id="ok_btn" label="" y="558" anchorOffsetX="150" anchorOffsetY="48" horizontalCenter="0">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="hbNoPrize_btn_png" source.down="hbNoPrize_btn_png" source.disabled="hbNoPrize_btn_png"/>
@@ -19,6 +19,6 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Label id="tips" text="您的速度太慢啦，奖励已经被抢走了～" y="389" verticalAlign="bottom" textAlign="center" horizontalCenter="0" fontFamily="FZY4JW" textColor="0xc17343"/>
-	<e:Label text="下次继续努力吧！" y="431" verticalAlign="bottom" textAlign="center" horizontalCenter="-1" fontFamily="FZY4JW" textColor="0xc17343"/>
+	<e:Label id="tips" text="您的速度太慢啦，奖励已经被抢走了～" y="389" verticalAlign="bottom" textAlign="center" horizontalCenter="0" fontFamily="FZY4JW" textColor="0xc17343" visible="false"/>
+	<e:Label text="手速稍慢，再接再厉！" y="412.5" verticalAlign="bottom" textAlign="center" horizontalCenter="0" fontFamily="FZY4JW" textColor="0xc17343" size="36"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/HbPrizeSkin.exml

@@ -31,6 +31,6 @@
 		</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Label text="不愧是卓越的手速达人！" y="448" fontFamily="FZY3JW" size="36" horizontalCenter="0" textColor="0xc17343"/>
-	<e:Label id="tipLabel" text="一共抢到18个红包" y="398" fontFamily="FZY3JW" size="36" horizontalCenter="0" textColor="0xc17343"/>
+	<e:Label text="不愧是卓越的手速达人！" y="420" fontFamily="FZY3JW" size="36" horizontalCenter="0" textColor="0xc17343"/>
+	<e:Label id="tipLabel" text="一共抢到18个红包" y="398" fontFamily="FZY3JW" size="36" horizontalCenter="0" textColor="0xc17343" visible="false"/>
 </e:Skin>
\ No newline at end of file

egret/src/panels/HongbaoRain/HbGame.ts

@@ -95,10 +95,10 @@ export default class HbGame extends Panel {
             if (!success) {
                 switch (true) {
                     case (code == "600015"): // 网络错误 //命中风控参与规则
-                        PanelCtrl.instance.show("HbNoPrize", { type: 2 });
+                        PanelCtrl.instance.show("HbNoPrize2", { type: 2 });
                         break;
                     case (code == "600016"): // 游戏分数提交失败~如有疑问，请联系客服 // 苏宁风控 命中
-                        PanelCtrl.instance.show("HbNoPrize", { type: 2 });
+                        PanelCtrl.instance.show("HbNoPrize2", { type: 2 });
                         break;
                     case (code == "600054"): // 红包雨活动暂未开启
                         PanelCtrl.instance.show("HbNoPrize", { type: 1 });

egret/src/panels/HongbaoRain/HbNoPrize.ts

@@ -3,9 +3,6 @@ import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
 import getHomeData from "../../getHomeData";
 import { changeMapScene } from "../../startScene/StartScene";
 import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
-import { addAdComp } from "../BoxPanel";
-import Utils from "../../Utils";
-import CutTimer from "../../CutTimer";
 import { NetManager } from "../../../libs/tw/manager/NetManager";
 import { getlogItem } from "../../Main";
 
@@ -30,19 +27,19 @@ export default class HbNoPrize extends Panel {
 
     initUI() {
         NetManager.ins.showLog(getlogItem(60));
-        let type = this.data.type;
-        switch(true) {
-            case (type == 1):
-                this.tips.text = '您的速度太慢啦，奖励已经被抢走了～';
-                break;
-            case (type == 2):
-                this.tips.text = '您的速度太慢啦，';
-                break;
-
-            default:
-                this.tips.text = '您的速度太慢啦，奖励已经被抢走了～';
-                break;
-        }
+        // let type = this.data.type;
+        // switch(true) {
+        //     case (type == 1):
+        //         this.tips.text = '您的速度太慢啦，奖励已经被抢走了～';
+        //         break;
+        //     case (type == 2):
+        //         this.tips.text = '您的速度太慢啦，';
+        //         break;
+        //
+        //     default:
+        //         this.tips.text = '您的速度太慢啦，奖励已经被抢走了～';
+        //         break;
+        // }
     }
 
     protected onSkinComplete() {

egret/src/panels/HongbaoRain/HbNoPrize2.ts

+import Panel from "../../../libs/new_wx/components/Panel";
+import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
+import getHomeData from "../../getHomeData";
+import { changeMapScene } from "../../startScene/StartScene";
+import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
+import { NetManager } from "../../../libs/tw/manager/NetManager";
+import { getlogItem } from "../../Main";
+
+/**
+ * 红包雨无奖励风控
+ */
+export default class HbNoPrize extends Panel {
+    public closeBtn:eui.Button;
+    public ok_btn:eui.Button;
+
+    constructor(data) {
+        super();
+        this.data = data;
+    }
+
+    async start() {
+        super.start();
+        this.initUI();
+        GDispatcher.dispatchEvent('updateHbRainIcon');
+    }
+
+    initUI() {
+        NetManager.ins.showLog(getlogItem(60));
+    }
+
+    protected onSkinComplete() {
+
+    }
+
+    initEvents() {
+        super.initEvents();
+        this.closeBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap_closeBtn, this);
+        this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
+    }
+
+    removeEvents() {
+        super.removeEvents();
+        this.closeBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap_closeBtn, this);
+        this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
+    }
+
+    onTouchTap_closeBtn() {
+        super.onTouchTap_closeBtn();
+    }
+
+    onTouchOK() {
+        NetManager.ins.clickLog(getlogItem(60));
+        if((getHomeData().levels.length + 1) > window['last_level']) {
+            changeMapScene();
+            super.hidePanel();
+            return;
+        }
+        PanelCtrl.instance.show("StartPanel", getHomeData().levels.length + 1);
+    }
+
+    protected get closeBtns(): eui.Button[] {
+        return [this['closeBtn']]
+    }
+
+    get skinKey() {
+        return 'HbNoPrize2'
+    }
+}

egret/src/panels/TaskCenter/TaskCenterNoPrize.ts

 import Panel from "../../../libs/new_wx/components/Panel";
 import { addAdComp } from "../BoxPanel";
 import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
-import { NetManager } from "../../../libs/tw/manager/NetManager";
-import { getlogItem } from "../../Main";
 import getHomeData from "../../getHomeData";
 import { changeMapScene } from "../../startScene/StartScene";