Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-20 1c4c5c5cb829334303bff98837a69a9653dca714

 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;

            }

        }