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/TaskBoxBGMWin.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/System/MainInterfacePanel/TaskBoxBGMWin.cs b/System/MainInterfacePanel/TaskBoxBGMWin.cs
index 09a9aa9..ca91555 100644
--- a/System/MainInterfacePanel/TaskBoxBGMWin.cs
+++ b/System/MainInterfacePanel/TaskBoxBGMWin.cs
@@ -56,7 +56,7 @@
#region Built-in
protected override void BindController()
{
- var config = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("TaskContinue");
+ var config = Config.Instance.Get<FuncConfigConfig>("TaskContinue");
FabaoId = int.Parse(config.Numerical1);
AwaitSecond = int.Parse(config.Numerical2);
AwaitSecondNext = int.Parse(config.Numerical3);
@@ -94,7 +94,7 @@
if (!taskmodel.MainTaskDic.ContainsKey(_TaskId))
{
- var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(_NpcID);
+ var npcConfig = Config.Instance.Get<NPCConfig>(_NpcID);
if (npcConfig != null)
{
if (npcConfig.NPCSpeakID != 0)
@@ -191,16 +191,16 @@
void ContentAssignment()//鍐呭璧嬪��
{
- NPCConfig Npc = ConfigManager.Instance.GetTemplate<NPCConfig>(_NpcID);
+ NPCConfig Npc = Config.Instance.Get<NPCConfig>(_NpcID);
_NpcName.text = Npc.charName;
- var config = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_AllMissionDict[_TaskId].Name);
+ var config = Config.Instance.Get<TASKINFOConfig>(_AllMissionDict[_TaskId].Name);
if (config == null)
{
DebugEx.LogError("浠诲姟琛ㄦ牸閰嶇疆閿欒");
return;
}
_TextTaskName.text = config.show_writing;
- var taskInfoConfig = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(StrConversa);
+ var taskInfoConfig = Config.Instance.Get<TASKINFOConfig>(StrConversa);
if (taskInfoConfig == null)
{
DebugEx.LogError("浠诲姟琛ㄦ牸閰嶇疆閿欒");
@@ -209,9 +209,9 @@
if (taskmodel.BountyDic.ContainsKey(_TaskId) || taskmodel.FairyAuDic.ContainsKey(_TaskId))
{
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);
_TextTaskDescription.text= DefaultDialogContent.show_writing;
}
else
@@ -221,7 +221,7 @@
- var rewardTaskInfoConfig = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_AllMissionDict[_TaskId].RewardList);
+ var rewardTaskInfoConfig = Config.Instance.Get<TASKINFOConfig>(_AllMissionDict[_TaskId].RewardList);
if (rewardTaskInfoConfig == null)
{
DebugEx.LogError("浠诲姟琛ㄦ牸閰嶇疆閿欒");
@@ -261,7 +261,7 @@
}
}
int _TaskType = 0;
- _TaskType = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MissionType").Numerical1);
+ _TaskType = int.Parse(Config.Instance.Get<FuncConfigConfig>("MissionType").Numerical1);
_BtnRewards.gameObject.SetActive(true);
--
Gitblit v1.8.0