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
---
Fight/Stage/MapEditor/RefreshNpcHandler.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Fight/Stage/MapEditor/RefreshNpcHandler.cs b/Fight/Stage/MapEditor/RefreshNpcHandler.cs
index 79197ea..16a8be5 100644
--- a/Fight/Stage/MapEditor/RefreshNpcHandler.cs
+++ b/Fight/Stage/MapEditor/RefreshNpcHandler.cs
@@ -168,7 +168,7 @@
}
}
- NPCConfig _npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(m_Parent.NpcID);
+ NPCConfig _npcConfig = Config.Instance.Get<NPCConfig>(m_Parent.NpcID);
GActorNpcFight _npcFight = null;
--
Gitblit v1.8.0