From ad3ac1661daaf4b445914f87009d3d88c990f040 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 28 四月 2026 11:45:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/Settlement/BattleSettlementManager.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Main/System/Settlement/BattleSettlementManager.cs b/Main/System/Settlement/BattleSettlementManager.cs
index c8169af..1144ab6 100644
--- a/Main/System/Settlement/BattleSettlementManager.cs
+++ b/Main/System/Settlement/BattleSettlementManager.cs
@@ -237,7 +237,7 @@
{
Debug.Log("鎴樻枟鏃跺簭 鏀跺埌B431 骞惰姹備笅杞芥垬鎶�" + Time.time);
var date = UIHelper.ServerStringTrim(netData.PathDate);
- RequestTurnFightData(guid, date, mapID);
+ RequestTurnFightData(guid, date, mapID, (int)netData.CrossServerID);
}
else
{
@@ -257,10 +257,10 @@
}
}
- public void RequestTurnFightData(string guid, string date, int mapID)
+ 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 = UIHelper.GetServerIDByAccount(PlayerDatas.Instance.baseData.AccID);
+ var serverID = crossServerID !=0 ? crossServerID : UIHelper.GetServerIDByAccount(PlayerDatas.Instance.baseData.AccID);
var url = ServerListCenter.Instance.GetServerUrl(serverID);
string assetVersionUrl = string.Empty;
--
Gitblit v1.8.0