From 3a4eb38542bf8cc2cdf7f835a559ade8a8457ea3 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 29 九月 2018 03:02:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 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