From db0192c0e911dc86d828ec650e995282e6eacdf2 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 17 九月 2018 15:09:12 +0800
Subject: [PATCH] Merge branch '3442运营活动修改'
---
System/Welfare/ConsumeRebateModel.cs | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/System/Welfare/ConsumeRebateModel.cs b/System/Welfare/ConsumeRebateModel.cs
index 87a3e79..93fd30b 100644
--- a/System/Welfare/ConsumeRebateModel.cs
+++ b/System/Welfare/ConsumeRebateModel.cs
@@ -14,7 +14,7 @@
PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;
OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent;
OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;
- GlobalTimeEvent.Instance.secondEvent += SecondEvent;
+ OperationTimeHepler.Instance.dayResetEvent += DayResetEvent;
OpenServerActivityCenter.Instance.Register(1, this);
}
@@ -26,7 +26,6 @@
public void OnPlayerLoginOk()
{
UpdateRedpoint();
- rebateOpenDayIndex = OperationTimeHepler.Instance.IndexOfOperationDays(Operation.ConsumeRebate);
}
public override void UnInit()
@@ -34,7 +33,7 @@
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent;
OperationTimeHepler.Instance.operationStartEvent -= OperationStartEvent;
OperationTimeHepler.Instance.operationEndEvent -= OperationEndEvent;
- GlobalTimeEvent.Instance.secondEvent -= SecondEvent;
+ OperationTimeHepler.Instance.dayResetEvent -= DayResetEvent;
}
public bool IsOpen
@@ -61,7 +60,13 @@
}
}
- int rebateOpenDayIndex = -1;
+ public bool IsAdvance
+ {
+ get
+ {
+ return OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.ConsumeRebate);
+ }
+ }
public bool IsRebateGot(int day, int _index)
{
@@ -89,13 +94,15 @@
}
}
- private void SecondEvent()
+ private void DayResetEvent(int resetType)
{
- var index = OperationTimeHepler.Instance.IndexOfOperationDays(Operation.ConsumeRebate);
- if (index != rebateOpenDayIndex)
+ OperationBase operationBase;
+ if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.ConsumeRebate, out operationBase))
{
- rebateOpenDayIndex = index;
- UpdateRedpoint();
+ if (resetType == operationBase.resetType)
+ {
+ UpdateRedpoint();
+ }
}
}
@@ -189,7 +196,6 @@
{
return;
}
- rebateOpenDayIndex = OperationTimeHepler.Instance.IndexOfOperationDays(Operation.ConsumeRebate);
OperationBase operationBase;
if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.ConsumeRebate, out operationBase))
{
--
Gitblit v1.8.0