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

egret/resource/default.res.json

@@ -139,6 +139,10 @@
 		{
 			"keys": "scratch_rule_bg_png",
 			"name": "scratchrulepanel"
+		},
+		{
+			"name": "preload",
+			"keys": "map大转盘_png,map刮现金红包_png"
 		}
 	],
 	"resources": [
@@ -2361,6 +2365,16 @@
 			"url": "assets/scratch/rule/scratch_rule_bg.png",
 			"type": "image",
 			"name": "scratch_rule_bg_png"
+		},
+		{
+			"name": "map大转盘_png",
+			"type": "image",
+			"url": "assets/map/map大转盘.png"
+		},
+		{
+			"name": "map刮现金红包_png",
+			"type": "image",
+			"url": "assets/map/map刮现金红包.png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/MapSkin.exml

@@ -68,7 +68,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="474.02" source="ad_icon_png" right="24" width="122" height="122"/>
+	<e:Image id="adBtn" y="478" source="ad_icon_png" right="602" width="122" height="122"/>
 	<e:Button id="taskBtn" label="" x="572.62" y="248.51" visible="false">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">

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/mgspbjuspb.png",
-                    "url": "http://shop.m.suning.com/sale/30001669_10269054.html"
-                }
-            ]
-        },
-        "popupAdvert": null
-    },
-    "success": true,
-    "desc": "OK",
-    "timestamp": 1571821360634
-}
\ 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":null},"success":true,"desc":"OK","timestamp":1571913337116}
\ No newline at end of file