From 038066e91398f2ae615cb731a5a24b141a6e18ce Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 10 四月 2019 15:53:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/DailyQuest/DailyQuestModel.cs | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/System/DailyQuest/DailyQuestModel.cs b/System/DailyQuest/DailyQuestModel.cs
index 1a31c1f..d6c86b6 100644
--- a/System/DailyQuest/DailyQuestModel.cs
+++ b/System/DailyQuest/DailyQuestModel.cs
@@ -209,8 +209,7 @@
case DailyQuestType.FairyFeast:
case DailyQuestType.FairyTask:
case DailyQuestType.FairyGrabBoss:
- case DailyQuestType.AllianceBoss1:
- case DailyQuestType.AllianceBoss2:
+ case DailyQuestType.AllianceBoss:
return defaultUnlock && PlayerDatas.Instance.baseData.FamilyId > 0;
case DailyQuestType.RuneTowerSweep:
return ModelCenter.Instance.GetModel<RuneTowerModel>().yesterdayPassFloor > 0;
@@ -479,8 +478,7 @@
private void AllianceBossStateRefresh()
{
- UpdateDailyActionRedpoint((int)DailyQuestType.AllianceBoss1);
- UpdateDailyActionRedpoint((int)DailyQuestType.AllianceBoss2);
+ UpdateDailyActionRedpoint((int)DailyQuestType.AllianceBoss);
}
private void OnPlayerDataRefresh(PlayerDataType _refreshType)
@@ -589,8 +587,7 @@
}
break;
case DailyQuestType.FairyGrabBoss:
- case DailyQuestType.AllianceBoss1:
- case DailyQuestType.AllianceBoss2:
+ case DailyQuestType.AllianceBoss:
if (dailyQuestState == DailyQuestState.Normal)
{
dailyQuest.redpoint.state = completedTimes >= totalTimes ? RedPointState.None : RedPointState.Simple;
@@ -819,8 +816,7 @@
return DailyQuestState.Normal;
}
break;
- case DailyQuestType.AllianceBoss1:
- case DailyQuestType.AllianceBoss2:
+ case DailyQuestType.AllianceBoss:
if (allianceBossModel.isActivityOver)
{
return DailyQuestState.Completed;
@@ -885,8 +881,7 @@
var _fairyModel = ModelCenter.Instance.GetModel<FairyModel>();
switch (type)
{
- case DailyQuestType.AllianceBoss1:
- case DailyQuestType.AllianceBoss2:
+ case DailyQuestType.AllianceBoss:
if (!PlayerDatas.Instance.fairyData.HasFairy)
{
return Language.Get("DailyQuestWin_Participate");
--
Gitblit v1.8.0