From f2cd8cf71a54e251e5f507c7d69c6f91f90e5074 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 25 九月 2018 20:23:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskListTip.cs | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index f36c97b..fc42051 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -155,19 +155,19 @@
}
}
- private void CardLevelChangeEvent(int taskID)
+ private void CardLevelChangeEvent(int taskID)//鍗＄骇鐘舵�佹敼鍙�
{
if (taskmodel.allMissionDict.ContainsKey(taskID) && taskmodel.allMissionDict[taskID].Type == 3)
{
TaskScheduling();
- TheTaskToGenerate();
+ ChangeSort();
TaskJump(taskID);
}
}
- private void MainCardLevelChange(int _id)
+ private void MainCardLevelChange(int _id)//涓荤嚎浠诲姟鍗＄骇鐘舵�佹敼鍙�
{
- TaskScheduling();
- TheTaskToGenerate();
+ TaskScheduling();
+ ChangeSort();
TaskJump(_id);
}
@@ -326,6 +326,20 @@
}
}
}
+ private void ChangeSort()//鍏充簬浠诲姟鍙樻洿鎺掑簭
+ {
+ for (int i = 0; i < Content.childCount; i++)
+ {
+ GameObject obj = Content.GetChild(i).gameObject;
+ TaskType taskType = obj.GetComponent<TaskType>();
+ if (taskType.TaskID != 0 && _list.Contains(taskType.TaskID))
+ {
+ int Inedx = _list.IndexOf(taskType.TaskID);
+ obj.transform.SetSiblingIndex(Inedx);
+ }
+ }
+ }
+
void TaskInformation(int _Taskid, Dictionary<int, Dictionary<string, string>> _Dic)//浠诲姟瀛楀吀淇℃伅
{
@@ -376,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)
@@ -393,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