1

egret/libs/new_wx/MainBase.ts

@@ -48,6 +48,7 @@ import InvitePanel from "../../src/panels/InvitePanel";
 import FriendPanel from "../../src/panels/FriendPanel";
 import InviteRulePanel from "../../src/panels/InviteRulePanel";
 import InvitePrizePanel from "../../src/panels/InvitePrizePanel";
+import BagPanel from "../../src/panels/BagPanel";
 
 export default class MainBase extends eui.UILayer {
     constructor() {
@@ -65,6 +66,7 @@ export default class MainBase extends eui.UILayer {
             [ModuleTypes.RULE_PANEL, { cls: RulePanel }],
             [ModuleTypes.PRIZE_PANEL, { cls: PrizePanel }],
             [ModuleTypes.NO_PRIZE_PANEL, { cls: NoPrizePanel }],
+            ['bag', { cls: BagPanel }],
             ['bloodPanel', { cls: BloodPanel }],
             ['blood2Panel', { cls: BloodPanel2 }],
             ['GoldPanel', { cls: GoldPanel }],

egret/libs/tw/manager/NetManager.ts

@@ -1253,12 +1253,36 @@ export class NetManager extends ABNetManager {
         this.send(net);
     }
 
-    /**
-     * 签到接口
-     * @param {Function} callback
-     * @param {number} signActivityId 签到活动ID
-     * @param {number} activityId 插件活动ID，用于加抽奖次数，不传则使用签到身上配置的插件活动ID，否则不加抽奖次数
-     */
+    public mapRank(callback: Function): void {
+        const net: INetData = {
+            name:'mapRank',
+            uri: window['duiba']+'/customActivity/happyclear/mapRank',
+            type: 'post',
+            dataType: 'json',
+            param: {
+                activityId: DataManager.ins.customCfgData.actId
+            },
+            hideMsg:true,
+            callback: callback
+        };
+        this.send(net);
+    }
+
+    public hc_advert(callback: Function): void {
+        const net: INetData = {
+            name:'hc_advert',
+            uri: window['duiba']+'/customActivity/happyclear/advert',
+            type: 'post',
+            dataType: 'json',
+            param: {
+                activityId: DataManager.ins.customCfgData.actId
+            },
+            hideMsg:true,
+            callback: callback
+        };
+        this.send(net);
+    }
+
     public doSign(callback: Function, signActivityId: number): void {
         const net: INetData = {
             name:'dosign',

egret/resource/default.thm.json

@@ -2,6 +2,7 @@
     "skins": {},
     "autoGenerateExmlsList": true,
     "exmls": [
+        "resource/skins/BagSkin.exml",
         "resource/skins/ADSmallSkin.exml",
         "resource/skins/AvatarSkin.exml",
         "resource/skins/AlertSkin.exml",

egret/resource/skins/BagSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="BagSkin" width="400" height="300" xmlns:e="http://ns.egret.com/eui">
+</e:Skin>
\ No newline at end of file

egret/resource/skins/Prize2Skin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="Prize2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="169005181d0"/>
-	<e:Image id="light" source="common_prizelight_png" x="374.19" y="329.51" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
-	<e:Image source="prizePanelbg_png" y="134.96" horizontalCenter="0.5"/>
-	<e:Button id="closeBtn" label="" x="616" y="307">
+	<e:Component y="849.52" skinName="ADSmallSkin" horizontalCenter="0"/>
+	<e:Image id="light" source="common_prizelight_png" x="374.19" y="246.13" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
+	<e:Image source="prizePanelbg_png" y="51.58" horizontalCenter="0.5"/>
+	<e:Button id="closeBtn" label="" x="616" y="223.62">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
@@ -11,14 +12,14 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Image id="picb" source="点亮 副本 2_png" x="142" y="191"/>
-	<e:Image id="pica" source="点亮 副本 2_png" x="608" y="191" scaleX="-1"/>
-	<e:Image id="picc" source="点亮_png" y="142" x="280"/>
-	<e:Image id="pic1" source="点亮 副本 2_png" x="222" y="249" anchorOffsetX="80" anchorOffsetY="58"/>
-	<e:Image id="pic3" source="点亮 副本 2_png" x="536" y="243" scaleX="-1" anchorOffsetX="72" anchorOffsetY="52"/>
-	<e:Image id="pic2" source="点亮_png" y="218" horizontalCenter="0" anchorOffsetX="96" anchorOffsetY="76"/>
-	<e:Image source="signprize元宝_png" y="453.24" horizontalCenter="-2"/>
-	<e:Button id="shareBtn" label="" y="787" horizontalCenter="-145.5">
+	<e:Image id="picb" source="点亮 副本 2_png" x="142" y="107.62"/>
+	<e:Image id="pica" source="点亮 副本 2_png" x="608" y="107.62" scaleX="-1"/>
+	<e:Image id="picc" source="点亮_png" y="58.62" x="280"/>
+	<e:Image id="pic1" source="点亮 副本 2_png" x="222" y="165.62" anchorOffsetX="80" anchorOffsetY="58"/>
+	<e:Image id="pic3" source="点亮 副本 2_png" x="536" y="159.62" scaleX="-1" anchorOffsetX="72" anchorOffsetY="52"/>
+	<e:Image id="pic2" source="点亮_png" y="134.62" horizontalCenter="0" anchorOffsetX="96" anchorOffsetY="76"/>
+	<e:Image source="signprize元宝_png" y="369.86" horizontalCenter="-2"/>
+	<e:Button id="shareBtn" label="" y="703.62" horizontalCenter="-145.5">
 		<e:skinName>
 		<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="按钮 副本 3_png" source.down="按钮 副本 3_png" source.disabled="按钮 副本 3_png"/>
@@ -26,7 +27,7 @@
 		</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="goBtn" label="" y="787" horizontalCenter="144">
+	<e:Button id="goBtn" label="" y="703.62" horizontalCenter="144">
 		<e:skinName>
 		<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="按钮 副本 4_png" source.down="按钮 副本 4_png" source.disabled="按钮 副本 4_png"/>
@@ -34,7 +35,7 @@
 		</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Group id="numsgroup" x="393.38" y="496.76">
+	<e:Group id="numsgroup" x="393.38" y="413.38">
 		<e:Image id="numsbg0" source="signprize_numsbg_png" x="0" y="0"/>
 		<e:Label id="tips" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
 	</e:Group>

egret/resource/skins/PrizeSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="PrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="169005181d0"/>
+	<e:Component y="938.52" skinName="ADSmallSkin" horizontalCenter="0"/>
 	<e:Image id="light" source="common_prizelight_png" x="374.19" y="329.51" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
 	<e:Image source="prizePanelbg_png" y="136.9" horizontalCenter="0.5"/>
 	<e:Button id="closeBtn" label="" x="618" y="311">

egret/resource/skins/SignPrizeSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="SignPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16d5c2563cb"/>
+	<e:Component y="698.52" skinName="ADSmallSkin" horizontalCenter="0"/>
 	<e:Image source="singprizebg_png" y="20" horizontalCenter="0"/>
 	<e:Image id="img" y="297" touchEnabled="true" source="{data.img}" width="512" height="240" scaleX="1" scaleY="1" horizontalCenter="0" visible="false"/>
 	<e:Image id="money" source="signprize元宝_png" y="234.88" horizontalCenter="0"/>

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:Component y="757.52" skinName="ADSmallSkin" horizontalCenter="0"/>
 	<e:Image source="闯关失败_png" y="27" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" x="609" y="197">
 		<e:skinName>

egret/src/panels/BagPanel.ts

+import Panel from "../../libs/new_wx/components/Panel";
+
+export default class BagPanel 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'],this['closeBtn2']] }
+    get skinKey() { return 'Bag' }
+}
\ No newline at end of file

mock/config.js

 const path = require('path');
 const config = {
+    '/customActivity/happyclear/mapRank': {
+        data: './happyclear/mapRank.json'
+    },
+    '/customActivity/happyclear/advert': {
+        data: './happyclear/advert.json'
+    },
     '/signactivity/getSignInfo': {
         data: './sign/getSignInfo.json'
     },

mock/happyclear/advert.json

+{
+    "success":true,
+    "code":null,
+    "desc":null,
+    "timestamp":1566199822308,
+    "data":[
+        {
+            "levelNum":1,
+            "rank":[
+                {
+                    "nickName":"昵称",
+                    "avatar":"头像",
+                    "stars":1,
+                    "maxScore":123,
+                    "rank":"排名"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file

mock/happyclear/mapRank.json

+{
+    "success":true,
+    "code":null,
+    "desc":null,
+    "timestamp":1566199822308,
+    "data":[
+        {
+            "levelNum":1,
+            "rank":[
+                {
+                    "nickName":"昵称",
+                    "avatar":"头像",
+                    "stars":1,
+                    "maxScore":123,
+                    "rank":"排名"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file