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/FlyingShoesTask.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/System/MainInterfacePanel/FlyingShoesTask.cs b/System/MainInterfacePanel/FlyingShoesTask.cs
index 7c19c84..067699e 100644
--- a/System/MainInterfacePanel/FlyingShoesTask.cs
+++ b/System/MainInterfacePanel/FlyingShoesTask.cs
@@ -133,7 +133,7 @@
int mapID = PlayerDatas.Instance.baseData.MapID;
if (int.TryParse(strNpc, out npcId))
{
- var npcConfig = ConfigManager.Instance.GetAllValues<mapnpcConfig>();
+ var npcConfig = Config.Instance.GetAllValues<mapnpcConfig>();
foreach (var value in npcConfig)
{
if (value.NPCID == npcId && value.MapID != mapID)
@@ -142,7 +142,7 @@
return;
}
}
- var MonsterConfig = ConfigManager.Instance.GetTemplate<MonsterRefreshPointConfig>(npcId);
+ var MonsterConfig = Config.Instance.Get<MonsterRefreshPointConfig>(npcId);
if (MonsterConfig != null && MonsterConfig.MapId != mapID)
{
SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
@@ -158,7 +158,7 @@
if (FabaoDic.ContainsKey(Task_ID))
{
var _treasureId = FabaoDic[Task_ID];
- var treasureConfig = ConfigManager.Instance.GetTemplate<TreasureConfig>(_treasureId);
+ var treasureConfig = Config.Instance.Get<TreasureConfig>(_treasureId);
treasureModel.currentCategory = (TreasureCategory)treasureConfig.Category;
WindowCenter.Instance.Close<MainInterfaceWin>();
var _unlockTreasure = treasureModel.GetTreasureUnlockShow(treasureModel.currentCategory);
@@ -176,11 +176,11 @@
return;
}
- var tasklistconfig = ConfigManager.Instance.GetTemplate<TaskListConfig>(Task_ID);
+ var tasklistconfig = Config.Instance.Get<TaskListConfig>(Task_ID);
if (tasklistconfig != null)
{
var _treasureId = tasklistconfig.FabaoID;
- var treasureConfig = ConfigManager.Instance.GetTemplate<TreasureConfig>(_treasureId);
+ var treasureConfig = Config.Instance.Get<TreasureConfig>(_treasureId);
treasureModel.currentCategory = (TreasureCategory)treasureConfig.Category;
WindowCenter.Instance.Close<MainInterfaceWin>();
var _unlockTreasure = treasureModel.GetTreasureUnlockShow(treasureModel.currentCategory);
@@ -211,7 +211,7 @@
private void OnClickDeliveryButton()//浼犻�佺
{
mainModel.FlyShoseTaskID = Task_ID;
- string _FlyID = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("TransportPay").Numerical1;
+ string _FlyID = Config.Instance.Get<FuncConfigConfig>("TransportPay").Numerical1;
int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, int.Parse(_FlyID));//鑾峰彇椋為瀷鐨勬暟閲�
mainModel.IsSelfMotionTask = false;
if (ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0)
@@ -292,7 +292,7 @@
m_TitleText.text = "<color=#ec4bf6>" + TaskTitle(TaskID) + "</color>";
}
string str = taskmodel.allMissionDict[TaskID].InforList;
- var taskinfo = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(str);
+ var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);
if (taskinfo != null)
{
m_ContentText.text = taskinfo.show_writing;
@@ -349,7 +349,7 @@
if (taskmodel.BountyDic.ContainsKey(TaskID) || taskmodel.FairyAuDic.ContainsKey(TaskID))
{
- var config = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(str);
+ var config = Config.Instance.Get<TASKINFOConfig>(str);
if (config != null)
{
var progress = 0;
@@ -377,7 +377,7 @@
private string TaskTitle(int taskID)
{
- var config = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskmodel.allMissionDict[taskID].Name);
+ var config = Config.Instance.Get<TASKINFOConfig>(taskmodel.allMissionDict[taskID].Name);
if (config == null)
{
DebugEx.LogError("浠诲姟琛ㄦ牸PyTaskInfo閰嶇疆缂哄け");
@@ -446,11 +446,11 @@
{
if (MainlineTaskType.Count == 0)
{
- var RunTaskCntStr = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("RunTaskCnt");
+ var RunTaskCntStr = Config.Instance.Get<FuncConfigConfig>("RunTaskCnt");
RunTaskCnt1 = ConfigParse.GetDic<int, int>(RunTaskCntStr.Numerical1);
RunTaskCnt2 = ConfigParse.GetDic<int, int>(RunTaskCntStr.Numerical2);
- var MainlineTaskTypeList = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MainlineTaskType");
+ var MainlineTaskTypeList = Config.Instance.Get<FuncConfigConfig>("MainlineTaskType");
int[] strMainlineTaskType = ConfigParse.GetMultipleStr<int>(MainlineTaskTypeList.Numerical1);//涓荤嚎
string[] strMainlineTaskType1 = ConfigParse.GetMultipleStr(MainlineTaskTypeList.Numerical2);//涓荤嚎
for (int i = 0; i < strMainlineTaskType.Length; i++)
@@ -459,7 +459,7 @@
MainlineTaskTypekey.Add(strMainlineTaskType1[i]);
}
- var SideQuestsTypeList = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("SideQuestsType");
+ var SideQuestsTypeList = Config.Instance.Get<FuncConfigConfig>("SideQuestsType");
int[] strSideQuestsType = ConfigParse.GetMultipleStr<int>(SideQuestsTypeList.Numerical1);//鏀嚎
string[] strSideQuestsType1 = ConfigParse.GetMultipleStr(SideQuestsTypeList.Numerical2);//鏀嚎
for (int i = 0; i < strSideQuestsType.Length; i++)
@@ -468,7 +468,7 @@
SideQuestsTypeKey.Add(strSideQuestsType1[i]);
}
- var BountyMissionsTypeList = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("BountyMissionsType");
+ var BountyMissionsTypeList = Config.Instance.Get<FuncConfigConfig>("BountyMissionsType");
int[] strBountyMissionsType = ConfigParse.GetMultipleStr<int>(BountyMissionsTypeList.Numerical1);//璧忛噾
string[] strBountyMissionsType1 = ConfigParse.GetMultipleStr(BountyMissionsTypeList.Numerical2);//璧忛噾
for (int i = 0; i < strBountyMissionsType.Length; i++)
@@ -477,7 +477,7 @@
BountyMissionsTypeKey.Add(strBountyMissionsType1[i]);
}
- var FairyAuMissionTypeList = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("FairyAuMissionType");
+ var FairyAuMissionTypeList = Config.Instance.Get<FuncConfigConfig>("FairyAuMissionType");
int[] strFairyAuMissionType = ConfigParse.GetMultipleStr<int>(FairyAuMissionTypeList.Numerical1);//浠欑洘
string[] strFairyAuMissionType1 = ConfigParse.GetMultipleStr(FairyAuMissionTypeList.Numerical2);//浠欑洘
for (int i = 0; i < strFairyAuMissionType.Length; i++)
@@ -485,12 +485,12 @@
FairyAuMissionType.Add(strFairyAuMissionType[i]);
FairyAuMissionTypeKey.Add(strFairyAuMissionType1[i]);
}
- int[] strTranscript = ConfigParse.GetMultipleStr<int>(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("FBTaskColor").Numerical1);//璧忛噾鍓湰
+ int[] strTranscript = ConfigParse.GetMultipleStr<int>(Config.Instance.Get<FuncConfigConfig>("FBTaskColor").Numerical1);//璧忛噾鍓湰
for (int i = 0; i < strTranscript.Length; i++)
{
TranscriptTask.Add(strTranscript[i]);
}
- var DemonMissionTypeList1 = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("DemonMissionType");
+ var DemonMissionTypeList1 = Config.Instance.Get<FuncConfigConfig>("DemonMissionType");
int[] DemonMissionType = ConfigParse.GetMultipleStr<int>(DemonMissionTypeList1.Numerical1);//榄旀棌娉曞疂
string[] DemonMissionType1 = ConfigParse.GetMultipleStr(DemonMissionTypeList1.Numerical2);//榄旀棌娉曞疂
for (int i = 0; i < DemonMissionType.Length; i++)
@@ -501,7 +501,7 @@
}
if (FabaoDic.Count == 0)
{
- FabaoDic = ConfigParse.GetDic<int, int>(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MozhuTaskID").Numerical1);
+ FabaoDic = ConfigParse.GetDic<int, int>(Config.Instance.Get<FuncConfigConfig>("MozhuTaskID").Numerical1);
}
}
--
Gitblit v1.8.0