From 3498da7e8046ac2543372bdf6d302a86002648c0 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 03 九月 2018 13:51:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskListTip.cs | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index 3fe6fb0..37be57d 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -37,7 +37,6 @@
PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } }
PlayerMainDate m_MainModel;
PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }
- List<int> RenzhuTaskIDList = new List<int>();//娉曞疂浠诲姟鏁扮粍ID
List<int> ListSort = new List<int>();//鐢ㄤ簬鎺掑垪椤哄簭(鏈崱绾�)
List<int> ListSort1 = new List<int>();//鐢ㄤ簬鎺掑簭锛堝崱绾э級
private void Start()
@@ -95,15 +94,6 @@
ListSort1.Add(TaskSortType2[i]);
}
}
- if (RenzhuTaskIDList.Count <= 0)
- {
- int[] RenzhuTaskID1 = ConfigParse.GetMultipleStr<int>(RenzhuTaskID.Numerical1);
- for (int i = 0; i < RenzhuTaskID1.Length; i++)
- {
- RenzhuTaskIDList.Add(RenzhuTaskID1[i]);
- }
- }
-
PlayerTaskDatas.Event_TaskToAdd += TaskToAdd;//浠诲姟鐨勬坊鍔�
PlayerTaskDatas.Event_TaskRefreshes += TaskRefreshes;//浠诲姟鐨勫埛鏂�
PlayerTaskDatas.Event_TaskToDelete += OnTaskToDelete;//浠诲姟鐨勫垹闄�
@@ -211,7 +201,7 @@
TaskScheduling();
bool IsDefault = true;
var State = taskmodel.GetTaskStatus(_id);
- if (State == PlayerTaskDatas.TaskStatus.CardLevel || (State == PlayerTaskDatas.TaskStatus.TreasureCardLevel && !RenzhuTaskIDList.Contains(_id)))
+ if (State == PlayerTaskDatas.TaskStatus.CardLevel)
{
IsDefault = false;
}
@@ -399,7 +389,7 @@
foreach (var key in taskmodel.MainTaskDic.Keys)
{
var State = taskmodel.GetTaskStatus(key);
- if (State == PlayerTaskDatas.TaskStatus.CardLevel || (State == PlayerTaskDatas.TaskStatus.TreasureCardLevel && !RenzhuTaskIDList.Contains(key)))
+ if (State == PlayerTaskDatas.TaskStatus.CardLevel)
{
IsDefault = false;
}
--
Gitblit v1.8.0