From 703337574c8d4d4e852ea90c778e3aff3523ce12 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 九月 2018 15:12:31 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/MainInterfacePanel/TaskListTip.cs | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index 39d667e..fc42051 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -390,6 +390,19 @@
{
MissionDetailDates xPack = taskmodel.allMissionDict[x];
MissionDetailDates yPack = taskmodel.allMissionDict[y];
+ bool IsMainTaskx = xPack.Type == 0;
+ bool IsMainTasky = yPack.Type == 0;
+ if (IsMainTaskx.CompareTo(IsMainTasky) != 0)//浼樺厛涓荤嚎
+ {
+ return -IsMainTaskx.CompareTo(IsMainTasky);
+ }
+ bool IsStateTaskx = xPack.MissionState == 2;
+ bool IsStateTasky = yPack.MissionState == 2;
+ if (IsStateTaskx.CompareTo(IsStateTasky) != 0)//浼樺厛鍙鍙�
+ {
+ return -IsStateTaskx.CompareTo(IsStateTasky);
+ }
+
var _index0 = ListSort.IndexOf(xPack.Type);
var _index1 = ListSort.IndexOf(yPack.Type);
if (_index0.CompareTo(_index1) != 0)
@@ -407,6 +420,18 @@
{
MissionDetailDates xPack = taskmodel.allMissionDict[x];
MissionDetailDates yPack = taskmodel.allMissionDict[y];
+ bool IsMainTaskx = xPack.Type == 0;
+ bool IsMainTasky = yPack.Type == 0;
+ if (IsMainTaskx.CompareTo(IsMainTasky) != 0)//浼樺厛涓荤嚎
+ {
+ return -IsMainTaskx.CompareTo(IsMainTasky);
+ }
+ bool IsStateTaskx = xPack.MissionState == 2;
+ bool IsStateTasky = yPack.MissionState == 2;
+ if (IsStateTaskx.CompareTo(IsStateTasky) != 0)//浼樺厛鍙鍙�
+ {
+ return -IsStateTaskx.CompareTo(IsStateTasky);
+ }
var _index0 = ListSort1.IndexOf(xPack.Type);
var _index1 = ListSort1.IndexOf(yPack.Type);
if (_index0.CompareTo(_index1) != 0)
--
Gitblit v1.8.0