From 8b32c3fc56ce9e478f0b05055e2f8c9a88fd3156 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 11 三月 2019 13:14:35 +0800
Subject: [PATCH] Merge branch 'master' into Equip
---
System/Activity/ActivityModel.cs | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/System/Activity/ActivityModel.cs b/System/Activity/ActivityModel.cs
index 48af1f1..88be1f0 100644
--- a/System/Activity/ActivityModel.cs
+++ b/System/Activity/ActivityModel.cs
@@ -13,6 +13,7 @@
{
HeavenBattleModel battleModel { get { return ModelCenter.Instance.GetModel<HeavenBattleModel>(); } }
FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
+ AllianceBossModel allianceBossModel { get { return ModelCenter.Instance.GetModel<AllianceBossModel>(); } }
public override void Init()
{
var dic = DailyQuestConfig.GetValues();
@@ -227,6 +228,10 @@
public bool CheckLimit(int type)
{
DailyQuestConfig config = DailyQuestConfig.Get(type);
+ if (config == null)
+ {
+ return true;
+ }
switch ((DailyQuestType)type)
{
case DailyQuestType.FairyGrabBoss:
@@ -280,6 +285,15 @@
}
}
break;
+ case DailyQuestType.AllianceBoss1:
+ case DailyQuestType.AllianceBoss2:
+ {
+ if (allianceBossModel.isActivityOver)
+ {
+ return true;
+ }
+ }
+ break;
}
if (config.UnLockFuncID != 0)
{
--
Gitblit v1.8.0