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

egret/index.html

@@ -48,6 +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();
         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/components/NoPrizePanel.ts

@@ -10,6 +10,7 @@ import getShowOffPic from "../../../src/getShowOffPic";
 import { showShare } from "../../../src/shareCtrl";
 import { iswx } from "../../../src/iswx";
 import wait from "../../new_tc/wait";
+import { addAdComp } from "../../../src/panels/BoxPanel";
 export default class NoPrizePanel extends Panel {
     _level;
     start(data) {
@@ -39,6 +40,7 @@ export default class NoPrizePanel extends Panel {
                 changeMapScene();
         }, this);
         
+        addAdComp(84,735.52,this);
         
     }
 

egret/libs/new_wx/components/PrizePanel.ts

@@ -10,6 +10,7 @@ import Panel from "./Panel";
 import getShowOffPic from "../../../src/getShowOffPic";
 import wait from "../../new_tc/wait";
 import { changeMapScene } from "../../../src/startScene/StartScene";
+import { addAdComp } from "../../../src/panels/BoxPanel";
 export default class PrizePanel extends Panel {
     _level;
     start(data) {
@@ -41,6 +42,8 @@ export default class PrizePanel extends Panel {
         const hc_submitData = DataManager.ins.getData('hc_submit').data;
 
         this.setStar(hc_submitData.stars);
+
+        addAdComp(84,938.52,this);
     }
 
     showlog() {

egret/libs/new_wx/ctrls/panelCtrl.ts

 import { ModuleTypes } from "../types/sceneTypes";
 import Panel from "../components/Panel";
 import Loading from "../components/Loading";
+import wait from "../../new_tc/wait";
 export default class PanelCtrl {
+
+
+    _panels:any[]
+    showPanels(panels: any[]) {
+        this._panels=panels;
+        const panel = this._panels.shift();
+        PanelCtrl.instance.show(panel);
+    }
+    checkPanels(){
+        if(this._panels.length <=0 ) return;
+        wait(300);
+        const panel = this._panels.shift();
+        PanelCtrl.instance.show(panel);
+    }
+
     private _parent: egret.Sprite;
     private _mask: egret.Sprite;
     static _instance: PanelCtrl;
@@ -89,6 +105,7 @@ export default class PanelCtrl {
         panel.removeEventListener('onDestroy', this.onPanelHide, this);
         this.remove(panel);
         this._current=null;
+        this.checkPanels();
     }
 
     private _panelClassMap: any;

egret/resource/default.res.json

@@ -103,6 +103,10 @@
 		{
 			"keys": "inviterulebg_png",
 			"name": "inviterule"
+		},
+		{
+			"name": "preload",
+			"keys": "ad_closebtn_png"
 		}
 	],
 	"resources": [
@@ -2215,6 +2219,11 @@
 			"url": "assets/inviterule/inviterulebg.png",
 			"type": "image",
 			"name": "inviterulebg_png"
+		},
+		{
+			"name": "ad_closebtn_png",
+			"type": "image",
+			"url": "assets/ad/ad_closebtn.png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/Box2Skin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="Box2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16ccc954c14"/>
-	<e:Component y="739.52" skinName="ADSmallSkin" horizontalCenter="0"/>
+	<e:Component id="ad" y="739.52" skinName="ADSmallSkin" x="84" visible="false"/>
 	<e:Image y="33.76" horizontalCenter="0" source="box2_bg_png"/>
 	<e:Button id="closeBtn" label="" x="601.94" y="195.3">
 		<e:skinName>

egret/resource/skins/MapSkin.exml

@@ -76,7 +76,7 @@
 		<e:Image source="namebg_png" horizontalCenter="-4" bottom="-4"/>
 		<e:Label id="nameTxt" text="La121233bel" y="91.5" size="20" horizontalCenter="1"/>
 	</e:Group>
-	<e:Image id="adBtn" y="519.02" source="ad_icon_png" right="12"/>
+	<e:Image id="adBtn" y="519.02" source="ad_icon_png" right="12" width="143" height="122"/>
 	<e:Button id="taskBtn" label="" x="572.62" y="248.51" visible="false">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">

egret/resource/skins/NoPrizeSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="NoPrizeSkin" width="750" height="1000" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Component y="735.52" skinName="ADSmallSkin" horizontalCenter="0"/>
+	<e:Component y="735.52" skinName="ADSmallSkin" x="84" visible="false"/>
 	<e:Image id="light" source="common_prizelight_png" x="374.19" y="329.51" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
 	<e:Image y="109.55" source="擦肩而过弹窗 _png" horizontalCenter="0.5"/>
 	<e:Button id="closeBtn" label="" x="617" y="279">

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:Component y="849.52" skinName="ADSmallSkin" horizontalCenter="0"/>
+	<e:Component y="849.52" skinName="ADSmallSkin" x="84" visible="false"/>
 	<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">

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:Component y="938.52" skinName="ADSmallSkin" x="84" visible="false"/>
 	<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:Component y="698.52" skinName="ADSmallSkin" x="84" visible="false"/>
 	<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/src/mapScene/AdSmallComp.ts

@@ -6,7 +6,7 @@ export default class AdSmallComp extends ComponentBase {
 
     start(data?) {
         let result;
-        this.touchEnabled = this.touchChildren = false;
+        // this.touchEnabled = this.touchChildren = false;
         super.start(data);
         NetManager.ins.hc_advert(() => {
             const { data } = DataManager.ins.getData('hc_advert');

egret/src/panels/ADPanel.ts

 import Panel from "../../libs/new_wx/components/Panel";
+import { NetManager } from "../../libs/tw/manager/NetManager";
+import { DataManager } from "../../libs/tw/manager/DataManager";
 
 export default class ADPanel extends Panel {
     start(data) {
         super.start();
         this.showlog();
 
+        let result;
+        const hc_advert = DataManager.ins.getData('hc_advert').data;
+        const { popupAdvert } = hc_advert;
+        this.visible = popupAdvert.enable;
+
+        result = popupAdvert.advertList;
+        if (Array.isArray(popupAdvert.advertList)) {
+            const index = Math.floor(popupAdvert.advertList.length * Math.random());
+            result = popupAdvert.advertList[index];
+        }
+        this.data.img = result.img;
     }
 
-    showlog(){
+    showlog() {
         // NetManager.ins.showLog(getlogItem(3));
         // NetManager.ins.showLog(getlogItem(4));
     }
@@ -21,6 +34,6 @@ export default class ADPanel extends Panel {
 
     }
 
-    protected get closeBtns(): eui.Button[] { return [this['closeBtn'],this['closeBtn2']] }
+    protected get closeBtns(): eui.Button[] { return [this['closeBtn'], this['closeBtn2']] }
     get skinKey() { return 'AD' }
 }
\ No newline at end of file

egret/src/panels/Box2Panel.ts

 import Panel from "../../libs/new_wx/components/Panel";
-
+import { addAdComp } from "./BoxPanel";
 export default class Box2Panel extends Panel {
     start(data) {
         super.start();
@@ -9,6 +9,7 @@ export default class Box2Panel extends Panel {
         // }, this);
         // this.showlog();
         // this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl;
+        addAdComp(84,739,this)
     }
     // showlog() {
     //     NetManager.ins.showLog(getlogItem(17));

egret/src/panels/FailedPanel.ts

@@ -3,6 +3,7 @@ import SceneCtrl from "../../libs/new_wx/ctrls/sceneCtrl";
 import { ModuleTypes } from "../../libs/new_wx/types/sceneTypes";
 import { NetManager } from "../../libs/tw/manager/NetManager";
 import { changeMapScene } from "../startScene/StartScene";
+import { addAdComp } from "./BoxPanel";
 
 export default class FailedPanel extends Panel {
     _level;
@@ -20,6 +21,8 @@ export default class FailedPanel extends Panel {
                 changeMapScene();
 
         }, this);
+
+        addAdComp(84,674.52,this);
     }
 
     onTouchTap_closeBtn() {

egret/src/panels/Prize2Panel.ts

@@ -10,6 +10,7 @@ import { showShare } from "../shareCtrl";
 import { iswx } from "../iswx";
 import wait from "../../libs/new_tc/wait";
 import { changeMapScene } from "../startScene/StartScene";
+import { addAdComp } from "./BoxPanel";
 
 export default class Prize2Panel extends Panel {
     _level;
@@ -45,6 +46,8 @@ export default class Prize2Panel extends Panel {
 
         const hc_submitData = DataManager.ins.getData('hc_submit').data;
         this.setStar(hc_submitData.stars);
+
+        addAdComp(84,849.52,this);
     }
 
     showlog() {

egret/src/panels/SignPrizePanel.ts

 import Panel from "../../libs/new_wx/components/Panel";
 import { DataManager } from "../../libs/tw/manager/DataManager";
+import { addAdComp } from "./BoxPanel";
 
 export default class SignPrizePanel extends Panel {
     start(data) {
@@ -29,6 +30,7 @@ export default class SignPrizePanel extends Panel {
         this['img'].visible = prizeType!= 'times' && prizeType!= 'coin';
         this['money'].visible = prizeType=='coin';
         this['blood'].visible = prizeType=='times';
+        addAdComp(84,698.52,this);
     }
 
     showlog() {

mock/happyclear/advert.json

@@ -5,7 +5,7 @@
     "timestamp":1566199822308,
     "data":{
         "popupAdvert":{
-            "enable":true,
+            "enable":false,
             "advertList":[
                 {
                     "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
@@ -31,7 +31,7 @@
             ]
         },
         "mapAdvert":{
-            "enable":true,
+            "enable":false,
             "advertList":[
                 {
                     "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",