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

egret/index.html

@@ -48,7 +48,7 @@
     <script src="libs/pad-zeropadding.js"></script>
     <img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;" />
     <script>
-        localStorage.clear();
+        // localStorage.clear();
         window['isInvitePage']=0;
         var targetUrl='https://gameact.suning.com/sngame-web/api/duiba/private/v1/getLoginUrl.do?appCode=duiba&activityCode=3651404';
         /*

egret/libs/new_wx/MainBase.ts

@@ -167,8 +167,10 @@ export default class MainBase extends eui.UILayer {
         RES.getResAsync(`nums_fnt`);
         RES.getResAsync(`nums2_png`);
         RES.getResAsync(`nums2_fnt`);
-        if (!window['development'])
+        if (!window['development']) {
             RES.getResAsync(`common_json`);
+            RES.getResAsync(`inviterulepanel_json`);
+        }
         else {
             RES.getResAsync('main_mapbottom_png');
             RES.getResAsync('lightani_png');

egret/resource/skins/FailSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="FailSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Component y="674.52" skinName="ADSmallSkin" horizontalCenter="0"/>
+	<e:Component y="674.52" skinName="ADSmallSkin" horizontalCenter="0" visible="false"/>
 	<e:Image source="闯关失败_png" y="-8" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" x="609" y="162">
 		<e:skinName>

egret/resource/skins/InviteRulePanelSkin.exml

@@ -10,7 +10,7 @@
 			</e:layout>
 		</e:Group>
 	</e:Scroller>
-	<e:Button id="closeBtn" label="" x="608" y="322">
+	<e:Button id="closeBtn" label="" x="604" y="340">
 		<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"/>

egret/src/mapScene/MapScene.ts

@@ -72,7 +72,7 @@ export default class MapScene extends Scene {
         this['avatar'].mask = this['avatarMask'];
 
         setTimeout(() => {
-            // PanelCtrl.instance.show('StartPanel',1);
+            // PanelCtrl.instance.show('failed');
         }, 1000);
 
         if(getBgOn() && MapScene['firstPlayBgTag'] == true) {
@@ -92,7 +92,10 @@ export default class MapScene extends Scene {
             const oldTimerStr2 = localStorage.getItem('nowTimer2Str' + window['CFG'].consumerId);
 
             const hc_advert = DataManager.ins.getData('hc_advert').data;
-            const { noticeAdvert} = hc_advert;
+            let { noticeAdvert} = hc_advert;
+            if(noticeAdvert==null){
+                noticeAdvert={enable:false}
+            }
 
             if(oldTimerStr2 != nowTimerStr2 && noticeAdvert && noticeAdvert.enable) {
                 panels.push('ad');

egret/src/panels/ADPanel.ts

@@ -9,13 +9,13 @@ export default class ADPanel extends Panel {
 
         let result;
         const hc_advert = DataManager.ins.getData('hc_advert').data;
-        const { popupAdvert } = hc_advert;
-        this.visible = popupAdvert.enable;
+        const { noticeAdvert } = hc_advert;
+        this.visible = noticeAdvert.enable;
 
-        result = popupAdvert.advertList;
-        if (Array.isArray(popupAdvert.advertList)) {
-            const index = Math.floor(popupAdvert.advertList.length * Math.random());
-            result = popupAdvert.advertList[index];
+        result = noticeAdvert.advertList;
+        if (Array.isArray(noticeAdvert.advertList)) {
+            const index = Math.floor(noticeAdvert.advertList.length * Math.random());
+            result = noticeAdvert.advertList[index];
         }
         this.data.img = result.img;
 

egret/src/panels/BoxPanel.ts

@@ -16,6 +16,8 @@ export default class BoxPanel extends Panel {
 
         const itemid = DataManager.ins.getData('getPlugOrderStatus').lottery.itemId;
         this.data.img = `http://yun.duiba.com.cn/db_games/1015/${itemid}.png`;
+
+        addAdComp(84,739.52,this)
     }
     showlog() {
         NetManager.ins.showLog(getlogItem(17));

mock/happyclear/home.json

@@ -374,7 +374,7 @@
         ],
         "remainEnargy": 9979,
         "askForEnergy": false,
-        "canReceiveTreasureBoxNum": 0,
+        "canReceiveTreasureBoxNum": 10,
         "nextRangeStarsNum": 150
     }
 }
\ No newline at end of file

mock/happyclear/openTreasureBox.json

@@ -6,7 +6,7 @@
     "data": {
         "canReceiveTreasureBoxNum": 99,
         "nextRangeStarsNum": 25,
-        "isGetAllTreasureBox": 1,
+        "isGetAllTreasureBox": 0,
         "orderNum": "1078836456709300393",
         "totalStars": 12
     }