From c5a1b1eb5f845f72b0b3e48fc8c7ccf75cee5831 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 09 十月 2018 10:30:32 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能
---
System/MainInterfacePanel/HoistingWin.cs | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/System/MainInterfacePanel/HoistingWin.cs b/System/MainInterfacePanel/HoistingWin.cs
index 81d1124..831ce4c 100644
--- a/System/MainInterfacePanel/HoistingWin.cs
+++ b/System/MainInterfacePanel/HoistingWin.cs
@@ -21,6 +21,7 @@
[SerializeField] Button PrayerButton;//绁堟効
[SerializeField] Button BountyTaskButton;//璧忛噾
[SerializeField] Button HangUpButton;//鎸傛満
+ [SerializeField] Button FairyTaskButton;//浠欑洘浠诲姟
private int number = 0;
DungeonModel m_DungeonModel;
DungeonModel dungeonModel { get { return m_DungeonModel ?? (m_DungeonModel = ModelCenter.Instance.GetModel<DungeonModel>()); } }
@@ -71,6 +72,11 @@
WorldBossButton.AddListener(() => {
Close();
WindowCenter.Instance.Open<FindPreciousFrameWin>();
+ });
+ FairyTaskButton.AddListener(()=>
+ {
+ Close();
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.UnionTask);
});
}
@@ -150,7 +156,14 @@
{
HangUpButton.gameObject.SetActive(false);
}
-
+ if (FuncOpen.Instance.IsFuncOpen(16) && TaskAllocation.Instance.FairyAuAllNumber()<70)//浠欑洘浠诲姟
+ {
+ FairyTaskButton.gameObject.SetActive(true);
+ }
+ else
+ {
+ FairyTaskButton.gameObject.SetActive(false);
+ }
for (int i = 0; i < Content.childCount; i++)
{
--
Gitblit v1.8.0