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/FlyingShoesTask.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/System/MainInterfacePanel/FlyingShoesTask.cs b/System/MainInterfacePanel/FlyingShoesTask.cs
index d279e74..d69b50d 100644
--- a/System/MainInterfacePanel/FlyingShoesTask.cs
+++ b/System/MainInterfacePanel/FlyingShoesTask.cs
@@ -180,11 +180,11 @@
break;
case 1:
- var taskPower = Config.Instance.Get<TaskPowerConfig>(Task_ID);
+ var taskPower = TaskPowerConfig.Get(Task_ID);
if (taskPower!=null && taskPower.FabaoID!=0)
{
var _treasureId = taskPower.FabaoID;
- var treasureConfig = Config.Instance.Get<TreasureConfig>(_treasureId);
+ var treasureConfig = TreasureConfig.Get(_treasureId);
treasureModel.currentCategory = (TreasureCategory)treasureConfig.Category;
WindowCenter.Instance.Close<MainInterfaceWin>();
var _unlockTreasure = treasureModel.GetTreasureUnlockShow(treasureModel.currentCategory);
@@ -202,11 +202,11 @@
return;
}
- var tasklistconfig = Config.Instance.Get<TaskListConfig>(Task_ID);
+ var tasklistconfig = TaskListConfig.Get(Task_ID);
if (tasklistconfig != null)
{
var _treasureId = tasklistconfig.FabaoID;
- var treasureConfig = Config.Instance.Get<TreasureConfig>(_treasureId);
+ var treasureConfig = TreasureConfig.Get(_treasureId);
treasureModel.currentCategory = (TreasureCategory)treasureConfig.Category;
WindowCenter.Instance.Close<MainInterfaceWin>();
var _unlockTreasure = treasureModel.GetTreasureUnlockShow(treasureModel.currentCategory);
@@ -266,7 +266,7 @@
return _bool;
}
}
- var MonsterConfig = Config.Instance.Get<MonsterRefreshPointConfig>(npcId);
+ var MonsterConfig = MonsterRefreshPointConfig.Get(npcId);
if (MonsterConfig != null && MonsterConfig.MapId != mapID)
{
SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
@@ -282,7 +282,7 @@
{
//--------------鐗规畩浠诲姟鐨勪紶閫侀�昏緫
mainModel.FlyShoseTaskID = Task_ID;
- string _FlyID = Config.Instance.Get<FuncConfigConfig>("TransportPay").Numerical1;
+ string _FlyID = FuncConfigConfig.Get("TransportPay").Numerical1;
int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, int.Parse(_FlyID));//鑾峰彇椋為瀷鐨勬暟閲�
mainModel.IsSelfMotionTask = false;
if (ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0)
@@ -367,10 +367,10 @@
m_TitleText.text = "<color=#ec4bf6>" + TaskTitle(TaskID) + "</color>";
}
string str = taskmodel.allMissionDict[TaskID].InforList;
- var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);
+ var taskinfo = TASKINFOConfig.Get(str);
if (taskinfo != null)
{
- var taskPower = Config.Instance.Get<TaskPowerConfig>(TaskID);
+ var taskPower = TaskPowerConfig.Get(TaskID);
string StrText= taskinfo.show_writing;
if (taskPower != null && taskPower.ISJUMP!=0)
{
@@ -439,7 +439,7 @@
if (taskmodel.BountyDic.ContainsKey(TaskID) || taskmodel.FairyAuDic.ContainsKey(TaskID))
{
- var config = Config.Instance.Get<TASKINFOConfig>(str);
+ var config = TASKINFOConfig.Get(str);
if (config != null)
{
var progress = 0;
@@ -467,7 +467,7 @@
private string TaskTitle(int taskID)
{
- var config = Config.Instance.Get<TASKINFOConfig>(taskmodel.allMissionDict[taskID].Name);
+ var config = TASKINFOConfig.Get(taskmodel.allMissionDict[taskID].Name);
if (config == null)
{
DebugEx.LogError("浠诲姟琛ㄦ牸PyTaskInfo閰嶇疆缂哄け");
@@ -536,11 +536,11 @@
{
if (MainlineTaskType.Count == 0)
{
- var RunTaskCntStr = Config.Instance.Get<FuncConfigConfig>("RunTaskCnt");
+ var RunTaskCntStr = FuncConfigConfig.Get("RunTaskCnt");
RunTaskCnt1 = ConfigParse.GetDic<int, int>(RunTaskCntStr.Numerical1);
RunTaskCnt2 = ConfigParse.GetDic<int, int>(RunTaskCntStr.Numerical2);
- var MainlineTaskTypeList = Config.Instance.Get<FuncConfigConfig>("MainlineTaskType");
+ var MainlineTaskTypeList = FuncConfigConfig.Get("MainlineTaskType");
int[] strMainlineTaskType = ConfigParse.GetMultipleStr<int>(MainlineTaskTypeList.Numerical1);//涓荤嚎
string[] strMainlineTaskType1 = ConfigParse.GetMultipleStr(MainlineTaskTypeList.Numerical2);//涓荤嚎
for (int i = 0; i < strMainlineTaskType.Length; i++)
@@ -549,7 +549,7 @@
MainlineTaskTypekey.Add(strMainlineTaskType1[i]);
}
- var SideQuestsTypeList = Config.Instance.Get<FuncConfigConfig>("SideQuestsType");
+ var SideQuestsTypeList = FuncConfigConfig.Get("SideQuestsType");
int[] strSideQuestsType = ConfigParse.GetMultipleStr<int>(SideQuestsTypeList.Numerical1);//鏀嚎
string[] strSideQuestsType1 = ConfigParse.GetMultipleStr(SideQuestsTypeList.Numerical2);//鏀嚎
for (int i = 0; i < strSideQuestsType.Length; i++)
@@ -558,7 +558,7 @@
SideQuestsTypeKey.Add(strSideQuestsType1[i]);
}
- var BountyMissionsTypeList = Config.Instance.Get<FuncConfigConfig>("BountyMissionsType");
+ var BountyMissionsTypeList = FuncConfigConfig.Get("BountyMissionsType");
int[] strBountyMissionsType = ConfigParse.GetMultipleStr<int>(BountyMissionsTypeList.Numerical1);//璧忛噾
string[] strBountyMissionsType1 = ConfigParse.GetMultipleStr(BountyMissionsTypeList.Numerical2);//璧忛噾
for (int i = 0; i < strBountyMissionsType.Length; i++)
@@ -567,7 +567,7 @@
BountyMissionsTypeKey.Add(strBountyMissionsType1[i]);
}
- var FairyAuMissionTypeList = Config.Instance.Get<FuncConfigConfig>("FairyAuMissionType");
+ var FairyAuMissionTypeList = FuncConfigConfig.Get("FairyAuMissionType");
int[] strFairyAuMissionType = ConfigParse.GetMultipleStr<int>(FairyAuMissionTypeList.Numerical1);//浠欑洘
string[] strFairyAuMissionType1 = ConfigParse.GetMultipleStr(FairyAuMissionTypeList.Numerical2);//浠欑洘
for (int i = 0; i < strFairyAuMissionType.Length; i++)
@@ -575,12 +575,12 @@
FairyAuMissionType.Add(strFairyAuMissionType[i]);
FairyAuMissionTypeKey.Add(strFairyAuMissionType1[i]);
}
- int[] strTranscript = ConfigParse.GetMultipleStr<int>(Config.Instance.Get<FuncConfigConfig>("FBTaskColor").Numerical1);//璧忛噾鍓湰
+ int[] strTranscript = ConfigParse.GetMultipleStr<int>(FuncConfigConfig.Get("FBTaskColor").Numerical1);//璧忛噾鍓湰
for (int i = 0; i < strTranscript.Length; i++)
{
TranscriptTask.Add(strTranscript[i]);
}
- var DemonMissionTypeList1 = Config.Instance.Get<FuncConfigConfig>("DemonMissionType");
+ var DemonMissionTypeList1 = FuncConfigConfig.Get("DemonMissionType");
int[] DemonMissionType = ConfigParse.GetMultipleStr<int>(DemonMissionTypeList1.Numerical1);//榄旀棌娉曞疂
string[] DemonMissionType1 = ConfigParse.GetMultipleStr(DemonMissionTypeList1.Numerical2);//榄旀棌娉曞疂
for (int i = 0; i < DemonMissionType.Length; i++)
@@ -588,7 +588,7 @@
DemonMissionTypeList.Add(DemonMissionType[i]);
DemonMissionTypeListKey.Add(DemonMissionType1[i]);
}
- var TransportTaskConfig= Config.Instance.Get<FuncConfigConfig>("TransportTask").Numerical1;
+ var TransportTaskConfig= FuncConfigConfig.Get("TransportTask").Numerical1;
int[] TransportTaskList = ConfigParse.GetMultipleStr<int>(TransportTaskConfig);
TransportTask.Clear();
for (int i = 0; i < TransportTaskList.Length; i++)
--
Gitblit v1.8.0