1

egret/.wing/exml.json

@@ -209,5 +209,13 @@
         "value": "http://yun.duiba.com.cn/db_games/fishlogo.png"
       }
     ]
+  },
+  "16db4bf413f": {
+    "bindingDataTestObj": [
+      {
+        "key": "data.img",
+        "value": "http://yun.duiba.com.cn/db_games/fishlogo.png"
+      }
+    ]
   }
 }
\ No newline at end of file

egret/resource/default.res.json

@@ -90,7 +90,7 @@
 		},
 		{
 			"name": "preload",
-			"keys": "namebg_png,avatar_png,invite_txtbg_png,invite_icon_png,taskicon_png,friend_avatar_png,ad_icon_png,testavatar_png,friend按钮-炫耀_png,friend_icon1_png,friend_icon2_png,friend_icon3_png,friend_itembg_png,friendbg_png,ad_closebtn_png,startpanel_icon1_png,startpanel_icon2_png,startpanel_icon3_png,startpanel_icon_png,startpanel_avatar_png,startpanel_bg2_png"
+			"keys": "namebg_png,avatar_png,invite_txtbg_png,invite_icon_png,taskicon_png,friend_avatar_png,ad_icon_png,testavatar_png,friend按钮-炫耀_png,friend_icon1_png,friend_icon2_png,friend_icon3_png,friend_itembg_png,friendbg_png,ad_closebtn_png,startpanel_icon1_png,startpanel_icon2_png,startpanel_icon3_png,startpanel_icon_png,startpanel_avatar_png,startpanel_bg2_png,common_adbg_png"
 		}
 	],
 	"resources": [
@@ -2078,6 +2078,11 @@
 			"name": "startpanel_bg2_png",
 			"type": "image",
 			"url": "assets/startpanel2/startpanel_bg2.png"
+		},
+		{
+			"name": "common_adbg_png",
+			"type": "image",
+			"url": "assets/common/common_adbg.png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/default.thm.json

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

egret/resource/skins/ADSmallSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="ADSmallSkin" width="582" height="203" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<w:Config id="16db4bf413f"/>
+	<e:Image source="common_adbg_png"/>
+	<e:Image y="57" horizontalCenter="0" width="493" height="111" source="{data.img}" anchorOffsetY="0"/>
+</e:Skin>
\ 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:skinName>

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: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/BoxSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="BoxSkin" width="750" height="1205" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16cc233ca3b"/>
+	<e:Component y="739.52" skinName="ADSmallSkin" horizontalCenter="0"/>
 	<e:Image source="boxbg_png" y="33.76" horizontalCenter="0"/>
 	<e:Image id="img" y="355" touchEnabled="true" source="{data.img}" width="512" height="240" scaleX="0.9" scaleY="0.9" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" x="604.96" y="190.84">

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:Image source="闯关失败_png" y="27" horizontalCenter="0"/>
-	<e:Button id="closeBtn" label="" x="609" y="197">
+	<e:Component y="674.52" skinName="ADSmallSkin" horizontalCenter="0"/>
+	<e:Image source="闯关失败_png" y="-8" horizontalCenter="0"/>
+	<e:Button id="closeBtn" label="" x="609" y="162">
 		<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"/>
@@ -9,7 +10,7 @@
 		</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="againBtn" label="" y="556" horizontalCenter="0">
+	<e:Button id="againBtn" label="" y="521" horizontalCenter="0">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="按钮 副本 9_png" source.down="按钮 副本 9_png" source.disabled="按钮 副本 9_png"/>

egret/resource/skins/MapSkin.exml

@@ -51,7 +51,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="recordBtn" label="" x="620.14" y="389.91">
+	<e:Button id="recordBtn" label="" x="620.14" y="255.91">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="recordbtn_png" source.down="recordbtn_png" source.disabled="recordbtn_png"/>
@@ -59,7 +59,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="signBtn" label="" x="608.69" y="520.57" scaleX="0.9" scaleY="0.9">
+	<e:Button id="signBtn" label="" x="608.69" y="383.57" scaleX="0.9" scaleY="0.9">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="map_signicon_png" source.down="map_signicon_png" source.disabled="recordbtn_png"/>
@@ -67,6 +67,16 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
+	<e:Group id="friendBtn" x="13.56" y="126.88" width="171" height="120">
+		<e:Image source="avatar_png" y="0" horizontalCenter="0"/>
+		<e:Group x="38.5" y="10">
+		<e:Image id="avatar" y="0" source="testavatar_png" width="96" height="96" x="0"/>
+		<e:Rect id="avatarMask" width="96" height="96" x="0" y="0" ellipseWidth="96" ellipseHeight="96"/>
+		</e:Group>
+		<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:Button id="taskBtn" label="" x="572.62" y="248.51" visible="false">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
@@ -148,15 +158,5 @@
 		</e:Group>
 		<e:Label text="点击开宝箱" y="791" size="37" horizontalCenter="0" bold="true"/>
 	</e:Group>
-	<e:Group id="friendBtn" x="13.56" y="126.88" width="171" height="120">
-		<e:Image source="avatar_png" y="0" horizontalCenter="0"/>
-		<e:Group x="38.5" y="10">
-			<e:Image id="avatar" y="0" source="testavatar_png" width="96" height="96" x="0"/>
-			<e:Rect id="avatarMask" width="96" height="96" x="0" y="0" ellipseWidth="96" ellipseHeight="96"/>
-		</e:Group>
-		<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="648.02" source="ad_icon_png" right="12"/>
 	<w:Config id="16c89f4ae1a"/>
 </e:Skin>
\ No newline at end of file

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: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/src/mapScene/AdSmallComp.ts

+import ComponentBase from "../../libs/new_wx/components/ComponentBase";
+
+export default class AdSmallComp extends ComponentBase {
+    
+    start(data?) {
+        this.touchEnabled=this.touchChildren=false;
+        super.start(data);
+        
+    }
+
+    get skinKey(): string { return 'ADSmall' }
+}
\ No newline at end of file

egret/src/mapScene/MapScene.ts

@@ -37,7 +37,7 @@ export default class MapScene extends Scene {
         this['avatar'].mask = this['avatarMask'];
 
         setTimeout(() => {
-            PanelCtrl.instance.show('StartPanel',1);
+            // PanelCtrl.instance.show('StartPanel',1);
         }, 1000);
 
         if (getBgOn() && MapScene['firstPlayBgTag'] == true) {

mock/happyclear/home.json

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