From a7c531aa353dae5b40b3c47f37211666ed0250a6 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 25 二月 2019 15:11:17 +0800
Subject: [PATCH] 3335 物品相关类型重构
---
System/MainInterfacePanel/TaskListTip.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index 1ce03e0..97dc9ad 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -31,8 +31,8 @@
List<int> _list = new List<int>();//鐢ㄦ潵鎺у埗杩涜鎺掑簭
TreasureModel m_Model;
TreasureModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TreasureModel>()); } }
- PlayerTaskDatas m_TaskModel;
- PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } }
+ TaskModel m_TaskModel;
+ TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } }
PackModel _playerPack;
PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }
PlayerMainDate m_MainModel;
@@ -94,12 +94,12 @@
ListSort1.Add(TaskSortType2[i]);
}
}
- PlayerTaskDatas.Event_TaskToAdd += TaskToAdd;//浠诲姟鐨勬坊鍔�
- PlayerTaskDatas.Event_TaskRefreshes += TaskRefreshes;//浠诲姟鐨勫埛鏂�
- PlayerTaskDatas.Event_TaskToDelete += OnTaskToDelete;//浠诲姟鐨勫垹闄�
- PlayerTaskDatas.Event_TaskInformation += TaskInformation;//浠诲姟瀛楀吀淇℃伅
- PlayerTaskDatas.MainCardLevelChange += MainCardLevelChange;//鍗＄骇浠诲姟淇敼
- PlayerTaskDatas.CardLevelChange += CardLevelChangeEvent;//鍗＄骇浠诲姟鐘舵�佹敼鍙�
+ TaskModel.Event_TaskToAdd += TaskToAdd;//浠诲姟鐨勬坊鍔�
+ TaskModel.Event_TaskRefreshes += TaskRefreshes;//浠诲姟鐨勫埛鏂�
+ TaskModel.Event_TaskToDelete += OnTaskToDelete;//浠诲姟鐨勫垹闄�
+ TaskModel.Event_TaskInformation += TaskInformation;//浠诲姟瀛楀吀淇℃伅
+ TaskModel.MainCardLevelChange += MainCardLevelChange;//鍗＄骇浠诲姟淇敼
+ TaskModel.CardLevelChange += CardLevelChangeEvent;//鍗＄骇浠诲姟鐘舵�佹敼鍙�
model.collectingTreasureChangeEvent += OnCollectingTreasureChangeEvent;
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
TreasureNewGotWin.CloseTreasureNewGotWinEvent += CloseTreasureNewGotWinEvent;
@@ -127,14 +127,14 @@
{
m_HumanTreasure.Dispose();
model.collectingTreasureChangeEvent -= OnCollectingTreasureChangeEvent;
- PlayerTaskDatas.Event_TaskRefreshes -= TaskRefreshes;//浠诲姟鐨勫埛鏂�
- PlayerTaskDatas.Event_TaskToAdd -= TaskToAdd;//浠诲姟鐨勬坊鍔�
- PlayerTaskDatas.Event_TaskToDelete -= OnTaskToDelete;//浠诲姟鐨勫垹闄�
- PlayerTaskDatas.Event_TaskInformation -= TaskInformation;//浠诲姟瀛楀吀淇℃伅
+ TaskModel.Event_TaskRefreshes -= TaskRefreshes;//浠诲姟鐨勫埛鏂�
+ TaskModel.Event_TaskToAdd -= TaskToAdd;//浠诲姟鐨勬坊鍔�
+ TaskModel.Event_TaskToDelete -= OnTaskToDelete;//浠诲姟鐨勫垹闄�
+ TaskModel.Event_TaskInformation -= TaskInformation;//浠诲姟瀛楀吀淇℃伅
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
TreasureNewGotWin.CloseTreasureNewGotWinEvent -= CloseTreasureNewGotWinEvent;
- PlayerTaskDatas.MainCardLevelChange -= MainCardLevelChange;//鍗＄骇浠诲姟淇敼
- PlayerTaskDatas.CardLevelChange -= CardLevelChangeEvent;//鍗＄骇浠诲姟鐘舵�佹敼鍙�
+ TaskModel.MainCardLevelChange -= MainCardLevelChange;//鍗＄骇浠诲姟淇敼
+ TaskModel.CardLevelChange -= CardLevelChangeEvent;//鍗＄骇浠诲姟鐘舵�佹敼鍙�
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
StopAllCoroutines();
}
@@ -408,7 +408,7 @@
foreach (var key in taskmodel.SideQuestsDic.Keys)
{
var State = taskmodel.GetTaskStatus(key);
- if (State == PlayerTaskDatas.TaskStatus.CardLevel)
+ if (State == TaskModel.TaskStatus.CardLevel)
{
IsDefault = false;
}
@@ -546,7 +546,7 @@
private void Selected()//閫変腑閫昏緫淇敼
{
- if (taskmodel.GetTaskStatus(taskmodel.GetNowTaskID) == PlayerTaskDatas.TaskStatus.CardLevel)
+ if (taskmodel.GetTaskStatus(taskmodel.GetNowTaskID) == TaskModel.TaskStatus.CardLevel)
{
bool _IsBool = false;
var taskList = TaskListConfig.Get(taskmodel.GetNowTaskID);
@@ -556,7 +556,7 @@
}
for (int i = 0; i < _list.Count; i++)
{
- if (taskmodel.GetTaskStatus(_list[i]) != PlayerTaskDatas.TaskStatus.CardLevel)
+ if (taskmodel.GetTaskStatus(_list[i]) != TaskModel.TaskStatus.CardLevel)
{
if (_IsBool)//涓荤嚎鍗＄骇
{
--
Gitblit v1.8.0