Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-20 21a1542f9d99466b2aedd0992a1032b37b4154a3

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -616,7 +616,7 @@
            RedEnvelopeModel.RedEnvelope _envelope;

            if (envelopeModel.TryGetLatestEnvelope(out _envelope))

            {

                if (OSEnvelopeModel.m_OpenServerGetRedpin.state == RedPointState.Simple)

                if (OSEnvelopeModel.m_OpenServerGetRedpin.state == RedPointState.GetReward)

                {

                    WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

                    ModelCenter.Instance.GetModel<OSRedEnvelopeModel>().JumpType = 2;