Обнова лобби

Content.Client/GameTicking/Managers/ClientGameTicker.cs

@@ -31,6 +31,7 @@ public sealed class ClientGameTicker : SharedGameTicker
         [ViewVariables] public string? LobbyParalax { get; private set; }
         [ViewVariables] public LobbyImage? LobbyImage { get; private set; }
         // Sunrise-End
+        [ViewVariables] public string? LobbyBackground { get; private set; }
         [ViewVariables] public bool DisallowedLateJoin { get; private set; }
         [ViewVariables] public string? ServerInfoBlob { get; private set; }
         [ViewVariables] public TimeSpan StartTime { get; private set; }
@@ -123,6 +124,7 @@ private void LobbyStatus(TickerLobbyStatusEvent message)
             IsGameStarted = message.IsRoundStarted;
             AreWeReady = message.YouAreReady;
             // Sunrise-Start
+            LobbyBackground = message.LobbyBackground;
             LobbyParalax = message.LobbyParalax;
             LobbyImage = message.LobbyImage;
             // Sunrise-End

Content.Client/Info/DevInfoBanner.cs

@@ -1,5 +1,6 @@
 using Content.Client.Changelog;
 using Content.Client.Credits;
+using Content.Client.UserInterface.Systems.EscapeMenu;
 using Content.Shared.CCVar;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -30,9 +31,23 @@ public DevInfoBanner() {
                 buttons.AddChild(reportButton);
             }
 
+            // Sunrise-Start
+            var github = cfg.GetCVar(CCVars.InfoLinksGithub);
+            if (bugReport != "")
+            {
+                var githubButton = new Button {Text = Loc.GetString("server-info-github-button")};
+                githubButton.OnPressed += _ => uriOpener.OpenUri(github);
+                buttons.AddChild(githubButton);
+            }
+            // Sunrise-End
+
             var creditsButton = new Button {Text = Loc.GetString("server-info-credits-button")};
             creditsButton.OnPressed += args => new CreditsWindow().Open();
             buttons.AddChild(creditsButton);
+
+            var changelogButton = new ChangelogButton();
+            changelogButton.OnPressed += args => UserInterfaceManager.GetUIController<ChangelogUIController>().ToggleWindow();
+            buttons.AddChild(changelogButton);
         }
     }
 }

Content.Client/Info/LinkBanner.cs

@@ -36,13 +36,6 @@ public LinkBanner()
             AddInfoButton("server-info-wiki-button", CCVars.InfoLinksWiki);
             AddInfoButton("server-info-forum-button", CCVars.InfoLinksForum);
 
-            // Sunrise-Start
-            AddInfoButton("server-info-github-button", CCVars.InfoLinksGithub);
-            var creditsButton = new Button {Text = Loc.GetString("server-info-credits-button")};
-            creditsButton.OnPressed += _ => new CreditsWindow().Open();
-            buttons.AddChild(creditsButton);
-            // Sunrise-End
-
             var guidebookController = UserInterfaceManager.GetUIController<GuidebookUIController>();
             var guidebookButton = new Button() { Text = Loc.GetString("server-info-guidebook-button") };
             guidebookButton.OnPressed += _ =>
@@ -51,10 +44,6 @@ public LinkBanner()
             };
             buttons.AddChild(guidebookButton);
 
-            var changelogButton = new ChangelogButton();
-            changelogButton.OnPressed += args => UserInterfaceManager.GetUIController<ChangelogUIController>().ToggleWindow();
-            buttons.AddChild(changelogButton);
-
             void AddInfoButton(string loc, CVarDef<string> cVar)
             {
                 var button = new Button { Text = Loc.GetString(loc) };

Content.Client/Lobby/LobbyState.cs

@@ -137,6 +137,7 @@ public override void FrameUpdate(FrameEventArgs e)
                 Lobby!.StartTime.Text = string.Empty;
                 var roundTime = _gameTiming.CurTime.Subtract(_gameTicker.RoundStartTimeSpan);
                 Lobby!.StationTime.Text = Loc.GetString("lobby-state-player-status-round-time", ("hours", roundTime.Hours), ("minutes", roundTime.Minutes));
+                Lobby!.StartTime.Text = Loc.GetString("lobby-state-player-status-round-time", ("hours", roundTime.Hours), ("minutes", roundTime.Minutes));
                 return;
             }
 
@@ -175,6 +176,7 @@ private void LobbyStatusUpdated()
             UpdateLobbyaralax();
             UpdateLobbyImage();
             // Sunrise-End
+            UpdateLobbyBackground();
             UpdateLobbyUi();
         }
 
@@ -261,6 +263,19 @@ private void UpdateLobbyImage()
         }
         // Sunrise-end
 
+        private void UpdateLobbyBackground()
+        {
+            if (_gameTicker.LobbyBackground != null)
+            {
+                Lobby!.Background.Texture = _resourceCache.GetResource<TextureResource>(_gameTicker.LobbyBackground );
+            }
+            else
+            {
+                Lobby!.Background.Texture = null;
+            }
+
+        }
+
         private void SetReady(bool newReady)
         {
             if (_gameTicker.IsGameStarted)
@@ -272,3 +287,9 @@ private void SetReady(bool newReady)
         }
     }
 }
+
+public enum LobbyBackgroundType
+{
+    Paralax,
+    Art
+}

Content.Client/Lobby/LobbyUIController.cs

@@ -239,7 +239,7 @@ private void SaveProfile()
 
         _profileEditor.OnOpenGuidebook += _guide.OpenHelp;
 
-        _characterSetup = new CharacterSetupGui(EntityManager, _prototypeManager, _resourceCache, _preferencesManager, _profileEditor);
+        _characterSetup = new CharacterSetupGui(EntityManager, _prototypeManager, _resourceCache, _preferencesManager, _profileEditor, _configurationManager);
 
         _characterSetup.CloseButton.OnPressed += _ =>
         {

Content.Client/Lobby/UI/CharacterSetupGui.xaml

@@ -4,7 +4,7 @@
          xmlns:style="clr-namespace:Content.Client.Stylesheets"
          VerticalExpand="True">
     <Control>
-        <PanelContainer Name="BackgroundPanel" />
+        <PanelContainer Name="BackgroundPanel" StyleClasses="AngleRect"/>
         <BoxContainer Orientation="Vertical" SeparationOverride="0">
             <BoxContainer Orientation="Horizontal" MinSize="0 40">
                 <Label Text="{Loc 'character-setup-gui-character-setup-label'}"

Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs

@@ -1,13 +1,15 @@
 using Content.Client.Info;
 using Content.Client.Info.PlaytimeStats;
 using Content.Client.Resources;
+using Content.Shared._Sunrise.SunriseCCVars;
 using Content.Shared.Preferences;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Lobby.UI
@@ -27,27 +29,33 @@ public sealed partial class CharacterSetupGui : Control
         public event Action<int>? SelectCharacter;
         public event Action<int>? DeleteCharacter;
 
+        private readonly StyleBoxTexture _back;
+
         public CharacterSetupGui(
             IEntityManager entManager,
             IPrototypeManager protoManager,
             IResourceCache resourceCache,
             IClientPreferencesManager preferencesManager,
-            HumanoidProfileEditor profileEditor)
+            HumanoidProfileEditor profileEditor,
+            IConfigurationManager configurationManager)
         {
             RobustXamlLoader.Load(this);
             _preferencesManager = preferencesManager;
             _entManager = entManager;
             _protomanager = protoManager;
+            var configurationManager1 = configurationManager;
 
             var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png");
-            var back = new StyleBoxTexture
+            _back = new StyleBoxTexture
             {
                 Texture = panelTex,
                 Modulate = new Color(37, 37, 42)
             };
-            back.SetPatchMargin(StyleBox.Margin.All, 10);
+            _back.SetPatchMargin(StyleBox.Margin.All, 10);
+
+            SetLobbyOpacity(configurationManager1.GetCVar(SunriseCCVars.LobbyOpacity));
 
-            BackgroundPanel.PanelOverride = back;
+            BackgroundPanel.PanelOverride = _back;
 
             _createNewCharacterButton = new Button
             {
@@ -65,6 +73,18 @@ public CharacterSetupGui(
             RulesButton.OnPressed += _ => new RulesAndInfoWindow().Open();
 
             StatsButton.OnPressed += _ => new PlaytimeStatsWindow().OpenCentered();
+
+            configurationManager1.OnValueChanged(SunriseCCVars.LobbyOpacity, OnLobbyOpacityChanged);
+        }
+
+        private void OnLobbyOpacityChanged(float opacity)
+        {
+            SetLobbyOpacity(opacity);
+        }
+
+        private void SetLobbyOpacity(float opacity)
+        {
+            _back.Modulate = new Color(37, 37, 42).WithAlpha(opacity);
         }
 
         /// <summary>