From 288c45cabbeb22374a862d2c2abcf54373d6fa9c Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 22 一月 2019 17:45:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OpenServiceAchievementModel.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/OpenServerActivity/OpenServiceAchievementModel.cs b/System/OpenServerActivity/OpenServiceAchievementModel.cs
index 7d06e8b..2643b92 100644
--- a/System/OpenServerActivity/OpenServiceAchievementModel.cs
+++ b/System/OpenServerActivity/OpenServiceAchievementModel.cs
@@ -67,7 +67,7 @@
private const int Redpoint_key = 214;//鍛ㄧ媯娆㈢孩鐐�
public Redpoint redPointStre = new Redpoint(2, Redpoint_key);
private const int Redpoint_key1 = 21401;//鍛ㄧ媯娆㈢孩鐐�
- public Redpoint redPointStre1 = new Redpoint(214, Redpoint_key1);
+ public Redpoint redPointStre1 = new Redpoint(Redpoint_key, Redpoint_key1);
private int _SelectedNow = 0;
private int ResetType = 0;// 閲嶇疆绫诲瀷锛�0-0鐐归噸缃紱1-5鐐归噸缃�
private int AdvanceMinutes = 0;//鎻愬墠鏄剧ず鍒嗛挓
@@ -448,7 +448,7 @@
private RedPointState SetRedPointState(int day)//绾㈢偣鐘舵�佽缃�
{
- if (!WeekPartyDayDic.ContainsKey(day) || !WeekPartyDayInfoDic.ContainsKey(day))
+ if (!WeekPartyDayDic.ContainsKey(day) || !WeekPartyDayInfoDic.ContainsKey(day)|| day>DayNow)
{
return RedPointState.None;
}
@@ -485,7 +485,7 @@
{
TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes;
}
- if (TaypeNumber > 0 && rewardNum< number)
+ if (TaypeNumber > 0 && carryOutNum <= WeekPartyAction.TotalTimes)
{
return RedPointState.GetReward;
}
--
Gitblit v1.8.0