From a9e38b4e71b887c89cb35c7b06392b286de590bf Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 03 九月 2018 10:04:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
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 0147737..789a942 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)
@@ -887,7 +891,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)
{
@@ -899,6 +903,7 @@
}
}
+ var _fairyModel = ModelCenter.Instance.GetModel<FairyModel>();
switch (type)
{
case DailyQuestType.GuardSky:
@@ -906,12 +911,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