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/PlayerTaskDatas.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerTaskDatas.cs b/System/MainInterfacePanel/PlayerTaskDatas.cs
index 8f6e410..26dea8a 100644
--- a/System/MainInterfacePanel/PlayerTaskDatas.cs
+++ b/System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -141,16 +141,16 @@
StageLoad.Instance.onStageLoadFinish += onStageLoadFinish;
NPCInteractProcessor.s_NpcInteractEvent += NpcInterac;
FaBaoNPCIdList.Clear();
- string strFabao = Config.Instance.Get<FuncConfigConfig>("FaBaoNPCID").Numerical1;
+ string strFabao = FuncConfigConfig.Get("FaBaoNPCID").Numerical1;
string[] strFabaoNpcID = ConfigParse.GetMultipleStr(strFabao);//瑙ｆ瀽鍑烘暟缁剕
for (int i = 0; i < strFabaoNpcID.Length; i++)
{
FaBaoNPCIdList.Add(int.Parse(strFabaoNpcID[i]));
}
- string BossDelayTime = Config.Instance.Get<FuncConfigConfig>("BossDelayTime").Numerical1;
+ string BossDelayTime = FuncConfigConfig.Get("BossDelayTime").Numerical1;
BossDelayTimeint = float.Parse(BossDelayTime);
- var Task_Auto = Config.Instance.Get<FuncConfigConfig>("TaskAuto");
+ var Task_Auto = FuncConfigConfig.Get("TaskAuto");
TaskAutoLv = int.Parse(Task_Auto.Numerical1);
TaskAutoTime = int.Parse(Task_Auto.Numerical2);
}
@@ -219,7 +219,7 @@
{
TaskupToDate = MissionID;
}
- var pytaskM = Config.Instance.Get<PyTaskConfig>(MissionID);
+ var pytaskM = PyTaskConfig.Get(MissionID);
if (pytaskM == null)
{
return;
@@ -348,7 +348,7 @@
{
return;
}
- var config = Config.Instance.Get<StoryMissionsConfig>(taskID);
+ var config = StoryMissionsConfig.Get(taskID);
bool IsOpenMain = WindowCenter.Instance.IsOpen<MainInterfaceWin>();
var treasureStageUpShow = ModelCenter.Instance.GetModel<TreasureModel>().treasureStageUpShow;
if (config != null)
@@ -418,7 +418,7 @@
void AddMission(int MissionID, int MissionState, int DiscriptionIndex)//娣诲姞浠诲姟
{
- var config = Config.Instance.Get<PyTaskConfig>(MissionID);
+ var config = PyTaskConfig.Get(MissionID);
if (config == null)
{
DebugEx.LogError(MissionID + "琛ㄦ牸涓笉瀛樺湪姝や换鍔D");
@@ -772,7 +772,7 @@
void TaskChanges(int MissionID, int MissionState, int DiscriptionIndex)//瀛樺湪鐨勪换鍔＄殑淇敼
{
- var pytaskM = Config.Instance.Get<PyTaskConfig>(MissionID);
+ var pytaskM = PyTaskConfig.Get(MissionID);
if (pytaskM == null)
return;
allMissionDict[MissionID].Time = DateTime.Now;
@@ -1448,12 +1448,12 @@
private bool IsDungeon()//鍒ゆ柇鏄惁鍦ㄥ壇鏈腑
{
var mapId = PlayerDatas.Instance.baseData.MapID;
- var mapConfig = Config.Instance.Get<MapConfig>(mapId);
+ var mapConfig = MapConfig.Get(mapId);
return mapConfig != null && mapConfig.MapFBType != 0;
}
public bool IsGather(int npdId)//鏄惁鑳介噰闆哊PC
{
- var taskListConfig = Config.Instance.Get<TaskListConfig>(currentMission);
+ var taskListConfig = TaskListConfig.Get(currentMission);
if (taskListConfig != null)
{
int[] collectNPCList = taskListConfig.CollectNPC;
@@ -1504,7 +1504,7 @@
{
var mapModel = ModelCenter.Instance.GetModel<MapModel>();
var point = mapModel.GetRecommendHangPoint();
- var config = Config.Instance.Get<MapEventPointConfig>(point);
+ var config = MapEventPointConfig.Get(point);
MapTransferUtility.Instance.MoveToNPC(config.NPCID);
}
@@ -1595,7 +1595,7 @@
if (allMissionDict.ContainsKey(_taskID) && !NewBieCenter.Instance.inGuiding)
{
string _strTest = allMissionDict[_taskID].InforList;
- string strTask = TaskAllocation.Instance.GetTaskInfo(Config.Instance.Get<TASKINFOConfig>(_strTest).show_writing, _taskID);
+ string strTask = TaskAllocation.Instance.GetTaskInfo(TASKINFOConfig.Get(_strTest).show_writing, _taskID);
HrefAnalysis.Inst.ExcuteHrefEvent(strTask);
DropItemManager.StopMissionPickup = false;
TaskAllocation.Instance.TaskTime = TimeUtility.ServerNow;
--
Gitblit v1.8.0