From 83f2f92d2d40f03f565a2b2ccf8ab1b0fa3b9306 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 14 八月 2018 16:40:43 +0800
Subject: [PATCH] 暂时提交精彩活动修改
---
System/OpenServerActivity/OpenServerActivityWin.cs | 93 ++++++++++------------------------------------
1 files changed, 20 insertions(+), 73 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index c102975..107af06 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -135,50 +135,23 @@
{
openActivitys.Clear();
activityReds.Clear();
- if (OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen())
+
+ for (int i = 0; i < m_SortArray.Count; i++)
{
- openActivitys.Add(3);
- if (timeLimitGiftModel.redpoint.state == RedPointState.Simple)
+ if (OpenServerActivityCenter.Instance.IsActivityOpen(m_SortArray[i]))
{
- activityReds.Add(3);
- }
- }
- if (OpenServerActivityCenter.Instance.IsFlashSaleOpen())
- {
- openActivitys.Add(4);
- if (flashSaleModel.flashSaleRedpoint.state == RedPointState.Simple)
- {
- activityReds.Add(4);
- }
- }
- if (OpenServerActivityCenter.Instance.IsImpactRankOpen())
- {
- openActivitys.Add(0);
- if (impactRankModel.HasRedpoint())
- {
- activityReds.Add(0);
- }
- }
- if (OpenServerActivityCenter.Instance.IsRedEnvelopeOpen())
- {
- openActivitys.Add(2);
- if (envelopeModel.m_RedAchieveRedpoint.state == RedPointState.Simple)
- {
- activityReds.Add(2);
- envelopeModel.selectType = 1;
- }
- else if (envelopeModel.m_OpenServerGetRedpin.state == RedPointState.Simple)
- {
- activityReds.Add(2);
- envelopeModel.selectType = 2;
- }
- }
- if (OpenServerActivityCenter.Instance.IsConsumeRebateOpen())
- {
- openActivitys.Add(1);
- if (consumeRebateModel.consumeRebateRedpoint.state == RedPointState.Simple)
- {
- activityReds.Add(1);
+ openActivitys.Add(m_SortArray[i]);
+ if (OpenServerActivityCenter.Instance.IsPriorityOpenOpen(m_SortArray[i]))
+ {
+ activityReds.Add(m_SortArray[i]);
+
+ switch (m_SortArray[i])
+ {
+ case 2:
+ envelopeModel.selectType = envelopeModel.m_RedAchieveRedpoint.state == RedPointState.Simple ? 1 : 2;
+ break;
+ }
+ }
}
}
if (OpenServerActivityCenter.Instance.IsBossRebornOpen())
@@ -187,15 +160,6 @@
if (bossRebornModel.bossRebornPoint.state == RedPointState.Simple)
{
activityReds.Add(9);
- }
- }
-
- if (OpenServerActivityCenter.Instance.IsMultipleExpOpen())
- {
- openActivitys.Add(5);
- if (multipleExpModel.multipleExpRedpoint.state == RedPointState.Simple)
- {
- activityReds.Add(5);
}
}
if (OpenServerActivityCenter.Instance.IsMultipleRealmOpen())
@@ -221,29 +185,12 @@
void CheckAlreadyOpen()
{
alreadyOpenActivitys.Clear();
- if (OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen())
+ for (int i = 0; i < m_SortArray.Count; i++)
{
- alreadyOpenActivitys.Add(3);
- }
- if (OpenServerActivityCenter.Instance.IsFlashSaleOpen())
- {
- alreadyOpenActivitys.Add(4);
- }
- if (OpenServerActivityCenter.Instance.IsImpactRankOpen())
- {
- alreadyOpenActivitys.Add(0);
- }
- if (OpenServerActivityCenter.Instance.IsRedEnvelopeOpen())
- {
- alreadyOpenActivitys.Add(2);
- }
- if (OpenServerActivityCenter.Instance.IsConsumeRebateOpen())
- {
- alreadyOpenActivitys.Add(1);
- }
- if (OpenServerActivityCenter.Instance.IsMultipleExpOpen())
- {
- alreadyOpenActivitys.Add(5);
+ if (OpenServerActivityCenter.Instance.IsActivityOpen(m_SortArray[i]))
+ {
+ alreadyOpenActivitys.Add(m_SortArray[i]);
+ }
}
if (OpenServerActivityCenter.Instance.IsMultipleRealmOpen())
{
--
Gitblit v1.8.0