From fd0355c6c9a8c18126376e474d0e35f4ad57e10b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 03 九月 2018 09:53:38 +0800
Subject: [PATCH] 3160 仙盟联赛添加仙盟等级限制

---
 System/DailyQuest/DailyQuestModel.cs |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/System/DailyQuest/DailyQuestModel.cs b/System/DailyQuest/DailyQuestModel.cs
index 96c998e..6cc1377 100644
--- a/System/DailyQuest/DailyQuestModel.cs
+++ b/System/DailyQuest/DailyQuestModel.cs
@@ -214,7 +214,6 @@
         {
             switch ((DailyQuestType)_dailyQuestId)
             {
-                case DailyQuestType.FairyLeague:
                 case DailyQuestType.FairyFeast:
                 case DailyQuestType.FairyTask:
                 case DailyQuestType.FairyGrabBoss:
@@ -225,8 +224,12 @@
                     return ModelCenter.Instance.GetModel<RuneTowerModel>().yesterdayPassFloor > 0;
                 case DailyQuestType.GuardSky:
                     var _dailyGuardSkyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);
-                    bool _isOpen = _dailyGuardSkyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyGuardSkyConfig.UnLockFuncID);
-                    return fairyModel.SatisfyGuardSkyFairyLv() && _isOpen;
+                    bool _isGuardSkyOpen = _dailyGuardSkyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyGuardSkyConfig.UnLockFuncID);
+                    return fairyModel.SatisfyGuardSkyFairyLv() && _isGuardSkyOpen;
+                case DailyQuestType.FairyLeague:
+                    var _dailyFairyLeagueConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);
+                    bool _isFairyLeagueOpen = _dailyFairyLeagueConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyFairyLeagueConfig.UnLockFuncID);
+                    return fairyModel.SatisfyOpenFairyLeagueLv() && _isFairyLeagueOpen;
                 default:
                     var dailyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);
                     return dailyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(dailyConfig.UnLockFuncID);
@@ -501,6 +504,7 @@
         private void OnRefreshFairyInfo()
         {
             UpdateDailyActionRedpoint((int)DailyQuestType.GuardSky);
+            UpdateDailyActionRedpoint((int)DailyQuestType.FairyLeague);
         }
 
         private void OnPlayerDataRefresh(PlayerDataRefresh _refreshType, int _value)
@@ -880,7 +884,7 @@
         {
             var type = (DailyQuestType)_dailyQuestId;
             var dailyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);
-            if (type == DailyQuestType.FairyFeast || type == DailyQuestType.FairyLeague || type == DailyQuestType.FairyTask || type == DailyQuestType.FairyGrabBoss)
+            if (type == DailyQuestType.FairyFeast || type == DailyQuestType.FairyTask || type == DailyQuestType.FairyGrabBoss)
             {
                 if (PlayerDatas.Instance.fairyData.HasFairy)
                 {
@@ -892,6 +896,7 @@
                 }
             }
 
+            var _fairyModel = ModelCenter.Instance.GetModel<FairyModel>();
             switch (type)
             {
                 case DailyQuestType.GuardSky:
@@ -899,12 +904,21 @@
                     {
                         return Language.Get("DailyQuestWin_Participate");
                     }
-                    var _fairyModel = ModelCenter.Instance.GetModel<FairyModel>();
                     if (!_fairyModel.SatisfyGuardSkyFairyLv())
                     {
                         return Language.Get("DailyquestXMLevel", _fairyModel.guardSkyOpenFairyLv);
                     }
                     break;
+                case DailyQuestType.FairyLeague:
+                    if (!PlayerDatas.Instance.fairyData.HasFairy)
+                    {
+                        return Language.Get("DailyQuestWin_Participate");
+                    }
+                    if (!_fairyModel.SatisfyOpenFairyLeagueLv())
+                    {
+                        return Language.Get("DailyquestXMLevel", _fairyModel.fairyLeagueLimit);
+                    }
+                    break;
             }
 
             var description = string.Empty;

--
Gitblit v1.8.0