From 6dfb1ffd3f5e08a3ae0370dd8b20029151031096 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 15 二月 2019 15:16:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/LuckyTreasureWin.cs | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/System/OpenServerActivity/LuckyTreasureWin.cs b/System/OpenServerActivity/LuckyTreasureWin.cs
index 07f8a48..d75171b 100644
--- a/System/OpenServerActivity/LuckyTreasureWin.cs
+++ b/System/OpenServerActivity/LuckyTreasureWin.cs
@@ -80,13 +80,13 @@
UpdateRemainMoney();
UpdateMessageInfo();
UpdateAwards();
- UpdateLuckValue();
UpdateLuckyTreasureState();
UpdateSecond();
- luckValueSlider.value = luckyTreasureModel.curLuckValue;
ruleText.text = Language.Get("LuckyTreasure101",luckyTreasureModel.luckyTreasurePoint);
luckValueSlider.minValue = 0;
luckValueSlider.maxValue = operation.sumLuckPoint;
+ UpdateLuckValue();
+ luckValueSlider.value = luckyTreasureModel.curLuckValue;
OperationLuckyTreasure.LuckyTreasureItem luckyItem = null;
if(operation.TryGetLuckBigAward(out luckyItem))
{
@@ -115,17 +115,21 @@
private void UpdateAwards()
{
var luckyItems = operation.luckTreasureItems;
- awardsCtrl.Refresh();
- int line = luckyItems.Count / 2;
- if(luckyItems.Count % 2 > 0)
+ if(luckyItems != null && luckyItems.Count > 0)
{
- line += 1;
+ awardsCtrl.Refresh();
+ int length = luckyItems.Count - 1;
+ int line = length / 2;
+ if (length % 2 > 0)
+ {
+ line += 1;
+ }
+ for (int i = 0; i < line; i++)
+ {
+ awardsCtrl.AddCell(ScrollerDataType.Header, i);
+ }
+ awardsCtrl.Restart();
}
- for(int i = 0; i < line; i++)
- {
- awardsCtrl.AddCell(ScrollerDataType.Header,i);
- }
- awardsCtrl.Restart();
}
private void UpdateMessageInfo()
--
Gitblit v1.8.0