From 9ff5afd5312390cd4cbb5fb1da8507fd7e7ea71e Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 14 八月 2018 17:54:42 +0800
Subject: [PATCH] 2453【前端】【前端】充值、福利、活动界面整合
---
System/OpenServerActivity/OpenServerActivityWin.cs | 30 +++++++-----------------------
1 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index 852d02d..ba13eec 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -30,24 +30,8 @@
}
}
- OSTimeLimitGiftModel m_OSTimeLimitGiftModel;
- OSTimeLimitGiftModel timeLimitGiftModel {
- get {
- return m_OSTimeLimitGiftModel ?? (m_OSTimeLimitGiftModel = ModelCenter.Instance.GetModel<OSTimeLimitGiftModel>());
- }
- }
-
- FlashSaleModel flashSaleModel { get { return ModelCenter.Instance.GetModel<FlashSaleModel>(); } }
-
- ConsumeRebateModel consumeRebateModel { get { return ModelCenter.Instance.GetModel<ConsumeRebateModel>(); } }
-
- MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } }
-
- MultipleRealmPointModel multipleRealmPointModel { get { return ModelCenter.Instance.GetModel<MultipleRealmPointModel>(); } }
- BossRebornModel bossRebornModel { get { return ModelCenter.Instance.GetModel<BossRebornModel>(); } }
-
List<int> openActivitys = new List<int>();
- List<int> activityReds = new List<int>();
+ List<int> priorityActivitys = new List<int>();
List<int> alreadyOpenActivitys = new List<int>();
protected override void BindController()
@@ -132,7 +116,7 @@
int GetDefaultSelect()
{
openActivitys.Clear();
- activityReds.Clear();
+ priorityActivitys.Clear();
for (int i = 0; i < m_SortArray.Count; i++)
{
@@ -141,7 +125,7 @@
openActivitys.Add(m_SortArray[i]);
if (OpenServerActivityCenter.Instance.IsPriorityOpenOpen(m_SortArray[i]))
{
- activityReds.Add(m_SortArray[i]);
+ priorityActivitys.Add(m_SortArray[i]);
switch (m_SortArray[i])
{
@@ -152,10 +136,10 @@
}
}
}
- if (activityReds.Count > 0)
+ if (priorityActivitys.Count > 0)
{
- activityReds.Sort(Compare);
- return activityReds[0];
+ priorityActivitys.Sort(Compare);
+ return priorityActivitys[0];
}
else
{
@@ -468,7 +452,7 @@
private void OperationTimeUpdateEvent(Operation type)
{
- if (type == Operation.MultipleExp)
+ if (type == Operation.MultipleExp || type == Operation.MultipRealmPoint)
{
m_ActivityCtrl.m_Scorller.RefreshActiveCellViews();
}
--
Gitblit v1.8.0