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

egret/resource/default.res.json

@@ -192,10 +192,6 @@
 			"keys": "hbGame_CutTime_bg_png,hbGame_CutTime_progress_png,hbGame_num_bg_png,hbGame_tips_png,hbGame_1_png,hbGame_2_png,hbGame_3_png,hbGame_+1_png,hbGame_bird_touch_png,hbGame_bird_png,hbGame_cattle_png,hbGame_cattle_touch_png,hbGame_hongbao_touch_png,hbGame_+2_png,hbGame_hongbao_png,hbGame_lion_png,hbGame_lion_touch_png,hbGame_pig_touch_png,hbGame_pig_png,hbGame_rabbit_touch_png,hbGame_rabbit_png,hbGame_CutTime_btn_png",
 			"name": "hbgame"
 		},
-		{
-			"keys": "redbagact_rule按钮_png,redbagactbtn_png,redbagact热门活动专区_png,redbagact退出按钮_png",
-			"name": "redbagactivity"
-		},
 		{
 			"keys": "hbRule_bg_png",
 			"name": "hbrule"
@@ -3082,26 +3078,6 @@
 			"type": "image",
 			"name": "curScoreNum8_png"
 		},
-		{
-			"url": "assets/redbagactivity/redbagact_rule按钮.png",
-			"type": "image",
-			"name": "redbagact_rule按钮_png"
-		},
-		{
-			"url": "assets/redbagactivity/redbagactbtn.png",
-			"type": "image",
-			"name": "redbagactbtn_png"
-		},
-		{
-			"url": "assets/redbagactivity/redbagact热门活动专区.png",
-			"type": "image",
-			"name": "redbagact热门活动专区_png"
-		},
-		{
-			"url": "assets/redbagactivity/redbagact退出按钮.png",
-			"type": "image",
-			"name": "redbagact退出按钮_png"
-		},
 		{
 			"url": "assets/redbagalert/redbagalert红包任务.png",
 			"type": "image",

egret/resource/default.thm.json

@@ -53,7 +53,6 @@
 		"resource/skins/RankFriendListSkin.exml",
 		"resource/skins/RankItemSkin.exml",
 		"resource/skins/RankSkin.exml",
-		"resource/skins/RedBagActivitySkin.exml",
 		"resource/skins/RedBagAlertSkin.exml",
 		"resource/skins/ReliveSkin.exml",
 		"resource/skins/RuleSkin.exml",

egret/resource/skins/RedBombTipsSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="RedBombTipsSkin" width="400" height="300" xmlns:e="http://ns.egret.com/eui">
+</e:Skin>
\ No newline at end of file

egret/src/mapScene/MapScene.ts

@@ -87,7 +87,7 @@ export default class MapScene extends Scene {
 
     async start(data?) {
         super.start();
-
+        this['actIconsGroup'].x= -999;
         this.addIcon(); // 添加Icon
 
         this.sendInvite();
@@ -533,6 +533,10 @@ export default class MapScene extends Scene {
 
     onTap_actsShowBtn() {
         this['actIconsGroup'].visible = !this['actIconsGroup'].visible;
+        this['actIconsGroup'].x= 12.12;
+        if(this['actIconsGroup'].visible==false) {
+            this['actIconsGroup'].x= -999;
+        }
     }
 
     onTap_guide() {