From 21a1542f9d99466b2aedd0992a1032b37b4154a3 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 20 八月 2018 20:21:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/OpenServerActivity/OSRedEnvelopeModel.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/OpenServerActivity/OSRedEnvelopeModel.cs b/System/OpenServerActivity/OSRedEnvelopeModel.cs
index 069a870..e70a5a5 100644
--- a/System/OpenServerActivity/OSRedEnvelopeModel.cs
+++ b/System/OpenServerActivity/OSRedEnvelopeModel.cs
@@ -228,11 +228,11 @@
public void UpdateRedpackRedpoint(bool _checkVoice = false)
{
- bool hasRed = m_OpenServerGetRedpin.state == RedPointState.Simple;
+ bool hasRed = m_OpenServerGetRedpin.state == RedPointState.GetReward;
m_OpenServerGetRedpin.state = RedPointState.None;
if (CanGetEnvelope())
{
- m_OpenServerGetRedpin.state = RedPointState.Simple;
+ m_OpenServerGetRedpin.state = RedPointState.GetReward;
if (_checkVoice && !hasRed && servereInited && HasOtherRedpack() && !HasSelfRedpack())
{
CheckRedEnvelopeVoice();
@@ -425,7 +425,7 @@
get
{
return m_RedAchieveRedpoint.state == RedPointState.Simple
- || m_OpenServerGetRedpin.state == RedPointState.Simple;
+ || m_OpenServerGetRedpin.state == RedPointState.GetReward;
}
}
--
Gitblit v1.8.0