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/LocalMapEventPointToggle.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/System/WorldMap/LocalMapEventPointToggle.cs b/System/WorldMap/LocalMapEventPointToggle.cs
index 4c5a490..0ce74c1 100644
--- a/System/WorldMap/LocalMapEventPointToggle.cs
+++ b/System/WorldMap/LocalMapEventPointToggle.cs
@@ -34,7 +34,7 @@
base.Display(_data);
m_EventId = (int)_data;
- var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ var mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
m_LayoutLeft.gameObject.SetActive(mapConfig.MapFBType == (int)MapType.OpenCountry);
DrawEventInfo();
@@ -56,8 +56,8 @@
private void DrawEventInfo()
{
- var config = ConfigManager.Instance.GetTemplate<TableConfig.MapEventPointConfig>(this.m_EventId);
- var tagChinNpcMod = ConfigManager.Instance.GetTemplate<NPCConfig>(config.NPCID);
+ var config = Config.Instance.Get<TableConfig.MapEventPointConfig>(this.m_EventId);
+ var tagChinNpcMod = Config.Instance.Get<NPCConfig>(config.NPCID);
this.m_Title.text = tagChinNpcMod != null ? tagChinNpcMod.charName : "";
if (config.LowLV == config.HighestLV)
{
@@ -89,7 +89,7 @@
private void MoveToNpc()
{
- var mapNPCConfig = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(m_EventId);
+ var mapNPCConfig = Config.Instance.Get<MapEventPointConfig>(m_EventId);
MapTransferUtility.Instance.MissionFlyTo(PlayerDatas.Instance.baseData.MapID, mapNPCConfig.NPCID);
WindowCenter.Instance.Close<WorldMapWin>();
--
Gitblit v1.8.0