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/ActivityModel.cs |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/System/Activity/ActivityModel.cs b/System/Activity/ActivityModel.cs
index 34aa948..d073854 100644
--- a/System/Activity/ActivityModel.cs
+++ b/System/Activity/ActivityModel.cs
@@ -219,6 +219,7 @@
             DailyQuestConfig cfg = Config.Instance.Get<DailyQuestConfig>(type);
             switch ((DailyQuestType)type)
             {
+                case DailyQuestType.FairyGrabBoss:
                 case DailyQuestType.FairyFeast:
                     {
                         if (!PlayerDatas.Instance.fairyData.HasFairy)
@@ -280,6 +281,13 @@
                     return true;
                 }
             }
+
+            switch ((DailyQuestType)type)
+            {
+                case DailyQuestType.FairyGrabBoss:
+                    return false;
+            }
+
             int entertimes = dailyQuestModel.GetDailyQuestCompletedTimes(type);
             if (dailyQuestModel.GetDailyQuestTotalTimes(cfg.ID) <= entertimes)
             {

--
Gitblit v1.8.0