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/PlayerTaskDatas.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerTaskDatas.cs b/System/MainInterfacePanel/PlayerTaskDatas.cs
index 6b1e3ba..90a1e6f 100644
--- a/System/MainInterfacePanel/PlayerTaskDatas.cs
+++ b/System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -139,14 +139,14 @@
StageManager.Instance.onStageLoadFinish += onStageLoadFinish;
NPCInteractProcessor.s_NpcInteractEvent += NpcInterac;
FaBaoNPCIdList.Clear();
- string strFabao = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("FaBaoNPCID").Numerical1;
+ string strFabao = Config.Instance.Get<FuncConfigConfig>("FaBaoNPCID").Numerical1;
string[] strFabaoNpcID = ConfigParse.GetMultipleStr(strFabao);//瑙ｆ瀽鍑烘暟缁剕
for (int i = 0; i < strFabaoNpcID.Length; i++)
{
FaBaoNPCIdList.Add(int.Parse(strFabaoNpcID[i]));
}
- string BossDelayTime = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("BossDelayTime").Numerical1;
+ string BossDelayTime = Config.Instance.Get<FuncConfigConfig>("BossDelayTime").Numerical1;
BossDelayTimeint = float.Parse(BossDelayTime);
}
@@ -203,7 +203,7 @@
{
try
{
- var pytaskM = ConfigManager.Instance.GetTemplate<PyTaskConfig>(MissionID);
+ var pytaskM = Config.Instance.Get<PyTaskConfig>(MissionID);
if (pytaskM == null)
{
return;
@@ -304,7 +304,7 @@
{
return;
}
- var config = ConfigManager.Instance.GetTemplate<StoryMissionsConfig>(taskID);
+ var config = Config.Instance.Get<StoryMissionsConfig>(taskID);
bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();
var treasureStageUpShow = ModelCenter.Instance.GetModel<TreasureModel>().treasureStageUpShow;
if (config != null)
@@ -369,7 +369,7 @@
void AddMission(int MissionID, int MissionState, int DiscriptionIndex)//娣诲姞浠诲姟
{
- var config = ConfigManager.Instance.GetTemplate<PyTaskConfig>(MissionID);
+ var config = Config.Instance.Get<PyTaskConfig>(MissionID);
if (config == null)
{
DebugEx.LogError(MissionID + "琛ㄦ牸涓笉瀛樺湪姝や换鍔D");
@@ -723,7 +723,7 @@
void TaskChanges(int MissionID, int MissionState, int DiscriptionIndex)//瀛樺湪鐨勪换鍔＄殑淇敼
{
- var pytaskM = ConfigManager.Instance.GetTemplate<PyTaskConfig>(MissionID);
+ var pytaskM = Config.Instance.Get<PyTaskConfig>(MissionID);
if (pytaskM == null)
return;
allMissionDict[MissionID].Time = DateTime.Now;
@@ -1293,7 +1293,7 @@
{
// GetNowTaskID = _taskID;
string _strTest = allMissionDict[_taskID].InforList;
- string strTask = TaskAllocation.Instance.GetTaskInfo(ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_strTest).show_writing, _taskID);
+ string strTask = TaskAllocation.Instance.GetTaskInfo(Config.Instance.Get<TASKINFOConfig>(_strTest).show_writing, _taskID);
HrefAnalysis.Inst.ExcuteHrefEvent(strTask);
DropItemManager.StopMissionPickup = false;
}
@@ -1408,12 +1408,12 @@
private bool IsDungeon()//鍒ゆ柇鏄惁鍦ㄥ壇鏈腑
{
var mapId = PlayerDatas.Instance.baseData.MapID;
- var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);
+ var mapConfig = Config.Instance.Get<MapConfig>(mapId);
return mapConfig != null && mapConfig.MapFBType != 0;
}
public bool IsGather(int npdId)//鏄惁鑳介噰闆哊PC
{
- var taskListConfig = ConfigManager.Instance.GetTemplate<TaskListConfig>(currentMission);
+ var taskListConfig = Config.Instance.Get<TaskListConfig>(currentMission);
if (taskListConfig != null)
{
int[] collectNPCList = taskListConfig.CollectNPC;
@@ -1466,7 +1466,7 @@
{
var mapModel = ModelCenter.Instance.GetModel<MapModel>();
var point = mapModel.GetRecommendHangPoint();
- var config = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(point);
+ var config = Config.Instance.Get<MapEventPointConfig>(point);
MapTransferUtility.Instance.MoveToNPC(config.NPCID);
}
--
Gitblit v1.8.0