From 890418662f1d38bf66f5418638a8f477db46fe6b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 03 十二月 2018 20:21:34 +0800
Subject: [PATCH] 5188 【前端】【1.3】【1.3.100】全民冲榜榜单调整
---
System/OpenServerActivity/ImpactRankModel.cs | 28 ++++++++++++++++++----------
System/OpenServerActivity/OpenServerActivityWin.cs | 4 ++--
Core/GameEngine/Model/Player/Rank/PlayerRankData.cs | 2 ++
System/OpenServerActivity/ImpactRankWin.cs | 4 ++++
4 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Rank/PlayerRankData.cs b/Core/GameEngine/Model/Player/Rank/PlayerRankData.cs
index 43afc9c..2197fb5 100644
--- a/Core/GameEngine/Model/Player/Rank/PlayerRankData.cs
+++ b/Core/GameEngine/Model/Player/Rank/PlayerRankData.cs
@@ -120,6 +120,8 @@
OpenServerFightPower = 16,
Def_BT_FCCostGold = 17, //娑堣垂鎺掕姒�(浠欑晫鐩涘吀)
OpenServerRune = 18,
+ OpenServerGodWeapon = 20,
+ OpenServerRecharge = 21,
}
public class RankData
diff --git a/System/OpenServerActivity/ImpactRankModel.cs b/System/OpenServerActivity/ImpactRankModel.cs
index d0b6ede..4560f29 100644
--- a/System/OpenServerActivity/ImpactRankModel.cs
+++ b/System/OpenServerActivity/ImpactRankModel.cs
@@ -73,7 +73,7 @@
private void OnRefreshRank(int type)
{
if (type >= (int)PlayerRankData.RankType.OpenServerStrengthen
- && type <= (int)PlayerRankData.RankType.OpenServerRune)
+ && type <= (int)PlayerRankData.RankType.OpenServerRecharge)
{
foreach (var _type in m_Redpoints.Keys)
{
@@ -93,6 +93,7 @@
public Dictionary<int, int[]> billRankPromotePathDict { get; private set; }
public Dictionary<int, OSCbillBoardCondition> impactRankTypeOpenDict { get; private set; }
public Dictionary<int, List<OSCBillTagAwardConfig>> billTagSortCfgDict { get; private set; }
+ public List<int> impactRankSorts = new List<int>();
public int openServerActivityDays { get; private set; }
public int openServerRankDays { get; private set; }
public int gotoImpactRankType { get; set; }
@@ -218,6 +219,7 @@
}
impactRankTypeOpenDict.Add(_type, _condition);
m_Redpoints.Add(_type, new Redpoint(Redpoint_Key_ImpactRank, Redpoint_Key_ImpactRank * 100 + _type));
+ impactRankSorts.Add(_type);
}
}
@@ -368,6 +370,10 @@
return PlayerRankData.RankType.OpenServerFightPower;
case 7:
return PlayerRankData.RankType.OpenServerRune;
+ case 8:
+ return PlayerRankData.RankType.OpenServerGodWeapon;
+ case 9:
+ return PlayerRankData.RankType.OpenServerRecharge;
}
return PlayerRankData.RankType.OpenServerMount;
}
@@ -613,28 +619,30 @@
/// <returns></returns>
public int GetDefaultSelectType()
{
- if (gotoImpactRankType != 0 && billRankCfgDict.ContainsKey(gotoImpactRankType))
+ if (gotoImpactRankType != 0 && impactRankSorts.Contains(gotoImpactRankType))
{
var _tyep = gotoImpactRankType;
gotoImpactRankType = 0;
return _tyep;
}
- foreach (var _key in m_Redpoints.Keys)
+ for (int i = 0; i < impactRankSorts.Count; i++)
{
- if (m_Redpoints[_key].state == RedPointState.GetReward
- || m_Redpoints[_key].state == RedPointState.Simple)
+ var _type = impactRankSorts[i];
+ if (m_Redpoints[_type].state == RedPointState.GetReward
+ || m_Redpoints[_type].state == RedPointState.Simple)
{
- return _key;
+ return _type;
}
}
- foreach (var _key in billRankCfgDict.Keys)
+ for (int i = 0; i < impactRankSorts.Count; i++)
{
- if (!IsActivityClose(_key) && !IsMissImpactRank(_key))
+ var _type = impactRankSorts[i];
+ if (!IsActivityClose(_type) && !IsMissImpactRank(_type))
{
- return _key;
+ return _type;
}
}
- return billRankCfgDict.Keys.First();
+ return impactRankSorts[0];
}
public bool HasRedpoint()
diff --git a/System/OpenServerActivity/ImpactRankWin.cs b/System/OpenServerActivity/ImpactRankWin.cs
index d3cdb4a..f487bb7 100644
--- a/System/OpenServerActivity/ImpactRankWin.cs
+++ b/System/OpenServerActivity/ImpactRankWin.cs
@@ -472,6 +472,10 @@
return 18;
case 7:
return 31;
+ case 8:
+ return 38;
+ case 9:
+ return 39;
}
return 13;
}
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index 3050ca8..98620ee 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -69,7 +69,7 @@
var impactDefaultType = impactRankModel.GetDefaultSelectType();
if (impactRankModel.IsLock(impactDefaultType))
{
- impactDefaultType = impactRankModel.billRankCfgDict.Keys.First();
+ impactDefaultType = impactRankModel.impactRankSorts[0];
}
impactRankModel.presentSelectType = impactDefaultType;
impactRankModel.gotoImpactRankType = 0;
@@ -462,7 +462,7 @@
{
break;
}
- foreach (var _type in impactRankModel.billRankCfgDict.Keys)
+ foreach (var _type in impactRankModel.impactRankSorts)
{
if (impactRankModel.IsLock(_type))
{
--
Gitblit v1.8.0