Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/WorldMap/LocalMapFindPath.cs

@@ -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;