From 6ce4ae16561fd205c8bb3f530d5a20033f207f4f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 24 八月 2018 18:19:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
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