From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能

---
 System/WorldMap/LocalMapFindPath.cs |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/System/WorldMap/LocalMapFindPath.cs b/System/WorldMap/LocalMapFindPath.cs
index 983b798..fc21a24 100644
--- a/System/WorldMap/LocalMapFindPath.cs
+++ b/System/WorldMap/LocalMapFindPath.cs
@@ -27,7 +27,7 @@
         private List<GameObject> pathNodeBehaviours = new List<GameObject>(); //瀵昏矾鐐规睜
         List<LocalMapTag> tagBehaviours = new List<LocalMapTag>();
 
-        MapModel model { get { return  ModelCenter.Instance.GetModel<MapModel>(); } }
+        MapModel model { get { return ModelCenter.Instance.GetModel<MapModel>(); } }
 
         int mapId = 0;
         public void Init(int _mapId)
@@ -42,7 +42,17 @@
 
             mapId = _mapId;
             var tagChinMap = Config.Instance.Get<MapConfig>(mapId);
-            var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig();
+
+            MapResourcesConfig mapResConfig = null;
+            if (mapId == PlayerDatas.Instance.baseData.MapID)
+            {
+                mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig();
+            }
+            else
+            {
+                mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(mapId, 0);
+            }
+
             var mapWidth = mapResConfig.MapScale.x;
             var mapHeight = mapResConfig.MapScale.y;
 

--
Gitblit v1.8.0