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

egret/resource/default.res.json

@@ -29,7 +29,7 @@
 			"name": "failed"
 		},
 		{
-			"keys": "progress2_png,progress1_png,map3_jpg,map2_jpg,map1_jpg,icon_png,animal1_png,元宝bg_png,有星星_png,音乐_png,星星bg_png,星星_png,无星星_png,问题_png,退出_png,狮子_png,声音_png,设置bg_png,设置_png,关闭 拷贝_png,道具_png,宝箱btn_png,宝箱bg_png,宝箱_png,宝箱3_png,宝箱2_png,宝箱1_png,iconbg_png,光 副本 4_png,音乐关闭_png,声音关闭_png,recordbtn_png",
+			"keys": "progress2_png,progress1_png,map3_jpg,map2_jpg,map1_jpg,icon_png,animal1_png,元宝bg_png,有星星_png,音乐_png,星星bg_png,星星_png,无星星_png,问题_png,退出_png,狮子_png,声音_png,设置bg_png,设置_png,关闭 拷贝_png,道具_png,宝箱btn_png,宝箱bg_png,宝箱_png,宝箱3_png,宝箱2_png,宝箱1_png,iconbg_png,光 副本 4_png,音乐关闭_png,声音关闭_png,recordbtn_png,msgTri_png,guideOver_png,guideLove_png,guideBox_png,guideLevel_png,guideMoney_png,lionMsgBg_png",
 			"name": "map"
 		},
 		{
@@ -1532,6 +1532,41 @@
 			"url": "assets/map/recordbtn.png",
 			"type": "image",
 			"name": "recordbtn_png"
+		},
+		{
+			"url": "assets/map/guideMoney.png",
+			"type": "image",
+			"name": "guideMoney_png"
+		},
+		{
+			"url": "assets/map/guideBox.png",
+			"type": "image",
+			"name": "guideBox_png"
+		},
+		{
+			"url": "assets/map/msgTri.png",
+			"type": "image",
+			"name": "msgTri_png"
+		},
+		{
+			"url": "assets/map/lionMsgBg.png",
+			"type": "image",
+			"name": "lionMsgBg_png"
+		},
+		{
+			"url": "assets/map/guideOver.png",
+			"type": "image",
+			"name": "guideOver_png"
+		},
+		{
+			"url": "assets/map/guideLove.png",
+			"type": "image",
+			"name": "guideLove_png"
+		},
+		{
+			"url": "assets/map/guideLevel.png",
+			"type": "image",
+			"name": "guideLevel_png"
 		}
 	]
 }
\ No newline at end of file

egret/src/mapScene/GuideCon.ts

+
+
+
+/**
+ * 箭头的svga，只加载一次
+ */
+let arrow;
+/**
+ * 地图页面的引导
+ * 进地图页面先判断缓存
+ */
+export class GuideCon extends egret.DisplayObjectContainer{
+    constructor(){
+        super();
+
+    }
+}
\ No newline at end of file