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/Settlement/BattleSettlementManager.cs |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Main/System/Settlement/BattleSettlementManager.cs b/Main/System/Settlement/BattleSettlementManager.cs
index 1144ab6..6b9ce23 100644
--- a/Main/System/Settlement/BattleSettlementManager.cs
+++ b/Main/System/Settlement/BattleSettlementManager.cs
@@ -260,9 +260,10 @@
     public void RequestTurnFightData(string guid, string date, int mapID, int crossServerID = 0)
     {
         //mobile.secondworld.net.cn:53080\S9006\20251202\3042602\5b11338f-cf2c-11f0-a0a0-000c29b22418.tfr
-        var serverID = crossServerID !=0 ? crossServerID : UIHelper.GetServerIDByAccount(PlayerDatas.Instance.baseData.AccID);
+        // crossServerID 鍙槸涓轰簡鍙栧尯鏈嶄俊鎭紝鍚庣画鐨勪娇鐢ㄤ緷鐒剁敤serverID鍋氶�昏緫
+        var serverID = UIHelper.GetServerIDByAccount(PlayerDatas.Instance.baseData.AccID);
 
-        var url = ServerListCenter.Instance.GetServerUrl(serverID);
+        var url = ServerListCenter.Instance.GetServerUrl(crossServerID !=0 ? crossServerID : serverID);
         string assetVersionUrl = string.Empty;
 
         if (string.IsNullOrEmpty(date))

--
Gitblit v1.8.0