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/Login/ServerListCenter.cs | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/Main/System/Login/ServerListCenter.cs b/Main/System/Login/ServerListCenter.cs
index faf1a59..69f826d 100644
--- a/Main/System/Login/ServerListCenter.cs
+++ b/Main/System/Login/ServerListCenter.cs
@@ -166,6 +166,24 @@
}
}
}
+
+ //璺ㄦ湇鏈嶅姟鍣� 涓嶅睍绀轰絾鏄彲浠ユ悳绱㈢敤
+ if (serverInfoCommon != null && serverInfoCommon.crossserver != null)
+ {
+ for (int i = 0; i < serverInfoCommon.crossserver.Length; i++)
+ {
+ var group = serverInfoCommon.crossserver[i];
+ for (int j = 0; j < group.group_list.Length; j++)
+ {
+ var serverData = group.group_list[j];
+ if (serverData.region_flag == _id)
+ {
+ return serverData;
+ }
+ }
+ }
+ }
+
//浠庣櫧鍚嶅崟鐨勬湇鍔″櫒琛ㄤ腑鏌ユ壘锛堟祴璇曠敤锛�
if (serverInfoPlayer != null && serverInfoPlayer.gametest != null && serverInfoPlayer.gametest.group_list != null)
@@ -204,7 +222,11 @@
{
return $"{defaultHead}{data.region_domain}:{replacePort}";
}
- return $"{defaultHead}{data.region_domain}:{data.login_port}";
+
+ //鏃х殑鍏煎
+ if (data.login_port > 0)
+ return $"{defaultHead}{data.region_domain}:{data.login_port}";
+ return $"{defaultHead}{data.region_domain}:{data.http_port}";
}
@@ -493,7 +515,7 @@
statue = serverData.statue,
is_recommend = serverData.is_recommend,
region_domain = serverData.region_domain,
- login_port = serverData.login_port,
+ http_port = serverData.http_port,
game_port = serverData.game_port,
start_date = serverData.start_date,
job = originalData.job,
--
Gitblit v1.8.0