From 2b47fde8e7902ddddd898309f281b9c310fc877f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 八月 2018 12:00:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/WorldMap/LocalMapFindPath.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/System/WorldMap/LocalMapFindPath.cs b/System/WorldMap/LocalMapFindPath.cs
index 627a9d6..277943e 100644
--- a/System/WorldMap/LocalMapFindPath.cs
+++ b/System/WorldMap/LocalMapFindPath.cs
@@ -41,7 +41,7 @@
m_HeroHead.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(job, 0));
mapId = _mapId;
- var tagChinMap = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);
+ var tagChinMap = Config.Instance.Get<MapConfig>(mapId);
var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig();
var mapWidth = mapResConfig.MapScale.x;
var mapHeight = mapResConfig.MapScale.y;
@@ -199,14 +199,14 @@
private void DrawEventPoint(int _eventPoint)
{
- var eventPointConfig = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(_eventPoint);
+ var eventPointConfig = Config.Instance.Get<MapEventPointConfig>(_eventPoint);
if (eventPointConfig.ShowInMipMap == 0)
{
return;
}
var npcType = LocalMapTag.TagType.Boss;
- var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(eventPointConfig.NPCID);
+ var npcConfig = Config.Instance.Get<NPCConfig>(eventPointConfig.NPCID);
if (eventPointConfig.IsShowInfo == 1)
{
@@ -232,7 +232,7 @@
npcType = LocalMapTag.TagType.Boss;
}
- var monsterRefreshConfig = ConfigManager.Instance.GetTemplate<MonsterRefreshPointConfig>(npcConfig.NPCID);
+ var monsterRefreshConfig = Config.Instance.Get<MonsterRefreshPointConfig>(npcConfig.NPCID);
var npcPos = new Vector3(monsterRefreshConfig.Position.x * 0.5f, 0, monsterRefreshConfig.Position.y * 0.5f);
var behaviour = LocalMapTagPool.Require(npcType);
@@ -254,7 +254,7 @@
private void DrawWayPoints()
{
- var waypoints = ConfigManager.Instance.GetAllValues<maptransportConfig>();
+ var waypoints = Config.Instance.GetAllValues<maptransportConfig>();
foreach (var waypoint in waypoints)
{
if (waypoint.OriginalMapID == PlayerDatas.Instance.baseData.MapID)
@@ -266,7 +266,7 @@
private void DrawWayPoint(int _wayPoint)
{
- var config = ConfigManager.Instance.GetTemplate<maptransportConfig>(_wayPoint.ToString());
+ var config = Config.Instance.Get<maptransportConfig>(_wayPoint.ToString());
var behaviour = LocalMapTagPool.Require(LocalMapTag.TagType.WayPoint);
tagBehaviours.Add(behaviour);
@@ -291,7 +291,7 @@
private void DrawFunctionNPC(string _refreshId)
{
- var mapNpcConfig = ConfigManager.Instance.GetTemplate<mapnpcConfig>(_refreshId);
+ var mapNpcConfig = Config.Instance.Get<mapnpcConfig>(_refreshId);
var behaviour = LocalMapTagPool.Require(LocalMapTag.TagType.Function);
@@ -386,8 +386,8 @@
{
if (model.selectedLocalMapEventPoint != -1)
{
- var config = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(_eventPoint);
- var monsterRefreshConfig = ConfigManager.Instance.GetTemplate<MonsterRefreshPointConfig>(config.NPCID);
+ var config = Config.Instance.Get<MapEventPointConfig>(_eventPoint);
+ var monsterRefreshConfig = Config.Instance.Get<MonsterRefreshPointConfig>(config.NPCID);
var position = new Vector3(monsterRefreshConfig.Position.x * 0.5f, 0, monsterRefreshConfig.Position.y * 0.5f);
var localPosition = mapMatrix.WorldToLocalPosition(position);
--
Gitblit v1.8.0