From 5065f6fada294a9d35c851b7b53a0e538fbbfbb3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 12 九月 2018 10:11:55 +0800
Subject: [PATCH] 3335 代码维护 ，整理dailyquestmodel代码
---
System/DailyQuest/DailyQuestModel.cs | 57 ++++++++++++++++++++-------------------------------------
1 files changed, 20 insertions(+), 37 deletions(-)
diff --git a/System/DailyQuest/DailyQuestModel.cs b/System/DailyQuest/DailyQuestModel.cs
index b825ade..9748735 100644
--- a/System/DailyQuest/DailyQuestModel.cs
+++ b/System/DailyQuest/DailyQuestModel.cs
@@ -30,31 +30,26 @@
public Redpoint trialExchangeRedpoint = new Redpoint(EVERYDAY_REDPOINTID, TRIALEXCHANGE_REDPOINTID);
int m_DailyQuestTotalActiveValue = 150;
- public int dailyQuestTotalActiveValue
- {
+ public int dailyQuestTotalActiveValue {
get { return m_DailyQuestTotalActiveValue; }
}
int m_CurrentDailyQuest = 0;
- public int currentDailyQuest
- {
+ public int currentDailyQuest {
get { return this.m_CurrentDailyQuest; }
set { this.m_CurrentDailyQuest = value; }
}
int m_CurrentRewardStageIndex = 0;
- public int currentRewardStageIndex
- {
+ public int currentRewardStageIndex {
get { return m_CurrentRewardStageIndex; }
private set { m_CurrentRewardStageIndex = value; }
}
int m_TotalActiveValue = 0;
- public int totalActiveValue
- {
+ public int totalActiveValue {
get { return m_TotalActiveValue; }
- private set
- {
+ private set {
if (m_TotalActiveValue != value)
{
m_TotalActiveValue = value;
@@ -68,11 +63,9 @@
}
int m_GotableRealmPoint;
- public int gotableRealmPoint
- {
+ public int gotableRealmPoint {
get { return m_GotableRealmPoint; }
- private set
- {
+ private set {
if (m_GotableRealmPoint != value)
{
m_GotableRealmPoint = value;
@@ -210,29 +203,26 @@
return false;
}
- public bool TestDailyQuestUnLock(int _dailyQuestId)
+ public bool IsDailyQuestUnLock(int _dailyQuestId)
{
+ var config = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);
+ var unlockFunctionId = config.UnLockFuncID;
+ var defaultUnlock = unlockFunctionId == 0 || FuncOpen.Instance.IsFuncOpen(unlockFunctionId);
+
switch ((DailyQuestType)_dailyQuestId)
{
case DailyQuestType.FairyFeast:
case DailyQuestType.FairyTask:
case DailyQuestType.FairyGrabBoss:
- var _dailyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);
- return PlayerDatas.Instance.baseData.Family > 0 &&
- (_dailyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyConfig.UnLockFuncID));
+ return defaultUnlock && PlayerDatas.Instance.baseData.Family > 0;
case DailyQuestType.RuneTowerSweep:
return ModelCenter.Instance.GetModel<RuneTowerModel>().yesterdayPassFloor > 0;
case DailyQuestType.GuardSky:
- var _dailyGuardSkyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);
- bool _isGuardSkyOpen = _dailyGuardSkyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyGuardSkyConfig.UnLockFuncID);
- return fairyModel.SatisfyGuardSkyFairyLv() && _isGuardSkyOpen;
+ return defaultUnlock && fairyModel.SatisfyGuardSkyFairyLv();
case DailyQuestType.FairyLeague:
- var _dailyFairyLeagueConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);
- bool _isFairyLeagueOpen = _dailyFairyLeagueConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyFairyLeagueConfig.UnLockFuncID);
- return fairyModel.SatisfyOpenFairyLeagueLv() && _isFairyLeagueOpen;
+ return defaultUnlock && fairyModel.SatisfyOpenFairyLeagueLv();
default:
- var dailyConfig = Config.Instance.Get<DailyQuestConfig>(_dailyQuestId);
- return dailyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(dailyConfig.UnLockFuncID);
+ return defaultUnlock;
}
}
@@ -267,14 +257,7 @@
case 16:
return ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.BossHomeAwardLimit);
default:
- if (dailyQuestOpenTime.DayReKind > 0)
- {
- return dailyQuestOpenTime.DayTimes;
- }
- else
- {
- return dailyQuestOpenTime.WeekTimes;
- }
+ return dailyQuestOpenTime.DayReKind > 0 ? dailyQuestOpenTime.DayTimes : dailyQuestOpenTime.WeekTimes;
}
}
else
@@ -705,8 +688,8 @@
private int TimeLimitQuestCompare(int _lhs, int _rhs)
{
- var unLock1 = TestDailyQuestUnLock(_lhs);
- var unLock2 = TestDailyQuestUnLock(_rhs);
+ var unLock1 = IsDailyQuestUnLock(_lhs);
+ var unLock2 = IsDailyQuestUnLock(_rhs);
if (unLock1 && !unLock2)
{
@@ -794,7 +777,7 @@
public DailyQuestState GetQuestState(int _dailyQuestId)
{
- var isUnLocked = TestDailyQuestUnLock(_dailyQuestId);
+ var isUnLocked = IsDailyQuestUnLock(_dailyQuestId);
if (!isUnLocked)
{
return DailyQuestState.Locked;
--
Gitblit v1.8.0