1

egret/resource/default.res.json

@@ -87,6 +87,10 @@
 		{
 			"keys": "singprizebg_png,singprize体力_png,signprize元宝_png,signprize_numsbg_png,signprize_btn_png",
 			"name": "signprize"
+		},
+		{
+			"name": "preload",
+			"keys": "namebg_png,avatar_png,invite_txtbg_png,invite_icon_png,taskicon_png,friend_avatar_png,ad_icon_png"
 		}
 	],
 	"resources": [
@@ -1969,6 +1973,41 @@
 			"url": "assets/mainScene/playSceneBg.jpg",
 			"type": "image",
 			"name": "playSceneBg_jpg"
+		},
+		{
+			"name": "namebg_png",
+			"type": "image",
+			"url": "assets/map/namebg.png"
+		},
+		{
+			"name": "avatar_png",
+			"type": "image",
+			"url": "assets/map/avatar.png"
+		},
+		{
+			"name": "invite_txtbg_png",
+			"type": "image",
+			"url": "assets/map/invite_txtbg.png"
+		},
+		{
+			"name": "invite_icon_png",
+			"type": "image",
+			"url": "assets/map/invite_icon.png"
+		},
+		{
+			"name": "taskicon_png",
+			"type": "image",
+			"url": "assets/map/taskicon.png"
+		},
+		{
+			"name": "friend_avatar_png",
+			"type": "image",
+			"url": "assets/map/friend_avatar.png"
+		},
+		{
+			"name": "ad_icon_png",
+			"type": "image",
+			"url": "assets/map/ad_icon.png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/MapSkin.exml

@@ -43,7 +43,7 @@
 		</e:Button>
 		<e:Label id="countdown" text="00:00:00" x="77.39" y="31.19" verticalAlign="middle" textAlign="center" size="22"/>
 	</e:Group>
-	<e:Button id="shopBtn" label="" x="615.08" y="154.01">
+	<e:Button id="shopBtn" label="" x="615.08" y="128.01">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="道具_png" source.down="道具_png" source.disabled="道具_png"/>
@@ -51,7 +51,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="recordBtn" label="" x="615.08" y="304.41">
+	<e:Button id="recordBtn" label="" x="620.14" y="389.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="29.48" y="158.57" scaleX="0.9" scaleY="0.9">
+	<e:Button id="signBtn" label="" x="608.69" y="520.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,38 +67,28 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="taskBtn" label="" x="31.7" y="305.41">
+	<e:Button id="taskBtn" label="" x="572.62" y="248.51">
 		<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"/>
-			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
-		</e:Skin>
-		</e:skinName>
-	</e:Button>
-	<e:Button id="adBtn" label="" x="44.3" y="459.41">
-		<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"/>
+			<e:Image width="100%" height="100%" source="taskicon_png" source.down="taskicon_png" source.disabled="taskicon_png"/>
 			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="friendBtn" label="" x="185" y="158.57">
+	<e:Group id="inviteGroup" x="32" y="265.37">
+		<e:Button id="inviteBtn" label="" x="0" y="1.54">
 			<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"/>
-			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
-		</e:Skin>
-		</e:skinName>
-	</e:Button>
-	<e:Button id="inviteBtn" label="" x="608.17" y="460.41">
-		<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"/>
+				<e:Image width="100%" height="100%" source="invite_icon_png" source.down="invite_icon_png" source.disabled="invite_icon_png"/>
 				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 			</e:Skin>
 			</e:skinName>
 		</e:Button>
+		<e:Group x="84.67" y="0">
+			<e:Image source="invite_txtbg_png" x="0" y="0"/>
+			<e:Label id="inviteTips" text="待领取" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xffffff" size="18"/>
+		</e:Group>
+	</e:Group>
 	<e:Group x="30" scaleX="1.4" scaleY="1.4" bottom="23">
 		<e:Group id="settingGroup" x="2" y="6.08" visible="false">
 			<e:Image id="settingbg" source="设置bg_png" y="0" x="0" scale9Grid="9,84,54,76" height="231"/>
@@ -158,5 +148,10 @@
 		</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">
+		<e:Image source="avatar_png" y="0" horizontalCenter="0"/>
+		<e:Image source="namebg_png" horizontalCenter="-4" bottom="-4"/>
+	</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

mock/happyclear/home.json

@@ -382,7 +382,7 @@
                 "num": 0
             }
         ],
-        "remainEnargy": 9979,
+        "remainEnargy": 99,
         "askForEnergy": false,
         "canReceiveTreasureBoxNum": 0,
         "nextRangeStarsNum": 150

mock/sign/getSignInfo.json

@@ -2,6 +2,6 @@
     "success": true,
     "signInfoVO": {
         "continueDay": 6,
-        "todaySigned": 0
+        "todaySigned": 1
     }
 }
\ No newline at end of file