Merge branch '2960仙盟抢Boss活动'

client_linchunjie

2018-08-30 0d371b91a3f7b193f7ea3c1bcde8226ca02275fd

 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)

            {