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/MainInterfacePanel/DefaultDialogueBoxWin.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/System/MainInterfacePanel/DefaultDialogueBoxWin.cs b/System/MainInterfacePanel/DefaultDialogueBoxWin.cs
index c8841dd..f6aeb9e 100644
--- a/System/MainInterfacePanel/DefaultDialogueBoxWin.cs
+++ b/System/MainInterfacePanel/DefaultDialogueBoxWin.cs
@@ -40,7 +40,7 @@
MainInterfaceWin.IsOpenMaininterface += IsOpenMaininterface;
_AllMissionDict = taskmodel.allMissionDict;
_NPCID = taskmodel.NPCid;
- var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(_NPCID);
+ var npcConfig = Config.Instance.Get<NPCConfig>(_NPCID);
if (npcConfig != null)
{
if (npcConfig.NPCSpeakID != 0)
@@ -114,12 +114,12 @@
void ContentAssignmen()//鍐呭璧嬪��
{
- NPCConfig Npc = ConfigManager.Instance.GetTemplate<NPCConfig>(_NPCID);
+ NPCConfig Npc = Config.Instance.Get<NPCConfig>(_NPCID);
_TextName.text = Npc.charName;
string _taskInfoKey = string.Format("d_{0}_0_1", _NPCID);
- if (ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_taskInfoKey) == null)
+ if (Config.Instance.Get<TASKINFOConfig>(_taskInfoKey) == null)
return;
- TASKINFOConfig DefaultDialogContent = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_taskInfoKey);
+ TASKINFOConfig DefaultDialogContent = Config.Instance.Get<TASKINFOConfig>(_taskInfoKey);
_TextDefaultDialogue.text = DefaultDialogContent.show_writing;
}
}
--
Gitblit v1.8.0