From 2df58aeacbf1177ec01167bdeccfe89d6a8d5804 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 13 二月 2019 14:20:28 +0800
Subject: [PATCH] 3335 配置表读取重构,修改配置表读取接口1
---
System/MainInterfacePanel/StoryTask.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/System/MainInterfacePanel/StoryTask.cs b/System/MainInterfacePanel/StoryTask.cs
index 9f10b8a..fca93a4 100644
--- a/System/MainInterfacePanel/StoryTask.cs
+++ b/System/MainInterfacePanel/StoryTask.cs
@@ -133,25 +133,25 @@
{
MainTaskButton mainTaskButton = cell.GetComponent<MainTaskButton>();
- TaskListConfig tasklistmodel = Config.Instance.Get<TaskListConfig>(taskID);
+ TaskListConfig tasklistmodel = TaskListConfig.Get(taskID);
mainTaskButton.LightUpTheState.SetActive(false);//鏄惁閫変腑鐘舵��
if (taskID < mainTaskID)
{
- mainTaskButton.Text_RamusName.text = Config.Instance.Get<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;
+ mainTaskButton.Text_RamusName.text = TASKINFOConfig.Get(tasklistmodel.TaskName).show_writing;
mainTaskButton.Text_RamusState.gameObject.SetActive(false);
mainTaskButton.m_Img_Finish.SetActive(true);
}
else if (taskID == mainTaskID)
{
- mainTaskButton.Text_RamusName.text = Config.Instance.Get<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;
+ mainTaskButton.Text_RamusName.text = TASKINFOConfig.Get(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 = Config.Instance.Get<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;
+ mainTaskButton.Text_RamusName.text = TASKINFOConfig.Get(tasklistmodel.TaskName).show_writing;
mainTaskButton.Text_RamusState.gameObject.SetActive(true);
mainTaskButton.Text_RamusState.text = Language.Get("NotPickedUp_Z");
mainTaskButton.m_Img_Finish.SetActive(false);
@@ -205,10 +205,10 @@
void Information(int taskID)
{
- _Text_TaskName.text = Config.Instance.Get<TASKINFOConfig>(_MainTaskDic[taskID].Name).show_writing;//浠诲姟鍚�
- _Text_TaskDescribe.text = Config.Instance.Get<TASKINFOConfig>(_MainTaskDic[taskID].Desclist).show_writing;//浠诲姟鎻忚堪
+ _Text_TaskName.text = TASKINFOConfig.Get(_MainTaskDic[taskID].Name).show_writing;//浠诲姟鍚�
+ _Text_TaskDescribe.text = TASKINFOConfig.Get(_MainTaskDic[taskID].Desclist).show_writing;//浠诲姟鎻忚堪
string strINfor = _MainTaskDic[taskID].InforList;
- string str= Config.Instance.Get<TASKINFOConfig>(strINfor).show_writing;
+ string str= TASKINFOConfig.Get(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;//浠诲姟鐩爣
@@ -217,27 +217,27 @@
{
_Text_TaskTarget.SetReplaceInfo(_DicTaskInforma[taskID]);
}
- string _RewardStr = Config.Instance.Get<TASKINFOConfig>(_MainTaskDic[taskID].RewardList).show_writing;
+ string _RewardStr = TASKINFOConfig.Get(_MainTaskDic[taskID].RewardList).show_writing;
RewardAnalysis.Inst.GetReward(_RewardStr, ref rewardList);
RewardInformationDisplay(rewardList);
}
void MissionsTask(int taskID)
{
- 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);
+ TaskListConfig taskListModel = TaskListConfig.Get(taskID);
+ _Text_TaskName.text = TASKINFOConfig.Get(taskListModel.TaskName).show_writing;//浠诲姟鍚�
+ _Text_TaskDescribe.text = TASKINFOConfig.Get(taskListModel.TaskDescribe).show_writing;//浠诲姟鎻忚堪
+ var taskconfig = TASKINFOConfig.Get(taskListModel.TaskTarget);
if (taskconfig == null)
{
DebugEx.LogError("鍛婅瘔TT浠诲姟鐩爣娌℃湁杩欐潯鏁版嵁锛圱ASKINFO锛�" + taskListModel.TaskTarget);
return;
}
- string str = Config.Instance.Get<TASKINFOConfig>(taskListModel.TaskTarget).show_writing;
+ string str = TASKINFOConfig.Get(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 = Config.Instance.Get<TASKINFOConfig>(taskListModel.TaskRewards).show_writing;
+ string _RewardStr = TASKINFOConfig.Get(taskListModel.TaskRewards).show_writing;
RewardAnalysis.Inst.GetReward(_RewardStr, ref rewardList);
RewardInformationDisplay(rewardList);
}
@@ -334,7 +334,7 @@
if (_MainTaskDic[key].MissionState != 0 && _MainTaskDic[key].MissionState != 3)
{
mainTaskID = key;
- mainTaaskChapter = Config.Instance.Get<TaskListConfig>(key).ChapterID;
+ mainTaaskChapter = TaskListConfig.Get(key).ChapterID;
}
}
--
Gitblit v1.8.0