From 7788118762e57c9119e3884b0096743985ae0a4d Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 01 十一月 2018 22:31:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/ImpactRankModel.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/System/OpenServerActivity/ImpactRankModel.cs b/System/OpenServerActivity/ImpactRankModel.cs
index 651ef37..6402f5f 100644
--- a/System/OpenServerActivity/ImpactRankModel.cs
+++ b/System/OpenServerActivity/ImpactRankModel.cs
@@ -34,7 +34,7 @@
{
foreach (var _type in m_Redpoints.Keys)
{
- if (!IsMissImpactRank(_type) && IsActivityClose(_type))
+ if (!IsMissImpactRank(_type) && IsActivityClose(_type) && ContainsActivity(_type))
{
C1001_tagCWatchBillboard _pak = new C1001_tagCWatchBillboard();
_pak.Type = (byte)GetRankType(_type);
@@ -72,7 +72,7 @@
private void OnRefreshRank(int type)
{
if (type >= (int)PlayerRankData.RankType.OpenServerStrengthen
- && type <= (int)PlayerRankData.RankType.OpenServerFightPower)
+ && type <= (int)PlayerRankData.RankType.OpenServerRune)
{
foreach (var _type in m_Redpoints.Keys)
{
@@ -344,6 +344,11 @@
return GetSurplusDay(_type) <= 0;
}
+ public bool ContainsActivity(int _type)
+ {
+ return impactRankTypeOpenDict.ContainsKey(_type);
+ }
+
public PlayerRankData.RankType GetRankType(int _type)
{
switch (_type)
@@ -360,6 +365,8 @@
return PlayerRankData.RankType.OpenServerRealm;
case 6:
return PlayerRankData.RankType.OpenServerFightPower;
+ case 7:
+ return PlayerRankData.RankType.OpenServerRune;
}
return PlayerRankData.RankType.OpenServerMount;
}
@@ -413,7 +420,7 @@
}
}
- private PlayerRankData.RankType m_PresentBillRankType = PlayerRankData.RankType.OpenServerStrengthen;
+ private PlayerRankData.RankType m_PresentBillRankType = PlayerRankData.RankType.OpenServerMount;
public PlayerRankData.RankType presentBillRankType {
get { return m_PresentBillRankType; }
set {
--
Gitblit v1.8.0