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/SideMission.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/SideMission.cs b/System/MainInterfacePanel/SideMission.cs
index 9dcae65..8c168cf 100644
--- a/System/MainInterfacePanel/SideMission.cs
+++ b/System/MainInterfacePanel/SideMission.cs
@@ -90,12 +90,12 @@
sideMissionTitleBtton.PitchOnImage.SetActive(false);
}
var taskname = taskmodel.SideQuestsDic[TaskId].Name;
- if (ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskname) == null)
+ if (Config.Instance.Get<TASKINFOConfig>(taskname) == null)
{
DebugEx.LogError("TASKINFO浠诲姟琛ㄦ牸娌℃湁鑾峰彇鍒拌浠诲姟鍚嶇О"+ taskname);
return;
}
- sideMissionTitleBtton.TitleName.text= ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskname).show_writing;//浠诲姟鍚�
+ sideMissionTitleBtton.TitleName.text= Config.Instance.Get<TASKINFOConfig>(taskname).show_writing;//浠诲姟鍚�
if (!taskmodel.SideQuestsDic.ContainsKey(TaskId))
{
return;
@@ -119,10 +119,10 @@
{
return;
}
- _Text_TaskName.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskmodel.SideQuestsDic[taskID].Name).show_writing;//浠诲姟鍚�
- _Text_TaskDescribe.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskmodel.SideQuestsDic[taskID].Desclist).show_writing;//浠诲姟鎻忚堪
+ _Text_TaskName.text = Config.Instance.Get<TASKINFOConfig>(taskmodel.SideQuestsDic[taskID].Name).show_writing;//浠诲姟鍚�
+ _Text_TaskDescribe.text = Config.Instance.Get<TASKINFOConfig>(taskmodel.SideQuestsDic[taskID].Desclist).show_writing;//浠诲姟鎻忚堪
string strINfor = taskmodel.SideQuestsDic[taskID].InforList;
- string str = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(strINfor).show_writing;
+ string str = Config.Instance.Get<TASKINFOConfig>(strINfor).show_writing;
str = WordAnalysis.Color_Start_Regex.Replace(str, string.Empty);
str = WordAnalysis.Color_End_Regex.Replace(str, string.Empty);
_Text_TaskTarget.text = str;//浠诲姟鐩爣
@@ -152,7 +152,7 @@
DebugEx.Log("娌℃湁浠诲姟濂栧姳");
return;
}
- string _RewardStr = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskmodel.SideQuestsDic[taskID].RewardList).show_writing;
+ string _RewardStr = Config.Instance.Get<TASKINFOConfig>(taskmodel.SideQuestsDic[taskID].RewardList).show_writing;
RewardAnalysis.Inst.GetReward(_RewardStr, ref rewardList);
RewardInformationDisplay(rewardList);
}
--
Gitblit v1.8.0