Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- add: new tiles and another ui tweaks (#11)

Browse Source 
* - fix: audio crash

* - tweak: main menu

* connect gui

* some shaders here

* tiles
This commit is contained in:
rhailrake
2024-01-31 15:08:17 +00:00
committed by GitHub
parent 177d295346
commit 483ab4eb2c
66 changed files with 342 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/MainMenu/MainMenu.cs
View File

@@ -2,7 +2,6 @@ using System.Text.RegularExpressions;
using Content.Client.MainMenu.UI;
using Content.Client.UserInterface.Systems.EscapeMenu;
using Robust.Client;
using Robust.Client.ResourceManagement;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared;
@@ -23,7 +22,6 @@ namespace Content.Client.MainMenu
[Dependency] private readonly IClientNetManager _netManager = default!;
[Dependency] private readonly IConfigurationManager _configurationManager = default!;
[Dependency] private readonly IGameController _controllerProxy = default!;
[Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
private MainMenuControl _mainMenuControl = default!;
@@ -35,7 +33,7 @@ namespace Content.Client.MainMenu
/// <inheritdoc />
protected override void Startup()
{
_mainMenuControl = new MainMenuControl(_resourceCache, _configurationManager);
_mainMenuControl = new MainMenuControl(_configurationManager);
_userInterfaceManager.StateRoot.AddChild(_mainMenuControl);
_mainMenuControl.QuitButton.OnPressed += QuitButtonPressed;

67
Content.Client/MainMenu/UI/MainMenuControl.xaml
View File

@@ -1,45 +1,38 @@
<Control xmlns="https://spacestation14.io"
xmlns:pllax="clr-namespace:Content.Client.Parallax"
xmlns:clog="clr-namespace:Content.Client.Changelog">
<pllax:ParallaxControl />
<TextureRect Access="Public" TexturePath="/Textures/Ohio/ohfuck.png" VerticalExpand="True" HorizontalExpand="True" Name="Background" Stretch="KeepAspectCovered"/>
<LayoutContainer>
<BoxContainer Name="VBox"
Orientation="Vertical"
StyleIdentifier="mainMenuVBox">
<TextureRect Name="Logo"
Stretch="KeepCentered" />
<BoxContainer Orientation="Horizontal"
SeparationOverride="4">
<Label Text="{Loc 'main-menu-username-label'}" />
<LineEdit Name="UsernameBox"
Access="Public"
PlaceHolder="{Loc 'main-menu-username-text'}"
HorizontalExpand="True" />
<BoxContainer Name="VBox" Orientation="Vertical" StyleIdentifier="MainMenuBox" MinWidth="300" >
<Label Name="Title" Text="GREEN MIRACLE" Align="Center" />
<Control MinSize="0 4" />
<BoxContainer Orientation="Horizontal" SeparationOverride="4">
<LineEdit Name="UsernameBox" Access="Public" PlaceHolder="{Loc 'main-menu-username-text'}" HorizontalExpand="True" />
</BoxContainer>
<LineEdit Name="AddressBox"
Access="Public"
Text="localhost"
PlaceHolder="server address:port"
HorizontalExpand="True" />
<Button Name="DirectConnectButton"
Access="Public"
Text="{Loc 'main-menu-direct-connect-button'}"
TextAlign="Center"
StyleIdentifier="mainMenu" />
<Control MinSize="0 2" />
<Button Name="OptionsButton"
Access="Public"
Text="{Loc 'main-menu-options-button'}"
TextAlign="Center"
StyleIdentifier="mainMenu" />
<Button Name="QuitButton"
Access="Public"
Text="{Loc 'main-menu-quit-button'}"
TextAlign="Center"
StyleIdentifier="mainMenu" />
<clog:ChangelogButton
Name="ChangelogButton"
Access="Public"/>
<LineEdit Name="AddressBox" Access="Public" Text="localhost" PlaceHolder="server address:port" HorizontalExpand="True" />
<Control MinSize="0 2" />
<Button Name="DirectConnectButton" Access="Public" Text="{Loc 'main-menu-direct-connect-button'}" TextAlign="Center" />
<Button Name="OptionsButton" Access="Public" Text="{Loc 'main-menu-options-button'}" TextAlign="Center" />
<clog:ChangelogButton Name="ChangelogButton" Access="Public" />
<Button Name="QuitButton" Access="Public" Text="{Loc 'main-menu-quit-button'}" TextAlign="Center" />
</BoxContainer>
</LayoutContainer>
</Control>

13
Content.Client/MainMenu/UI/MainMenuControl.xaml.cs
View File

@@ -1,5 +1,4 @@
using Robust.Client.AutoGenerated;
using Robust.Client.ResourceManagement;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
@@ -11,19 +10,15 @@ namespace Content.Client.MainMenu.UI;
[GenerateTypedNameReferences]
public sealed partial class MainMenuControl : Control
{
public MainMenuControl(IResourceCache resCache, IConfigurationManager configMan)
public MainMenuControl(IConfigurationManager configMan)
{
RobustXamlLoader.Load(this);
LayoutContainer.SetAnchorPreset(this, LayoutContainer.LayoutPreset.Wide);
LayoutContainer.SetAnchorPreset(VBox, LayoutContainer.LayoutPreset.TopRight);
LayoutContainer.SetMarginRight(VBox, -25);
LayoutContainer.SetMarginTop(VBox, 30);
LayoutContainer.SetGrowHorizontal(VBox, LayoutContainer.GrowDirection.Begin);
var logoTexture = resCache.GetResource<TextureResource>("/Textures/Logo/logo.png");
Logo.Texture = logoTexture;
LayoutContainer.SetAnchorPreset(VBox, LayoutContainer.LayoutPreset.Center);
LayoutContainer.SetGrowHorizontal(VBox, LayoutContainer.GrowDirection.Both);
LayoutContainer.SetGrowVertical(VBox, LayoutContainer.GrowDirection.Both);
var currentUserName = configMan.GetCVar(CVars.PlayerName);
UsernameBox.Text = currentUserName;