From 052bb69a8b50948052165847ea44312b8d4f6607 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 九月 2018 16:13:14 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/MainInterfacePanel/TaskListTip.cs | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index 2e6a6c0..f36c97b 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -99,6 +99,7 @@
PlayerTaskDatas.Event_TaskToDelete += OnTaskToDelete;//浠诲姟鐨勫垹闄�
PlayerTaskDatas.Event_TaskInformation += TaskInformation;//浠诲姟瀛楀吀淇℃伅
PlayerTaskDatas.MainCardLevelChange += MainCardLevelChange;//鍗＄骇浠诲姟淇敼
+ PlayerTaskDatas.CardLevelChange += CardLevelChangeEvent;//鍗＄骇浠诲姟鐘舵�佹敼鍙�
model.collectingTreasureChangeEvent += OnCollectingTreasureChangeEvent;
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
TreasureNewGotWin.CloseTreasureNewGotWinEvent += CloseTreasureNewGotWinEvent;
@@ -132,6 +133,7 @@
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
TreasureNewGotWin.CloseTreasureNewGotWinEvent -= CloseTreasureNewGotWinEvent;
PlayerTaskDatas.MainCardLevelChange -= MainCardLevelChange;//鍗＄骇浠诲姟淇敼
+ PlayerTaskDatas.CardLevelChange -= CardLevelChangeEvent;//鍗＄骇浠诲姟鐘舵�佹敼鍙�
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
}
@@ -153,6 +155,15 @@
}
}
+ private void CardLevelChangeEvent(int taskID)
+ {
+ if (taskmodel.allMissionDict.ContainsKey(taskID) && taskmodel.allMissionDict[taskID].Type == 3)
+ {
+ TaskScheduling();
+ TheTaskToGenerate();
+ TaskJump(taskID);
+ }
+ }
private void MainCardLevelChange(int _id)
{
TaskScheduling();
@@ -347,7 +358,7 @@
foreach (var key in taskmodel.MainTaskDic.Keys)
{
var State = taskmodel.GetTaskStatus(key);
- if (State == PlayerTaskDatas.TaskStatus.CardLevel)
+ if (State == PlayerTaskDatas.TaskStatus.TreasureCardLevel)
{
IsDefault = false;
}
@@ -371,6 +382,10 @@
{
return _index0.CompareTo(_index1);
}
+ if (xPack.LV.CompareTo(yPack.LV) != 0)
+ {
+ return -xPack.LV.CompareTo(yPack.LV);
+ }
return 1;
}
@@ -384,6 +399,11 @@
{
return _index0.CompareTo(_index1);
}
+ if (xPack.LV.CompareTo(yPack.LV) != 0)
+ {
+ return -xPack.LV.CompareTo(yPack.LV);
+ }
+
return 1;
}
--
Gitblit v1.8.0