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

egret/.wing/exml.json

@@ -228,5 +228,13 @@
         "value": "http://yun.duiba.com.cn/db_games/1022/111.png"
       }
     ]
+  },
+  "16e0235c541": {
+    "bindingDataTestObj": [
+      {
+        "key": "data.url",
+        "value": "http://yun.duiba.com.cn/db_games/1022/111.png"
+      }
+    ]
   }
 }
\ No newline at end of file

egret/resource/default.res.json

@@ -151,6 +151,10 @@
 		{
 			"keys": "turntable_bg_png,turntable_panel_png",
 			"name": "turntable"
+		},
+		{
+			"keys": "back按钮 副本 91_png,backbg_png",
+			"name": "back"
 		}
 	],
 	"resources": [
@@ -2578,6 +2582,16 @@
 			"url": "assets/turntable/turntable_panel.png",
 			"type": "image",
 			"name": "turntable_panel_png"
+		},
+		{
+			"url": "assets/back/back按钮 副本 91.png",
+			"type": "image",
+			"name": "back按钮 副本 91_png"
+		},
+		{
+			"url": "assets/back/backbg.png",
+			"type": "image",
+			"name": "backbg_png"
 		}
 	]
 }
\ No newline at end of file

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:Component y="710.52" skinName="ADSmallSkin" horizontalCenter="0"/>
-	<e:Image source="闯关失败_png" y="27" horizontalCenter="0"/>
-	<e:Button id="closeBtn" label="" x="609" y="197">
+<e:Skin class="BackSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<w:Config id="16e0235c541"/>
+	<e:Component y="806.52" skinName="ADSmallSkin" horizontalCenter="0" visible="false"/>
+	<e:Image y="-30.27" source="backbg_png" horizontalCenter="0"/>
+	<e:Image y="-20.27" horizontalCenter="0" x="10" source=""/>
+	<e:Button id="closeBtn" label="" x="611" y="291">
 		<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"/>
@@ -10,5 +12,13 @@
 		</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Label text="backpanel" x="260" y="604"/>
+	<e:Image width="508" height="225" source="{data.url}" horizontalCenter="0" y="380"/>
+	<e:Button id="inviteBtn" label="" y="675" horizontalCenter="12">
+		<e:skinName>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="back按钮 副本 91_png" source.down="back按钮 副本 91_png" source.disabled="back按钮 副本 91_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
 </e:Skin>
\ No newline at end of file

egret/src/mapScene/MapScene.ts

@@ -74,6 +74,8 @@ export default class MapScene extends Scene {
 
         this.sendInvite();
 
+        PanelCtrl.instance.show('back');
+        
         this.updateMyInfo();
         this.updateAdData();
         GDispatcher.dispatchEvent("getInviteInfo"); // 查询邀请信息，控制邀请有礼角标

egret/src/panels/BackPanel.ts

 import Panel from "../../libs/new_wx/components/Panel";
+import { addAdComp } from "./BoxPanel";
+import { gotoNextLevel } from "./gotoNextLevel";
 
 export default class BackPanel extends Panel {
     start(data) {
         super.start();
         this.showlog();
+        addAdComp(84, 806.52, this)
     }
 
     showlog(){
         // NetManager.ins.showLog(getlogItem(3));
         // NetManager.ins.showLog(getlogItem(4));
+        this.data.url='http://yun.duiba.com.cn/db_games/1022/111.png'
     }
 
     initEvents() {
         super.initEvents();
-        // this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this)
+        this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this)
     }
 
     onTapInvite() {
-        
+        gotoNextLevel();
     }
 
     protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }

mock/happyclear/advert.json

-{"code":"0000000000","data":{"mapAdvert":{"enable":true,"advertList":[{"img":"//yun.duiba.com.cn/images/201910/2iu41if4n7.png","url":"https://cuxiao.m.suning.com/scms/s11dybys.html?adTypeCode=1137&adId=https%3A%2F%2Flib.suning.com%2Fweex%2Fs11dybys.js%3FpageCode%3Ds11dybys"}]},"noticeAdvert":{"enable":true,"advertList":[{"img":"//yun.duiba.com.cn/images/201910/zqtdp6xibw.jpg","url":"https://cuxiao.m.suning.com/scms/songshu.html"}]},"popupAdvert":null},"success":true,"desc":"OK","timestamp":1571913337116}
+{
\ No newline at end of file
+    "code": "0000000000",
+    "data": {
+        "mapAdvert": {
+            "enable": true,
+            "advertList": [
+                {
+                    "img": "//yun.duiba.com.cn/images/201910/2iu41if4n7.png",
+                    "url": "https://cuxiao.m.suning.com/scms/s11dybys.html?adTypeCode=1137&adId=https%3A%2F%2Flib.suning.com%2Fweex%2Fs11dybys.js%3FpageCode%3Ds11dybys"
+                }
+            ]
+        },
+        "noticeAdvert": {
+            "enable": true,
+            "advertList": [
+                {
+                    "img": "//yun.duiba.com.cn/images/201910/zqtdp6xibw.jpg",
+                    "url": "https://cuxiao.m.suning.com/scms/songshu.html"
+                }
+            ]
+        },
+        "popupAdvert": { "enable": true,
+            "advertList": [
+                {
+                    "img": "//yun.duiba.com.cn/images/201910/zqtdp6xibw.jpg",
+                    "url": "https://cuxiao.m.suning.com/scms/songshu.html"
+                }
+            ]}
+    },
+    "success": true,
+    "desc": "OK",
+    "timestamp": 1571913337116
+}
\ No newline at end of file