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

# Conflicts:
#	egret/resource/default.res.json

egret/resource/default.res.json

 {
 	"groups": [
 		{
-			"keys": "mask3_png,mask2_png,mask_png,loadingbg_png,头顶树丛_png,startscenebg_png",
+			"keys": "mask3_png,mask2_png,mask_png,loadingbg_png,头顶树丛_png",
 			"name": "start"
 		},
 		{
@@ -5398,19 +5398,9 @@
 			"name": "wormhole_png"
 		},
 		{
-			"url": "assets/startScene/startscenebg.png",
+			"name": "startscenebg_jpg",
 			"type": "image",
-			"name": "startscenebg_png"
-		},
-		{
-			"url": "assets/startscenebg.jpg",
-			"type": "image",
-			"name": "startscenebg_jpg"
-		},
-		{
-			"url": "assets/mainScene/ele41.png",
-			"type": "image",
-			"name": "ele41_png"
+			"url": "assets/startscenebg.jpg"
 		}
 	]
 }
\ No newline at end of file