Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/OpenServerActivity/OSRedEnvelopeModel.cs

@@ -449,7 +449,7 @@
        public int cacheAchievement = 0;

        public void RequestSendAchieveEnvelope(int _id)

        {

            if (!WindowCenter.Instance.CheckOpen<OSRedEnvelopeSendWin>())

            if (!WindowCenter.Instance.IsOpen<OSRedEnvelopeSendWin>())

            {

                cacheAchievement = _id;

                WindowCenter.Instance.Open<OSRedEnvelopeSendWin>();