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/CoinTaskWin.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/CoinTaskWin.cs b/System/MainInterfacePanel/CoinTaskWin.cs
index 491da7f..e9dbacd 100644
--- a/System/MainInterfacePanel/CoinTaskWin.cs
+++ b/System/MainInterfacePanel/CoinTaskWin.cs
@@ -76,8 +76,8 @@
CoinTaskTipModel coinTaskTip { get { return m_CoinTaskTip ?? (m_CoinTaskTip = ModelCenter.Instance.GetModel<CoinTaskTipModel>()); } }
private void Awake()
{
- string _requireNumberStr = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("TaskExpend").Numerical1;
- var RunTaskCntStr = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("RunTaskCnt");
+ string _requireNumberStr = Config.Instance.Get<FuncConfigConfig>("TaskExpend").Numerical1;
+ var RunTaskCntStr = Config.Instance.Get<FuncConfigConfig>("RunTaskCnt");
RunTaskCnt1 = ConfigParse.GetDic<int, int>(RunTaskCntStr.Numerical1);
RunTaskCnt2 = ConfigParse.GetDic<int, int>(RunTaskCntStr.Numerical2);
_requireNumber = int.Parse(_requireNumberStr);
@@ -350,11 +350,11 @@
string strINfor = _BountyDic[_TaskID].InforList;
TaskID = _TaskID;
- var taskTargetConfig = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(strINfor);
+ var taskTargetConfig = Config.Instance.Get<TASKINFOConfig>(strINfor);
string _str = TaskAllocation.Instance.GetTaskInfo(taskTargetConfig.show_writing, _TaskID);
_Text_TaskTarget.text = _str;
- var taskRewardConfig = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_BountyDic[_TaskID].RewardList);
+ var taskRewardConfig = Config.Instance.Get<TASKINFOConfig>(_BountyDic[_TaskID].RewardList);
string _RewardStr = TaskAllocation.Instance.GetTaskInfo(taskRewardConfig.show_writing, _TaskID);
RewardAnalysis.Inst.GetReward(_RewardStr, ref rewardList);
@@ -372,11 +372,11 @@
string strINfor = taskmodel.SpecialTask[_TaskID].InforList;
TaskID = _TaskID;
- var taskTargetConfig = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(strINfor);
+ var taskTargetConfig = Config.Instance.Get<TASKINFOConfig>(strINfor);
string _str = TaskAllocation.Instance.GetTaskInfo(taskTargetConfig.show_writing, _TaskID);
_Text_TaskTarget.text = _str;
- var taskRewardConfig = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskmodel.SpecialTask[_TaskID].RewardList);
+ var taskRewardConfig = Config.Instance.Get<TASKINFOConfig>(taskmodel.SpecialTask[_TaskID].RewardList);
string _RewardStr = TaskAllocation.Instance.GetTaskInfo(taskRewardConfig.show_writing, _TaskID);
RewardAnalysis.Inst.GetReward(_RewardStr, ref rewardList);
--
Gitblit v1.8.0