From 86c262ce268eb4f29d2fa126ed9a6b5c1ec8129e Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 10 十一月 2018 16:01:20 +0800
Subject: [PATCH] 2334 【1.3】【1.2】累计充值打开界面默认选中规则优化
---
System/OpenServerActivity/AccumulateRechargeWin.cs | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/System/OpenServerActivity/AccumulateRechargeWin.cs b/System/OpenServerActivity/AccumulateRechargeWin.cs
index 761b3d5..a1eac56 100644
--- a/System/OpenServerActivity/AccumulateRechargeWin.cs
+++ b/System/OpenServerActivity/AccumulateRechargeWin.cs
@@ -60,12 +60,7 @@
TimeUtility.OnServerOpenDayRefresh += OnServerOpenDayRefresh;
OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;
- DisplayMoney(model.selectIndex);
- DisplayItems(model.selectIndex);
- DisplayFunc(model.selectIndex);
- DisplayRecharge();
- DisplayRewards();
- DisplayTime();
+ Dipslay();
}
protected override void OnAfterOpen()
@@ -85,6 +80,16 @@
{
}
#endregion
+
+ private void Dipslay()
+ {
+ DisplayMoney(model.selectIndex);
+ DisplayItems(model.selectIndex);
+ DisplayFunc(model.selectIndex);
+ DisplayRecharge();
+ DisplayRewards();
+ DisplayTime();
+ }
private void OnFunc()
{
@@ -129,7 +134,15 @@
for (int i = 0; i < reward.recharges.Count; i++)
{
var recharge = reward.recharges[i];
- if (!model.IsRewardGot(recharge) && model.SatisfyGetReward(recharge))
+ if (model.SatisfyGetReward(recharge))
+ {
+ return i;
+ }
+ }
+ for (int i = 0; i < reward.recharges.Count; i++)
+ {
+ var recharge = reward.recharges[i];
+ if (!model.IsRewardGot(recharge) && !model.SatisfyGetReward(recharge))
{
return i;
}
@@ -271,6 +284,7 @@
m_ScrollerControl.AddCell(ScrollerDataType.Header, i);
}
m_ScrollerControl.Restart();
+ m_ScrollerControl.JumpIndex(model.selectIndex);
}
}
@@ -313,8 +327,8 @@
{
if (resetType == operationBase.resetType)
{
- DisplayRewards();
- DisplayTime();
+ model.selectIndex = GetSelect();
+ Dipslay();
}
}
}
@@ -329,8 +343,8 @@
private void OnServerOpenDayRefresh()
{
- DisplayRewards();
- DisplayTime();
+ model.selectIndex = GetSelect();
+ Dipslay();
}
}
--
Gitblit v1.8.0