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

egret/libs/new_wx/MainBase.ts

@@ -43,6 +43,8 @@ import { initstatistics } from "../../src/statistics";
 import ADPanel from "../../src/panels/ADPanel";
 import TaskPanel from "../../src/panels/TaskPanel";
 import TaskPrizePanel from "../../src/panels/TaskPrizePanel";
+import BackPanel from "../../src/panels/BackPanel";
+import InvitePanel from "../../src/panels/InvitePanel";
 
 export default class MainBase extends eui.UILayer {
     constructor() {
@@ -78,6 +80,8 @@ export default class MainBase extends eui.UILayer {
             ['signPrize', { cls: SignPrizePanel }],
             ['task', { cls: TaskPanel }],
             ['taskPrize', { cls: TaskPrizePanel }],
+            ['back', { cls: BackPanel }],
+            ['invite', { cls: InvitePanel }],
             ['ad', { cls: ADPanel }],
         ];
 

egret/resource/default.thm.json

@@ -44,6 +44,8 @@
         "resource/skins/TaskSkin.exml",
         "resource/skins/TaskPrizeSkin.exml",
         "resource/skins/ADSkin.exml",
+        "resource/skins/BackSkin.exml",
+        "resource/skins/InviteSkin.exml",
         "resource/skins/ToastSkin.exml",
         "resource/skins/VScrollBarSkin.exml"
     ],

egret/resource/skins/BackSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="BackSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui">
+	<e:Image source="闯关失败_png" y="27" horizontalCenter="0"/>
+	<e:Button id="closeBtn" label="" x="609" y="197">
+		<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:Label text="backpanel" x="260" y="604"/>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/InviteSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui">
+	<e:Image source="闯关失败_png" y="27" horizontalCenter="0"/>
+	<e:Button id="closeBtn" label="" x="609" y="197">
+		<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:Label text="Invite" x="260" y="604"/>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/MapSkin.exml

@@ -83,6 +83,14 @@
 		</e:Skin>
 		</e:skinName>
 	</e:Button>
+	<e:Button id="inviteBtn" label="" x="608.17" y="460.41">
+		<e:skinName>
+		<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="recordbtn_png" source.down="recordbtn_png" source.disabled="recordbtn_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+		</e:Skin>
+		</e:skinName>
+	</e:Button>
 	<e:Group x="30" scaleX="1.4" scaleY="1.4" bottom="23">
 		<e:Group id="settingGroup" x="2" y="6.08" visible="false">
 			<e:Image id="settingbg" source="设置bg_png" y="0" x="0" scale9Grid="9,84,54,76" height="231"/>

egret/src/mapScene/MapScene.ts

@@ -33,6 +33,10 @@ export default class MapScene extends Scene {
 
         super.start();
 
+        // setTimeout(() => {
+        //     PanelCtrl.instance.show('invite');
+        // }, 3000);
+
         if (getBgOn() && MapScene['firstPlayBgTag'] == true) {
             playBg();
         }
@@ -310,6 +314,9 @@ export default class MapScene extends Scene {
     onTap_taskBtn(){
         PanelCtrl.instance.show('task');
     }
+    onTap_inviteBtn(){
+        PanelCtrl.instance.show('invite');
+    }
     onTap_adBtn(){
         console.log('onTap_adBtn')
     }
@@ -321,6 +328,7 @@ export default class MapScene extends Scene {
 
     protected initEvents() {
         // this['goldBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_goldBtn, this)
+        this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_inviteBtn, this)
         this['adBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_adBtn, this)
         this['taskBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_taskBtn, this)
         this['signBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_signBtn, this)

egret/src/panels/BackPanel.ts

+import Panel from "../../libs/new_wx/components/Panel";
+
+export default class BackPanel extends Panel {
+    start(data) {
+        super.start();
+        this.showlog();
+    }
+
+    showlog(){
+        // NetManager.ins.showLog(getlogItem(3));
+        // NetManager.ins.showLog(getlogItem(4));
+    }
+
+    initEvents() {
+        super.initEvents();
+        // this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this)
+    }
+
+    onTapInvite() {
+        
+    }
+
+    protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }
+    get skinKey() { return 'Back' }
+}
\ No newline at end of file

egret/src/panels/InvitePanel.ts

+import Panel from "../../libs/new_wx/components/Panel";
+
+export default class InvitePanel extends Panel {
+    start(data) {
+        super.start();
+        this.showlog();
+    }
+
+    showlog(){
+        // NetManager.ins.showLog(getlogItem(3));
+        // NetManager.ins.showLog(getlogItem(4));
+    }
+
+    initEvents() {
+        super.initEvents();
+        // this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this)
+    }
+
+    onTapInvite() {
+        
+    }
+
+    protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }
+    get skinKey() { return 'Invite' }
+}
\ No newline at end of file