From e0566ffa3ed58828541a4753264e43d83b3b62cd Mon Sep 17 00:00:00 2001 From: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Date: Tue, 4 Jun 2024 10:03:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A5=D0=B0=D0=B1=20=D1=81=D0=B5=D1=80=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=BE=D0=B2=20(#13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Хаб серверов внутри игры * чейнжлог --- Content.Client/Entry/EntryPoint.cs | 4 + Content.Client/IoC/ClientContentIoC.cs | 7 +- .../Launcher/LauncherConnectingGui.xaml | 94 +++++----- .../Launcher/LauncherConnectingGui.xaml.cs | 2 +- Content.Client/Lobby/UI/LobbyGui.xaml | 63 ++++--- Content.Client/Lobby/UI/LobbyGui.xaml.cs | 4 + .../Systems/Ghost/GhostUIController.cs | 9 + .../Systems/Ghost/Widgets/GhostGui.xaml | 13 +- .../Systems/Ghost/Widgets/GhostGui.xaml.cs | 2 + .../_Sunrise/ServersHub/ServersHub.xaml | 12 ++ .../_Sunrise/ServersHub/ServersHub.xaml.cs | 76 ++++++++ .../_Sunrise/ServersHub/ServersHubEntry.xaml | 29 +++ .../ServersHub/ServersHubEntry.xaml.cs | 28 +++ .../_Sunrise/ServersHub/ServersHubManager.cs | 38 ++++ .../_Sunrise/ServersHub/ServersHubUi.xaml | 10 ++ .../_Sunrise/ServersHub/ServersHubUi.xaml.cs | 16 ++ Content.Server/Entry/EntryPoint.cs | 3 + Content.Server/IoC/ServerContentIoC.cs | 3 + .../_Sunrise/ServersHub/ServersHubManager.cs | 168 ++++++++++++++++++ .../ServersHub/FullServerHubListMessage.cs | 45 +++++ .../_Sunrise/ServersHub/ServerHubEntry.cs | 14 ++ .../_Sunrise/SunriseCCVars/SunriseCCVars.cs | 10 ++ Resources/Changelog/ChangelogSunrise.yml | 13 ++ Resources/Locale/ru-RU/ghost/ghost-gui.ftl | 3 + 24 files changed, 594 insertions(+), 72 deletions(-) create mode 100644 Content.Client/_Sunrise/ServersHub/ServersHub.xaml create mode 100644 Content.Client/_Sunrise/ServersHub/ServersHub.xaml.cs create mode 100644 Content.Client/_Sunrise/ServersHub/ServersHubEntry.xaml create mode 100644 Content.Client/_Sunrise/ServersHub/ServersHubEntry.xaml.cs create mode 100644 Content.Client/_Sunrise/ServersHub/ServersHubManager.cs create mode 100644 Content.Client/_Sunrise/ServersHub/ServersHubUi.xaml create mode 100644 Content.Client/_Sunrise/ServersHub/ServersHubUi.xaml.cs create mode 100644 Content.Server/_Sunrise/ServersHub/ServersHubManager.cs create mode 100644 Content.Shared/_Sunrise/ServersHub/FullServerHubListMessage.cs create mode 100644 Content.Shared/_Sunrise/ServersHub/ServerHubEntry.cs diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 44ba743306..910c4c0437 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -1,3 +1,4 @@ +using Content.Client._Sunrise.ServersHub; using Content.Client.Administration.Managers; using Content.Client.Changelog; using Content.Client.Chat.Managers; @@ -71,6 +72,7 @@ namespace Content.Client.Entry [Dependency] private readonly IReplayLoadManager _replayLoad = default!; [Dependency] private readonly ILogManager _logManager = default!; [Dependency] private readonly ContentReplayPlaybackManager _replayMan = default!; + [Dependency] private readonly ServersHubManager _serversHubManager = default!; // Sunrise-Hub public override void Init() { @@ -133,6 +135,8 @@ namespace Content.Client.Entry _jobRequirements.Initialize(); _playbackMan.Initialize(); + _serversHubManager.Initialize(); // Sunrise-Hub + //AUTOSCALING default Setup! _configManager.SetCVar("interface.resolutionAutoScaleUpperCutoffX", 1080); _configManager.SetCVar("interface.resolutionAutoScaleUpperCutoffY", 720); diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs index 905e802fb6..f60e259308 100644 --- a/Content.Client/IoC/ClientContentIoC.cs +++ b/Content.Client/IoC/ClientContentIoC.cs @@ -1,4 +1,5 @@ -using Content.Client.Administration.Managers; +using Content.Client._Sunrise.ServersHub; +using Content.Client.Administration.Managers; using Content.Client.Changelog; using Content.Client.Chat.Managers; using Content.Client.Clickable; @@ -50,6 +51,10 @@ namespace Content.Client.IoC collection.Register(); collection.Register(); collection.Register(); + + // Sunrise + + collection.Register(); // Sunrise-Hub } } } diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml index 3734fa5b3a..70656df7ea 100644 --- a/Content.Client/Launcher/LauncherConnectingGui.xaml +++ b/Content.Client/Launcher/LauncherConnectingGui.xaml @@ -2,54 +2,66 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client" xmlns:parallax="clr-namespace:Content.Client.Parallax" - xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"> + xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" + xmlns:serversHub="clr-namespace:Content.Client._Sunrise.ServersHub"> - - - -