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

egret/resource/default.res.json

@@ -21,7 +21,7 @@
 			"name": "buy3"
 		},
 		{
-			"keys": "宝箱_png,宝箱1_png,宝箱2_png,宝箱3_png,宝箱bg_png,宝箱btn_png,道具_png,关闭 拷贝_png,光 副本 4_png,设置_png,设置bg_png,声音_png,声音关闭_png,狮子_png,退出_png,问题_png,无星星_png,星星_png,星星bg_png,音乐_png,音乐关闭_png,有星星_png,有星星2_png,有星星3_png,元宝bg_png,ad_icon_png,animal1_png,avatar_png,friend_avatar_png,guideBox_png,guideLevel_png,guideLove_png,guideMoney_png,guideOver_png,icon_png,iconbg_png,icongray_png,invite_icon_png,invite_txtbg_png,lionMsgBg_png,map_signicon_png,map1_jpg,map2_jpg,map2+_png,map2+bg_png,map2红包大作战_png,map2热门引导_png,map2周一红包雨_png,map3_jpg,map大转盘_png,map刮现金红包_png,map今日可领_png,map明日可领_png,maphot_png,msgTri_png,namebg_png,progress1_png,progress2_png,recordbtn_png,taskicon_png",
+			"keys": "宝箱_png,宝箱1_png,宝箱2_png,宝箱3_png,宝箱bg_png,宝箱btn_png,道具_png,关闭 拷贝_png,光 副本 4_png,设置_png,设置bg_png,声音_png,声音关闭_png,狮子_png,退出_png,问题_png,无星星_png,星星_png,星星bg_png,音乐_png,音乐关闭_png,有星星_png,有星星2_png,有星星3_png,元宝bg_png,ad_icon_png,animal1_png,avatar_png,friend_avatar_png,guideBox_png,guideLevel_png,guideLove_png,guideMoney_png,guideOver_png,icon_png,iconbg_png,icongray_png,invite_icon_png,invite_txtbg_png,lionMsgBg_png,map_signicon_png,map1_jpg,map2_jpg,map2+_png,map2+bg_png,map2红包大作战_png,map2热门引导_png,map2周一红包雨_png,map3_jpg,map大转盘_png,map刮现金红包_png,map今日可领_png,map明日可领_png,maphot_png,msgTri_png,namebg_png,progress1_png,progress2_png,recordbtn_png,taskicon_png,map2+bg2_png,mapredbagicom_png,maplight2_png",
 			"name": "map"
 		},
 		{
@@ -200,7 +200,6 @@
 			"keys": "redbagtips_ele_png,redbagtips_ele1_png,redbagtips_ele2_png,redbagtips_ele3_png,redbagtips_light_png,redbagtips按钮_png,redbagtips活动规则_png,redbagtipsbg_png,redbagtips_ele7_png",
 			"name": "redbombtips"
 		}
-
 	],
 	"resources": [
 		{
@@ -3539,6 +3538,11 @@
 			"url": "assets/hbCutTime/hbCutTime_btn_soon.png",
 			"type": "image",
 			"name": "hbCutTime_btn_soon_png"
+		},
+		{
+			"url": "assets/map/map2+bg2.png",
+			"type": "image",
+			"name": "map2+bg2_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/MapSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="MapSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Rect id="rectbg" width="750" height="1206"/>
+	<e:Rect id="rectbg" width="750" height="1206" visible="false"/>
 	<e:Scroller id="scroll" width="750" height="1624" x="0" y="0" scrollPolicyH="off" scrollPolicyV="on" locked="true">
 		<e:Group id="scrollGroup">
 		</e:Group>
@@ -135,7 +135,8 @@
 	</e:Group>
 	<e:Group id="activitys" x="13.4" y="620.55">
 		<e:Group id="actIconsGroup" x="12.12" y="0">
-			<e:Image source="map2+bg_png" x="-27.15" y="0"/>
+			<e:Image id="actIconsBg1" source="map2+bg_png" x="-27.15" y="0" visible="false"/>
+			<e:Image id="actIconsBg2" x="-29.27" y="10" source="map2+bg2_png"/>
 			<e:Group id="hbRainGroup" x="4.27" y="157.5" width="120" height="120">
 				<e:Button id="hbRainBtn" label="" y="-1" x="0">
 					<e:skinName>