From b352ff5ef3b7dab39dc26793e2b2bf6a3efce1b1 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 29 九月 2018 20:24:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskListTip.cs | 60 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index 8d2c628..f88ac68 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -219,7 +219,11 @@
var inDungeon = IsDungeon();
if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !inDungeon)
{
- TaskAddAndDelete();
+ if (MissionState != 0)
+ {
+ TaskAddAndDelete(MissionID);
+ }
+
}
TaskJump(MissionID);
}
@@ -243,33 +247,55 @@
}
SetLength();
}
- private void TaskAddAndDelete()
+ private void TaskAddAndDelete(int TaskID)
{
+ //for (int i = 0; i < Content.childCount; i++)
+ //{
+ // GameObject childObj = Content.GetChild(i).gameObject;
+ // TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
+ // if (i < _list.Count)
+ // {
+ // if (!childObj.activeSelf)
+ // {
+ // childObj.SetActive(true);
+ // }
+ // childObjTaskType.TaskID = _list[i];
+ // childObjTaskType.IsGameObjectName(_list[i]);
+ // childObjTaskType.IsMysteriousTask();
+ // childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(_list[i]);
+ // }
+ // else
+ // {
+ // childObjTaskType.ClearTaskName();
+ // if (childObj.activeSelf)
+ // {
+ // childObj.SetActive(false);
+ // }
+ // }
+
+ //}
for (int i = 0; i < Content.childCount; i++)
{
- GameObject childObj = Content.GetChild(i).gameObject;
- TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
if (i < _list.Count)
{
- if (!childObj.activeSelf)
+ GameObject obj = Content.GetChild(i).gameObject;
+ TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
+ if (childObjTaskType.TaskID == TaskID)
{
- childObj.SetActive(true);
+ return;
}
- childObjTaskType.TaskID = _list[i];
- childObjTaskType.IsGameObjectName(_list[i]);
- childObjTaskType.IsMysteriousTask();
- childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(_list[i]);
- }
- else
- {
- childObjTaskType.ClearTaskName();
- if (childObj.activeSelf)
+ if (childObjTaskType.TaskID == 0)
{
- childObj.SetActive(false);
+ obj.SetActive(true);
+ childObjTaskType.TaskID = TaskID;
+ childObjTaskType.IsGameObjectName(TaskID);
+ childObjTaskType.IsMysteriousTask();
+ obj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(TaskID);
}
}
-
+
}
+ ChangeSort();//鍏充簬浠诲姟鍙樻洿鎺掑簭
SetLength();
}
--
Gitblit v1.8.0