From f84fa9a681bb97fd7eb0bd01691459ba99eb477e Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期日, 30 九月 2018 15:50:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskListTip.cs | 145 ++++++++++++++++++++++--------------------------
1 files changed, 66 insertions(+), 79 deletions(-)
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index 12767f1..5e25378 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -141,20 +141,6 @@
{
}
- private void TaskIdUpdate(int taskId)
- {
- int leng = Content.childCount;
- for (int i = 0; i < leng; i++)
- {
- GameObject childObj = Content.GetChild(i).gameObject;
- TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
- if (childObj.activeSelf && childObjTaskType.TaskID == taskId)
- {
- childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(taskId);
- }
- }
- }
-
private void CardLevelChangeEvent(int taskID)//鍗＄骇鐘舵�佹敼鍙�
{
if (taskmodel.allMissionDict.ContainsKey(taskID) && taskmodel.allMissionDict[taskID].Type == 3)
@@ -215,86 +201,70 @@
}
void TaskToAdd(int MissionID, int MissionState, int DiscriptionIndex)//娣诲姞浠诲姟
{
- TaskScheduling();
+
var inDungeon = IsDungeon();
+ TaskScheduling();
if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !inDungeon)
{
- if (MissionState != 0)
- {
+ if (MissionState != 0 && MissionID!=1 && _list.Contains(MissionID))
+ {
TaskAddAndDelete(MissionID);
+ TaskJump(MissionID);
+ return;
}
}
- TaskJump(MissionID);
+
}
- void LodingDelTask(int TaskID)
- {
- int LengChild = Content.childCount;
- for (int i = 0; i < LengChild; i++)
- {
- TaskType taskType = Content.GetChild(i).GetComponent<TaskType>();
- FlyingShoesTask flyingShoesTask = Content.GetChild(i).GetComponent<FlyingShoesTask>();
- if (taskType.TaskID == TaskID && taskType.gameObject.activeSelf)
- {
- taskType.gameObject.SetActive(false);
- if (TaskID != taskmodel.GetNowTaskID && flyingShoesTask.ImgSelected.activeSelf)
- {
- flyingShoesTask.ImgSelected.SetActive(false);
- }
- flyingShoesTask.UIEffect.Play();
- }
- }
- SetLength();
- }
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);
// }
// }
//}
- for (int i = 0; i < Content.childCount; i++)
- {
- if (i < _list.Count)
- {
- GameObject obj = Content.GetChild(i).gameObject;
- TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
- if (childObjTaskType.TaskID == TaskID)
- {
- return;
- }
- if (childObjTaskType.TaskID == 0)
- {
- obj.SetActive(true);
- childObjTaskType.TaskID = TaskID;
- childObjTaskType.IsGameObjectName(TaskID);
- childObjTaskType.IsMysteriousTask();
- obj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(TaskID);
- }
- }
-
- }
ChangeSort();//鍏充簬浠诲姟鍙樻洿鎺掑簭
SetLength();
}
@@ -348,22 +318,39 @@
taskType.TaskID = 0;
taskType.ClearTaskName();
obj.SetActive(false);
- obj.transform.SetAsLastSibling();
+ obj.transform.SetAsLastSibling();
+ return;
}
}
}
private void ChangeSort()//鍏充簬浠诲姟鍙樻洿鎺掑簭
{
- for (int i = 0; i < Content.childCount; i++)
+
+ for (int i = 0; i < _list.Count; i++)
{
- GameObject obj = Content.GetChild(i).gameObject;
- TaskType taskType = obj.GetComponent<TaskType>();
- if (taskType.TaskID != 0 && _list.Contains(taskType.TaskID))
+
+ for (int j = 0; j < Content.childCount; j++)
{
- int Inedx = _list.IndexOf(taskType.TaskID);
- obj.transform.SetSiblingIndex(Inedx);
+ GameObject obj = Content.GetChild(j).gameObject;
+ TaskType taskType = obj.GetComponent<TaskType>();
+ if (taskType.TaskID != 0 && taskType.TaskID == _list[i])
+ {
+ int Inedx = _list.IndexOf(taskType.TaskID);
+ obj.transform.SetSiblingIndex(Inedx);
+ }
}
+
}
+ //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);
+ // }
+ //}
}
--
Gitblit v1.8.0