From 48bbaa6f98423946430d4e07f5b0c02430a56ba4 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 16 一月 2019 14:23:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskListTip.cs | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index af8dffb..f8bcee3 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -204,7 +204,6 @@
}
}
SetLength();
-
for (int i = 0; i < _list.Count; i++)
{
if (i >= Content.childCount)
@@ -226,23 +225,6 @@
{
return;
}
- //var inDungeon = IsDungeon();
- //TaskScheduling();
- //if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !inDungeon)
- //{
- // if (MissionState != 0 && MissionID != 1 && _list.Contains(MissionID))
- // {
- // Selected();//閫変腑閫昏緫
- // TaskAddAndDelete(MissionID);
- // if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing)
- // {
- // return;
- // }
- // TaskJump(MissionID);
- // return;
- // }
-
- //}
if (Parent.gameObject.activeInHierarchy)
{
StartCoroutine(WaitAddTask(MissionID, MissionState));
@@ -307,6 +289,19 @@
return;
}
TaskScheduling();
+ bool _isBool = false;
+ for (int i = 0; i < _list.Count; i++)
+ {
+ if (taskmodel.SideQuestState(_list[i]) == 2)
+ {
+ _isBool = true;
+ }
+ }
+ if (_isBool)
+ {
+ TheTaskToGenerate();
+ return;
+ }
for (int i = 0; i < _list.Count; i++)
{
if (i <= Content.childCount - 1)
--
Gitblit v1.8.0