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/StoryTask.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/System/MainInterfacePanel/StoryTask.cs b/System/MainInterfacePanel/StoryTask.cs
index 3991965..e72abfd 100644
--- a/System/MainInterfacePanel/StoryTask.cs
+++ b/System/MainInterfacePanel/StoryTask.cs
@@ -133,25 +133,25 @@
{
MainTaskButton mainTaskButton = cell.GetComponent<MainTaskButton>();
- TaskListConfig tasklistmodel = ConfigManager.Instance.GetTemplate<TaskListConfig>(taskID);
+ TaskListConfig tasklistmodel = Config.Instance.Get<TaskListConfig>(taskID);
mainTaskButton.LightUpTheState.SetActive(false);//鏄惁閫変腑鐘舵��
if (taskID < mainTaskID)
{
- mainTaskButton.Text_RamusName.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;
+ mainTaskButton.Text_RamusName.text = Config.Instance.Get<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;
mainTaskButton.Text_RamusState.gameObject.SetActive(false);
mainTaskButton.m_Img_Finish.SetActive(true);
}
else if (taskID == mainTaskID)
{
- mainTaskButton.Text_RamusName.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;
+ mainTaskButton.Text_RamusName.text = Config.Instance.Get<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;
mainTaskButton.Text_RamusState.gameObject.SetActive(true);
mainTaskButton.Text_RamusState.text = GegionalTaskStatus(_MainTaskDic[taskID].MissionState);
mainTaskButton.m_Img_Finish.SetActive(false);
}
else if (taskID > mainTaskID)
{
- mainTaskButton.Text_RamusName.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;
+ mainTaskButton.Text_RamusName.text = Config.Instance.Get<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;
mainTaskButton.Text_RamusState.gameObject.SetActive(true);
mainTaskButton.Text_RamusState.text = Language.Get("NotPickedUp_Z");
mainTaskButton.m_Img_Finish.SetActive(false);
@@ -200,10 +200,10 @@
void Information(int taskID)
{
- _Text_TaskName.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_MainTaskDic[taskID].Name).show_writing;//浠诲姟鍚�
- _Text_TaskDescribe.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_MainTaskDic[taskID].Desclist).show_writing;//浠诲姟鎻忚堪
+ _Text_TaskName.text = Config.Instance.Get<TASKINFOConfig>(_MainTaskDic[taskID].Name).show_writing;//浠诲姟鍚�
+ _Text_TaskDescribe.text = Config.Instance.Get<TASKINFOConfig>(_MainTaskDic[taskID].Desclist).show_writing;//浠诲姟鎻忚堪
string strINfor = _MainTaskDic[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;//浠诲姟鐩爣
@@ -212,27 +212,27 @@
{
_Text_TaskTarget.SetReplaceInfo(_DicTaskInforma[taskID]);
}
- string _RewardStr = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_MainTaskDic[taskID].RewardList).show_writing;
+ string _RewardStr = Config.Instance.Get<TASKINFOConfig>(_MainTaskDic[taskID].RewardList).show_writing;
RewardAnalysis.Inst.GetReward(_RewardStr, ref rewardList);
RewardInformationDisplay(rewardList);
}
void MissionsTask(int taskID)
{
- TaskListConfig taskListModel = ConfigManager.Instance.GetTemplate<TaskListConfig>(taskID);
- _Text_TaskName.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskListModel.TaskName).show_writing;//浠诲姟鍚�
- _Text_TaskDescribe.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskListModel.TaskDescribe).show_writing;//浠诲姟鎻忚堪
- var taskconfig = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskListModel.TaskTarget);
+ TaskListConfig taskListModel = Config.Instance.Get<TaskListConfig>(taskID);
+ _Text_TaskName.text = Config.Instance.Get<TASKINFOConfig>(taskListModel.TaskName).show_writing;//浠诲姟鍚�
+ _Text_TaskDescribe.text = Config.Instance.Get<TASKINFOConfig>(taskListModel.TaskDescribe).show_writing;//浠诲姟鎻忚堪
+ var taskconfig = Config.Instance.Get<TASKINFOConfig>(taskListModel.TaskTarget);
if (taskconfig == null)
{
DebugEx.LogError("鍛婅瘔TT浠诲姟鐩爣娌℃湁杩欐潯鏁版嵁锛圱ASKINFO锛�" + taskListModel.TaskTarget);
return;
}
- string str = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskListModel.TaskTarget).show_writing;
+ string str = Config.Instance.Get<TASKINFOConfig>(taskListModel.TaskTarget).show_writing;
//str = WordAnalysis.Color_Start_Regex.Replace(str, string.Empty);
//str = WordAnalysis.Color_End_Regex.Replace(str, string.Empty);
_Text_TaskTarget.text = str;//浠诲姟鐩爣
- string _RewardStr = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskListModel.TaskRewards).show_writing;
+ string _RewardStr = Config.Instance.Get<TASKINFOConfig>(taskListModel.TaskRewards).show_writing;
RewardAnalysis.Inst.GetReward(_RewardStr, ref rewardList);
RewardInformationDisplay(rewardList);
}
@@ -306,7 +306,7 @@
void SaveChapter()//鑾峰彇涓荤嚎浠诲姟绔犺妭
{
- var configs = ConfigManager.Instance.GetAllValues<TaskListConfig>();
+ var configs = Config.Instance.GetAllValues<TaskListConfig>();
foreach (var value in configs)
{
if (!chapterDic.ContainsKey(value.ChapterID))
@@ -325,7 +325,7 @@
if (_MainTaskDic[key].MissionState != 0 && _MainTaskDic[key].MissionState != 3)
{
mainTaskID = key;
- mainTaaskChapter = ConfigManager.Instance.GetTemplate<TaskListConfig>(key).ChapterID;
+ mainTaaskChapter = Config.Instance.Get<TaskListConfig>(key).ChapterID;
}
}
@@ -335,7 +335,7 @@
private void ListTask(int ChapterID)
{
listTask.Clear();
- var configs = ConfigManager.Instance.GetAllValues<TaskListConfig>();
+ var configs = Config.Instance.GetAllValues<TaskListConfig>();
foreach (var value in configs)
{
if (value.ChapterID == ChapterID && value.TaskID<= mainTaskID)
--
Gitblit v1.8.0