From 85448a839d432aab4220e6b23e55a0270e007b6f Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期四, 23 八月 2018 18:03:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/OpenServerActivity/ImpactRankModel.cs |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/System/OpenServerActivity/ImpactRankModel.cs b/System/OpenServerActivity/ImpactRankModel.cs
index 1ba13f1..44886b9 100644
--- a/System/OpenServerActivity/ImpactRankModel.cs
+++ b/System/OpenServerActivity/ImpactRankModel.cs
@@ -495,7 +495,8 @@
         public bool CanGetAward(int _type, out int _displayIndex)
         {
             _displayIndex = 0;
-            if (IsMissImpactRank(_type) || !IsActivityClose(_type))
+            bool _locked = IsLock(_type);
+            if (IsMissImpactRank(_type) || _locked)
             {
                 return false;
             }
@@ -524,7 +525,7 @@
                         }
                     }
                 }
-                else
+                else if (IsActivityClose(_type))
                 {
                     var _start = (_cfg as OSCBillRankAwardConfig).RankA;
                     var _end = (_cfg as OSCBillRankAwardConfig).RankB;

--
Gitblit v1.8.0