From cd4e26da0a2347a79aa18f4c77a5df9b103abfa6 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 23 十一月 2018 10:30:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Welfare/SignInWin.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/System/Welfare/SignInWin.cs b/System/Welfare/SignInWin.cs
index 84a7dc9..7533134 100644
--- a/System/Welfare/SignInWin.cs
+++ b/System/Welfare/SignInWin.cs
@@ -86,9 +86,9 @@
if (AchievementGoto.achievementType == AchievementGoto.SignInAchievement)
{
var _cfg = Config.Instance.Get<SuccessConfig>(AchievementGoto.SignInAchievement);
- if (!model.todaySign || model.surSignNum > 0)
+ if (!model.todaySignIn || model.keepSignInCount > 0)
{
- var _num = Mathf.Max(0, model.signNum);
+ var _num = Mathf.Max(0, model.alreadySignInCount);
var _line = _num / 5;
signInCtrl.JumpIndex(_line);
}
@@ -103,10 +103,11 @@
private void InitSignIn()
{
+ var configs = Config.Instance.GetAllValues<SignInConfig>();
if (signInCtrl.GetNumberOfCells(signInCtrl.m_Scorller) == 0)
{
signInCtrl.Refresh();
- int page = Mathf.CeilToInt((float)model.signAwardList.Count / 5);
+ int page = Mathf.CeilToInt((float)configs.Count / 5);
for (int i = 0; i < page; i++)
{
signInCtrl.AddCell(ScrollerDataType.Header, i);
@@ -118,15 +119,16 @@
signInCtrl.m_Scorller.RefreshActiveCellViews();
}
- signInfo.text = Language.Get("SignIn_3", model.signNum, model.surSignNum);
+ signInfo.text = Language.Get("SignIn_3", model.alreadySignInCount, model.keepSignInCount);
}
private void InitCtnSign()
- {
+ {
+ var configs = Config.Instance.GetAllValues<ContinueSignInConfig>();
if (ctnSignCtrl.GetNumberOfCells(ctnSignCtrl.m_Scorller) == 0)
{
ctnSignCtrl.Refresh();
- for (int i = 0; i < model.cntSignList.Count; i++)
+ for (int i = 0; i < configs.Count; i++)
{
ctnSignCtrl.AddCell(ScrollerDataType.Header, i);
}
@@ -140,7 +142,7 @@
private void JumpToTodaySign()
{
- var _num = Mathf.Max(0, model.signNum);
+ var _num = Mathf.Max(0, model.alreadySignInCount);
var _line = _num / 5;
signInCtrl.JumpIndex(_line);
}
--
Gitblit v1.8.0