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

egret/libs/new_wx/MainBase.ts

@@ -42,6 +42,7 @@ import ExchangePanel from "../../src/panels/ExchangePanel";
 import { initstatistics } from "../../src/statistics";
 import ADPanel from "../../src/panels/ADPanel";
 import TaskPanel from "../../src/panels/TaskPanel";
+import TaskPrizePanel from "../../src/panels/TaskPrizePanel";
 
 export default class MainBase extends eui.UILayer {
     constructor() {
@@ -76,6 +77,7 @@ export default class MainBase extends eui.UILayer {
             ['sign', { cls: SignPanel }],
             ['signPrize', { cls: SignPrizePanel }],
             ['task', { cls: TaskPanel }],
+            ['taskPrize', { cls: TaskPrizePanel }],
             ['ad', { cls: ADPanel }],
         ];
 

egret/resource/default.thm.json

@@ -42,6 +42,8 @@
         "resource/skins/TargetItemSkin.exml",
         "resource/skins/TaskItemSkin.exml",
         "resource/skins/TaskSkin.exml",
+        "resource/skins/TaskPrizeSkin.exml",
+        "resource/skins/ADSkin.exml",
         "resource/skins/ToastSkin.exml",
         "resource/skins/VScrollBarSkin.exml"
     ],

egret/resource/skins/TaskPrizeSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="TaskPrizeSkin" 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="task prize panel" x="260" y="604"/>
+</e:Skin>
\ No newline at end of file

egret/src/mapScene/MapScene.ts

@@ -311,7 +311,7 @@ export default class MapScene extends Scene {
         PanelCtrl.instance.show('task');
     }
     onTap_adBtn(){
-        PanelCtrl.instance.show('ad');
+        console.log('onTap_adBtn')
     }
     onTap_signBtn(){
         NetManager.ins.getSignInfo(() => {

egret/src/panels/TaskPanel.ts

 import Panel from "../../libs/new_wx/components/Panel";
 import TaskItemRenderer from "./TaskItemRenderer";
+import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
 
 export default class TaskPanel extends Panel {
     public list: eui.List;
@@ -11,6 +12,10 @@ export default class TaskPanel extends Panel {
         this.list.itemRenderer = TaskItemRenderer;
         const ac = new eui.ArrayCollection([1,2,3,4,5,6,7,8,9,10]);
         this.list.dataProvider = ac;
+
+        setTimeout(() => {
+            PanelCtrl.instance.show('taskPrize');
+        }, 2000);
     }
 
     showlog(){

egret/src/panels/TaskPrizePanel.ts

+import Panel from "../../libs/new_wx/components/Panel";
+
+export default class TaskPrizePanel 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 'TaskPrize' }
+}
\ No newline at end of file