From 1c4c5c5cb829334303bff98837a69a9653dca714 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 八月 2018 17:09:49 +0800
Subject: [PATCH] Merge branch 'master' into DogzDungeon
---
System/OpenServerActivity/ImpactRankModel.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/System/OpenServerActivity/ImpactRankModel.cs b/System/OpenServerActivity/ImpactRankModel.cs
index 9cfe10e..36a8208 100644
--- a/System/OpenServerActivity/ImpactRankModel.cs
+++ b/System/OpenServerActivity/ImpactRankModel.cs
@@ -569,7 +569,7 @@
var _complete = _playerData.value >= (_cfg as OSCBillTagAwardConfig).Condition;
if (_complete)
{
- _redpoint.state = RedPointState.Simple;
+ _redpoint.state = RedPointState.GetReward;
return;
}
}
@@ -582,7 +582,7 @@
if (_rank != -1 && _rank >= _start
&& _rank <= _end && !_playerData.billAwardGet)
{
- _redpoint.state = RedPointState.Simple;
+ _redpoint.state = RedPointState.GetReward;
return;
}
}
@@ -613,7 +613,8 @@
}
foreach (var _key in m_Redpoints.Keys)
{
- if (m_Redpoints[_key].state == RedPointState.Simple)
+ if (m_Redpoints[_key].state == RedPointState.GetReward
+ || m_Redpoints[_key].state == RedPointState.Simple)
{
return _key;
}
@@ -632,7 +633,8 @@
{
foreach (var _key in m_Redpoints.Keys)
{
- if (m_Redpoints[_key].state == RedPointState.Simple)
+ if (m_Redpoints[_key].state == RedPointState.GetReward
+ || m_Redpoints[_key].state == RedPointState.Simple)
{
return true;
}
--
Gitblit v1.8.0