From 2d0858f1625caa403fafce227b64fff029eb8cbe Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 17 七月 2019 20:26:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into equipstar

---
 System/OpenServerActivity/OpenServerActivityWin.cs |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index 80b103e..5c6bdbd 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -565,6 +565,11 @@
             switch (_order)
             {
                 case 0:
+                    if (impactRankModel.IsLock(_type))
+                    {
+                        SysNotifyMgr.Instance.ShowTip("ImpactRankActivityUnOpen");
+                        return;
+                    }
                     impactRankModel.presentSelectType = _type;
                     break;
                 case 2:

--
Gitblit v1.8.0