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/Arena/ArenaBattleVictoryWin.cs |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Main/System/Arena/ArenaBattleVictoryWin.cs b/Main/System/Arena/ArenaBattleVictoryWin.cs
index b31f782..1b1a4e0 100644
--- a/Main/System/Arena/ArenaBattleVictoryWin.cs
+++ b/Main/System/Arena/ArenaBattleVictoryWin.cs
@@ -63,15 +63,12 @@
 
         myAvatarCell.InitUI(AvatarHelper.GetAvatarModel((int)PlayerDatas.Instance.baseData.PlayerID,
                                                 PlayerDatas.Instance.baseData.face,
-                                                PlayerDatas.Instance.baseData.facePic)).Forget();
-        enemyAvatarCell.InitUI(AvatarHelper.GetAvatarModel((int)tagPlayerID, (int)enemyFace, (int)enemyFacePic)).Forget();
-        enemyAvatarCell.SetOnLoaded(() =>
+                                                PlayerDatas.Instance.baseData.facePic));
+        enemyAvatarCell.InitUI(AvatarHelper.GetAvatarModel((int)tagPlayerID, (int)enemyFace, (int)enemyFacePic));
+        enemyAvatarCell.SetListener(() =>
         {
-            if (this == null) return;
-            enemyAvatarCell.SetListener(() =>
-            {
-                AvatarHelper.TryViewOtherPlayerInfo((int)tagPlayerID, viewPlayerLineupType: (int)BattlePreSetType.Arena);
-            });
+            int serverID = (ArenaManager.Instance.IsOpenCrossServer() && tagPlayerID != PlayerDatas.Instance.baseData.PlayerID) ? (int)info.ServerID : 0;
+            AvatarHelper.TryViewOtherPlayerInfo((int)tagPlayerID, serverID, viewPlayerLineupType: (int)BattlePreSetType.Arena);
         });
 
         txtMyName.text = PlayerDatas.Instance.baseData.PlayerName;

--
Gitblit v1.8.0