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

egret/resource/default.res.json

@@ -197,8 +197,8 @@
 			"name": "redbagactivity"
 		},
 		{
-			"keys": "hbRule_bg_png",
-			"name": "hbrule"
+			"keys": "map2+_png,map2+bg_png,map2周一红包雨_png,map2热门引导_png,map2红包大作战_png,maphot_png,redbagrule活动规则_png",
+			"name": "preload"
 		}
 	],
 	"resources": [
@@ -3288,19 +3288,9 @@
 			"name": "maphot_png"
 		},
 		{
-			"url": "assets/hbRule/hbRule_bg.png",
+			"name": "redbagrule活动规则_png",
 			"type": "image",
-			"name": "hbRule_bg_png"
-		},
-		{
-			"url": "assets/hbCutTime/hbCutTime_btn_null.png",
-			"type": "image",
-			"name": "hbCutTime_btn_null_png"
-		},
-		{
-			"url": "assets/mainScene/festivalTargetBg.png",
-			"type": "image",
-			"name": "festivalTargetBg_png"
+			"url": "assets/redbagrule/redbagrule活动规则.png"
 		}
 	]
 }
\ No newline at end of file