From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/SystemSetting/SetPrivateModel.cs | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/System/SystemSetting/SetPrivateModel.cs b/System/SystemSetting/SetPrivateModel.cs
index 5fae90a..dde2b51 100644
--- a/System/SystemSetting/SetPrivateModel.cs
+++ b/System/SystemSetting/SetPrivateModel.cs
@@ -9,11 +9,7 @@
{
public class SetPrivateModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk
{
- DailyQuestModel m_dailyModel;
- DailyQuestModel dailyModel
- {
- get { return m_dailyModel ?? (m_dailyModel = ModelCenter.Instance.GetModel<DailyQuestModel>()); }
- }
+ DailyQuestModel dailyModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }
public List<int> hangUpPushlist = new List<int>();
@@ -146,7 +142,7 @@
List<int> dailyIdlist = GetOpenDailyIdlist(true);
for (int i = 0; i < dailyIdlist.Count; i++)
{
- bool isOpen = GetSwitchStateByIndex(GetSwitchIndexById(dailyIdlist[i]));
+ bool isOpen = GetSwitchStateByIndex(GetSwitchIndexById(dailyIdlist[i], dailyIdlist));
if (isOpen)
{
List<JsonData> pushNotifylist = GetPushJsonData(dailyIdlist[i]);
@@ -459,9 +455,8 @@
}
}
- public int GetSwitchIndexById(int id)
+ public int GetSwitchIndexById(int id, List<int> quests)
{
- var quests = dailyModel.GetDailyQuests(DailyQuestModel.DailyQuestCategory.TimeLimit);
for (int i = 0; i < quests.Count; i++)
{
if (quests[i] == id)
@@ -513,15 +508,17 @@
private void RefreshDailyQuest()
{
- foreach (var dailyQuest in dailyModel.GetDailyQuestlist().Values)
+ var quests = dailyModel.GetDailyQuests(DailyQuestModel.DailyQuestCategory.TimeLimit);
+ foreach (var dailyQuest in dailyModel.GetDailyQuests())
{
- var isUnLocked = TestDailyQuestUnLock(dailyQuest.id);
+ var isUnLocked = TestDailyQuestUnLock(dailyQuest);
if (isUnLocked)
{
- ModelCenter.Instance.GetModel<SetPrivateModel>().CheckActivityOpenTime(dailyQuest.id);
+ CheckActivityOpenTime(dailyQuest, quests);
}
}
}
+
public bool TestDailyQuestUnLock(int _dailyQuestId)
{
switch ((DailyQuestType)_dailyQuestId)
@@ -541,9 +538,11 @@
}
- public void CheckActivityOpenTime(int dailyId)
+ public void CheckActivityOpenTime(int dailyId, List<int> quests)
{
- bool isOpen = GetSwitchStateByIndex(GetSwitchIndexById(dailyId));
+
+ bool isOpen = GetSwitchStateByIndex(GetSwitchIndexById(dailyId, quests));
+
if (!isOpen)
return;
--
Gitblit v1.8.0