From 0d371b91a3f7b193f7ea3c1bcde8226ca02275fd Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 30 八月 2018 10:07:21 +0800
Subject: [PATCH] Merge branch '2960仙盟抢Boss活动'

---
 System/Activity/ActivityNotifyBehaviour.cs |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/System/Activity/ActivityNotifyBehaviour.cs b/System/Activity/ActivityNotifyBehaviour.cs
index c2fb2d8..93c1378 100644
--- a/System/Activity/ActivityNotifyBehaviour.cs
+++ b/System/Activity/ActivityNotifyBehaviour.cs
@@ -53,18 +53,23 @@
 
         private void OnConfirmClick()
         {
-            if((DailyQuestType)m_NotifyType != DailyQuestType.WyTaiChi)
+            switch ((DailyQuestType)m_NotifyType)
             {
-                if (PlayerDatas.Instance.extersion.pkState == 1)
-                {
-                    SysNotifyMgr.Instance.ShowTip("PK_Leave");
-                    return;
-                }
-                if (PlayerDatas.Instance.extersion.bossState == 1)
-                {
-                    SysNotifyMgr.Instance.ShowTip("Boss_Leave");
-                    return;
-                }
+                case DailyQuestType.FairyGrabBoss:
+                case DailyQuestType.WyTaiChi:
+                    break;
+                default:
+                    if (PlayerDatas.Instance.extersion.pkState == 1)
+                    {
+                        SysNotifyMgr.Instance.ShowTip("PK_Leave");
+                        return;
+                    }
+                    if (PlayerDatas.Instance.extersion.bossState == 1)
+                    {
+                        SysNotifyMgr.Instance.ShowTip("Boss_Leave");
+                        return;
+                    }
+                    break;
             }
          
             var config = Config.Instance.Get<DailyQuestConfig>((int)m_NotifyType);
@@ -121,6 +126,9 @@
                     case DailyQuestType.FairyLeague:
                         WindowCenter.Instance.Open<UnionPanel>(false, 4);
                         break;
+                    case DailyQuestType.FairyGrabBoss:
+                        WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 1);
+                        break;
                 }
             }
             else

--
Gitblit v1.8.0