From 8a345b8ee784063d94575c8df5e42f7f04090aab Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 10 四月 2019 14:05:43 +0800
Subject: [PATCH] Merge branch 'master' into HazyRegion

---
 System/Activity/ActivityModel.cs |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/System/Activity/ActivityModel.cs b/System/Activity/ActivityModel.cs
index fac1b47..9174569 100644
--- a/System/Activity/ActivityModel.cs
+++ b/System/Activity/ActivityModel.cs
@@ -301,8 +301,7 @@
                         }
                     }
                     break;
-                case DailyQuestType.AllianceBoss1:
-                case DailyQuestType.AllianceBoss2:
+                case DailyQuestType.AllianceBoss:
                     {
                         if (!PlayerDatas.Instance.fairyData.HasFairy)
                         {

--
Gitblit v1.8.0