Merge branch 'master' into leonard

client_Wu Xijin

2018-08-15 0012445c0109fa67987800a1bac8f32e989b2d19

 System/WindowJump/WindowJumpMgr.cs

@@ -258,7 +258,7 @@
                break;



            case JumpUIType.OSTimeLimitGift:

                if (!OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen())

                if (!OpenServerActivityCenter.Instance.IsActivityOpen(3))

                {

                    SysNotifyMgr.Instance.ShowTip("ActiveOutTime");

                    return;