Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-08-30 24756897e69fa38fbd9844bcdf0cc53d42f8dd86

 System/WindowJump/WindowJumpMgr.cs

@@ -266,7 +266,13 @@
                    return;

                }

                break;



            case JumpUIType.VipRechargeFunc3:

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

                {

                    SysNotifyMgr.Instance.ShowTip("ActiveOutTime");

                    return;

                }

                break;

            case JumpUIType.OSTimeLimitGift:

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

                {

@@ -528,7 +534,6 @@
            case JumpUIType.WelfareFunc2:

            case JumpUIType.WelfareFunc3:

            case JumpUIType.WelfareFunc2Type2:

            case JumpUIType.VipRechargeFunc3:

                SetJumpLogic<WelfareWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.SystemSettingFunc1:

@@ -643,6 +648,7 @@
            case JumpUIType.TreasureSoul:

                SetJumpLogic<TreasureSoulWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.VipRechargeFunc3:

            case JumpUIType.OSTimeLimitGift:

            case JumpUIType.FlashSale:

            case JumpUIType.ConsumreRebate: