From 3bbbe927f77b4c732c333e3119e7acf9811082c1 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 20 五月 2019 14:08:26 +0800
Subject: [PATCH] Merge branch 'master' into ClientPreciousDungeon
---
System/MainInterfacePanel/FlyingShoesTask.cs | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/System/MainInterfacePanel/FlyingShoesTask.cs b/System/MainInterfacePanel/FlyingShoesTask.cs
index 7775d9a..8e20ced 100644
--- a/System/MainInterfacePanel/FlyingShoesTask.cs
+++ b/System/MainInterfacePanel/FlyingShoesTask.cs
@@ -345,20 +345,19 @@
m_parent.GetChild(i).GetComponent<FlyingShoesTask>().ImgSelected.SetActive(true);
}
}
- m_DeliveryButton.gameObject.SetActive(true);
+
+ m_DeliveryButton.gameObject.SetActive(false);
+
if (!taskmodel.allMissionDict.ContainsKey(TaskID))
{
return;
}
- if ((int)taskmodel.GetTaskStatus(TaskID) > 0)
+ var satisfyFly = true;
+ if (!FuncOpen.Instance.IsFuncOpen(176) ||
+ taskmodel.GetTaskStatus(TaskID) > 0)
{
- m_DeliveryButton.gameObject.SetActive(false);
- IsKaJiBool = true;
- }
- else
- {
- IsKaJiBool = false;
+ satisfyFly = false;
}
if (taskmodel.allMissionDict[TaskID].MissionState == 2)
@@ -403,14 +402,13 @@
return;
}
bool isOPenTransferButton = HrefAnalysis.Inst.ContainsKey(taskinfo.show_writing, "flynpc");
- if (isOPenTransferButton && !IsKaJiBool)
+ if (satisfyFly && !isOPenTransferButton)
{
- m_DeliveryButton.gameObject.SetActive(true);
+ satisfyFly = false;
}
- else
- {
- m_DeliveryButton.gameObject.SetActive(false);
- }
+
+ m_DeliveryButton.gameObject.SetActive(satisfyFly);
+
m_ContentText.raycastTarget = false;
if (taskmodel._DicTaskInformation.ContainsKey(TaskID))
{
--
Gitblit v1.8.0