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/GuideDialogueWin.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Fight/Stage/MapEditor/GuideDialogueWin.cs b/Fight/Stage/MapEditor/GuideDialogueWin.cs
index ea760b0..aa144a1 100644
--- a/Fight/Stage/MapEditor/GuideDialogueWin.cs
+++ b/Fight/Stage/MapEditor/GuideDialogueWin.cs
@@ -125,7 +125,7 @@
private void InitDialogInfo(int id)
{
- m_DialogConfig = ConfigManager.Instance.GetTemplate<DialogConfig>(id);
+ m_DialogConfig = Config.Instance.Get<DialogConfig>(id);
if (m_DialogConfig == null)
{
@@ -152,7 +152,7 @@
npcName.text = m_DialogConfig.name;
npcContent.text = m_DialogConfig.content;
- var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(m_DialogConfig.npcId);
+ var npcConfig = Config.Instance.Get<NPCConfig>(m_DialogConfig.npcId);
UI3DModelExhibition.Instance.BeginShowNPC(m_DialogConfig.npcId, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, npcIcon, false, true);
}
--
Gitblit v1.8.0