From 5782bec0aea4a9163ab1a11ce6312fba11951996 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 13 八月 2018 15:33:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OpenServerActivityWin.cs | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index 13a6d74..1f3b9b8 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -51,6 +51,7 @@
List<int> openActivitys = new List<int>();
List<int> activityReds = new List<int>();
+ List<int> alreadyOpenActivitys = new List<int>();
protected override void BindController()
{
@@ -74,6 +75,7 @@
impactRankModel.presentSelectType = impactRankModel.GetDefaultSelectType();
impactRankModel.gotoImpactRankType = 0;
envelopeModel.selectType = 1;
+ CheckAlreadyOpen();
UpdateFunctionBtns();
}
@@ -198,6 +200,35 @@
}
}
+ void CheckAlreadyOpen()
+ {
+ alreadyOpenActivitys.Clear();
+ if (OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen())
+ {
+ 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);
+ }
+ }
+
private void OnOpenServerActivityRefresh(ScrollerDataType type, CellView cell)
{
switch (type)
@@ -273,13 +304,13 @@
for (int i = 0; i < m_SortArray.Count; i++)
{
var sort = m_SortArray[i];
+ if (!alreadyOpenActivitys.Contains(sort))
+ {
+ continue;
+ }
switch (sort)
{
case 0:
- if (!OpenServerActivityCenter.Instance.IsImpactRankOpen())
- {
- continue;
- }
m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
if (functionOrder != sort)
{
@@ -295,17 +326,9 @@
}
break;
case 1:
- if (!OpenServerActivityCenter.Instance.IsConsumeRebateOpen())
- {
- continue;
- }
m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
continue;
case 2:
- if (!OpenServerActivityCenter.Instance.IsRedEnvelopeOpen())
- {
- continue;
- }
m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
if (!m_ActivitySpreadDict[sort])
{
@@ -315,24 +338,12 @@
m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 2);
break;
case 3:
- if (!OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen())
- {
- continue;
- }
m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
break;
case 4:
- if (!OpenServerActivityCenter.Instance.IsFlashSaleOpen())
- {
- continue;
- }
m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
break;
case 5:
- if (!OpenServerActivityCenter.Instance.IsMultipleExpOpen())
- {
- continue;
- }
m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
break;
}
--
Gitblit v1.8.0