From c6a7ac3739907e8bb7c751d408e227e19f246f49 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 08 五月 2026 17:27:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/OtherPlayerDetail/OtherPlayerDetailWin.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Main/System/OtherPlayerDetail/OtherPlayerDetailWin.cs b/Main/System/OtherPlayerDetail/OtherPlayerDetailWin.cs
index 6a12381..e3780e3 100644
--- a/Main/System/OtherPlayerDetail/OtherPlayerDetailWin.cs
+++ b/Main/System/OtherPlayerDetail/OtherPlayerDetailWin.cs
@@ -136,7 +136,7 @@
private void DisplayMingge(int playerID)
{
var mingge = manager.GetMinggeTotalData(playerID);
- txtMinggeLv.text = Language.Get("OtherPlayerDetail13", mingge == null ? 0 : mingge.GWLV);
+ txtMinggeLv.text = Language.Get("OtherPlayerDetail17", mingge == null ? 0 : mingge.GWLV);
}
private void DisplayGuildInfo(OtherPlayerDetailManager.ViewPlayerData viewPlayerData)
@@ -156,7 +156,10 @@
{
txtPlayerName.text = viewPlayerData.PlayerName;
txtPlayerId.text = Language.Get("OtherPlayerDetail02", viewPlayerData.PlayerID);
- txtServerName.text = Language.Get("PlayerProfile11", ServerListCenter.Instance.GetServerName(viewPlayerData.ServerID));
+ if (OtherPlayerDetailManager.Instance.IsRobot(viewPlayerData.PlayerID))
+ txtServerName.text = Language.Get("PlayerProfile11", ServerListCenter.Instance.GetServerName(UIHelper.GetServerIDByAccount(PlayerDatas.Instance.baseData.AccID)));
+ else
+ txtServerName.text = Language.Get("PlayerProfile11", ServerListCenter.Instance.GetServerName(viewPlayerData.ServerID));
txtLV.text = viewPlayerData.LV.ToString();
avatarCell.InitUI(AvatarHelper.GetAvatarModel(viewPlayerData.PlayerID, viewPlayerData.Face, viewPlayerData.FacePic)).Forget();
officialTitle.InitUI(viewPlayerData.RealmLV, viewPlayerData.TitleID, 0.65f).Forget();
--
Gitblit v1.8.0