From 8ebdcb8980b7a630beb6a1ff82381baa0ab2ddb5 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期四, 04 七月 2019 13:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into LuaOrgan

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

diff --git a/System/SystemSetting/SetPrivateModel.cs b/System/SystemSetting/SetPrivateModel.cs
index 077a319..c137e59 100644
--- a/System/SystemSetting/SetPrivateModel.cs
+++ b/System/SystemSetting/SetPrivateModel.cs
@@ -539,8 +539,7 @@
                 case DailyQuestType.FairyFeast:
                 case DailyQuestType.FairyTask:
                     var _dailyConfig = DailyQuestConfig.Get(_dailyQuestId);
-                    return PlayerDatas.Instance.baseData.FamilyId > 0 &&
-                        (_dailyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyConfig.UnLockFuncID));
+                    return (_dailyConfig.UnLockFuncID == 0 || FuncOpen.Instance.IsFuncOpen(_dailyConfig.UnLockFuncID));
                 case DailyQuestType.RuneTowerSweep:
                     return ModelCenter.Instance.GetModel<RuneTowerModel>().yesterdayPassFloor > 0;
                 default:

--
Gitblit v1.8.0