From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/BillboardRank/RankModel.cs | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/Main/System/BillboardRank/RankModel.cs b/Main/System/BillboardRank/RankModel.cs
index d189d4d..1c54c61 100644
--- a/Main/System/BillboardRank/RankModel.cs
+++ b/Main/System/BillboardRank/RankModel.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using LitJson;
using UnityEngine;
// 鏀寔鍒嗛〉鏌ヨ鎺掕姒�, 鏈湇/璺ㄦ湇缁熶竴浣跨敤 鍙傝�僎ueryRankByPage 鏂板皝鍖� DTCA130_tagMCViewBillboardRet
@@ -81,6 +82,13 @@
data.cmpValue2 = serverData.CmpValue2;
data.cmpValue3 = serverData.CmpValue3;
data.userData = serverData.UserData;
+
+ var userData = JsonMapper.ToObject(serverData.UserData);
+ if (userData.ContainsKey("FightPower"))
+ {
+ long.TryParse(userData["FightPower"].ToString(), out data.fightPower);
+ }
+
data.rank = serverData.Rank;
data.type = type;
data.index = serverData.Index;
@@ -178,6 +186,13 @@
data.cmpValue2 = serverData.CmpValue2;
data.cmpValue3 = serverData.CmpValue3;
data.userData = serverData.UserData;
+
+ var userData = JsonMapper.ToObject(serverData.UserData);
+ if (userData.ContainsKey("FightPower"))
+ {
+ long.TryParse(userData["FightPower"].ToString(), out data.fightPower);
+ }
+
data.rank = serverData.Rank;
data.index = serverData.Index;
data.type = type; //涓庢湇鍔＄涓�鑷寸殑璺ㄦ湇鎺掕姒滅被鍨嬶紝澶栭儴鑷澶勭悊涓嶅悓鍒嗙粍鍒嗚禌瀛ｇ瓑鎯呭喌
@@ -187,10 +202,11 @@
public void ReceiveRankPagePackage(HA130_tagMCViewBillboardRet package)
{
int rankType = package.Type;
- //閮ㄥ垎璺ㄦ湇鎺掕姒滃悓涓�涓瀛樺湪鍒嗙粍鍒嗗尯鐨勬儏鍐� //璧涘尯3浣�+璧涘3浣�+鎺掕姒滅被鍨�3浣�
- if (rankType == 165) //CrossServerOneVsOneRewardModel.rankType
+
+ //姒滃崟绫诲瀷6-姝﹀皢鐧诲満鎷涘嫙姒� 鏀寔涓嶅悓鐨凙ctNum鍚屾椂寮�鏀炬椿鍔紝姒滃崟鏁版嵁鐙珛
+ if (rankType == 6)
{
- rankType = (int)package.GroupValue1 * 1000000 + (int)package.GroupValue2 * 1000 + rankType;
+ rankType = (int)package.GroupValue1 * 1000 + rankType;
}
if (!m_RankPageDatas.ContainsKey(rankType))
@@ -220,8 +236,13 @@
for (int i = 0; i < package.PageDataCnt; i++)
{
- int id = (int)package.PageDataList[i].ID;
int orderIndex = (int)package.PageDataList[i].Rank;
+ if (rankType == QunyingManager.rankType && GeneralDefine.IsRobot((int)package.PageDataList[i].ID))
+ {
+ //缇よ嫳姒滄満鍣ㄤ汉ID浼氶噸澶� 鐢ㄦ帓鍚嶆浛鎹D
+ package.PageDataList[i].ID = (uint)orderIndex;
+ }
+ int id = (int)package.PageDataList[i].ID;
if (!m_RankIDToIndex[rankType].ContainsKey(id))
{
m_RankIDToIndex[rankType][id] = orderIndex;
@@ -355,6 +376,11 @@
return Language.Get("Arena15", config.ChapterID, config.LevelNum);
case 4:
return cmpValue.ToString();
+ case 7:
+ case 9:
+ return Language.Get("OSActivity19", cmpValue.ToString());
+ case 8:
+ return Language.Get("L1113", cmpValue.ToString());
}
return string.Empty;
}
@@ -369,6 +395,12 @@
return Language.Get("RankTypeName_1");
case 4:
return Language.Get("OSActivity5");
+ case 7:
+ return Language.Get("OSActivity16");
+ case 8:
+ return Language.Get("OSActivity15");
+ case 9:
+ return Language.Get("OSActivity17");
}
return string.Empty;
}
@@ -421,6 +453,7 @@
public uint cmpValue2;
public uint cmpValue3;
public string userData;
+ public long fightPower;
public int rank; // 鎺掑悕浠�1寮�濮嬶紝浠ｈ〃绗�1鍚�
public int index; //鏁版嵁鍦ㄦ鍗曞垪琛ㄤ腑鐨勭储寮曪紝浠�0寮�濮� 闈炴帓鍚� 鍒嗛〉鏌ヨ浼氱敤鍒�
}
--
Gitblit v1.8.0