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

206
Content.Client/Launcher/LauncherConnectingGui.xaml.cs
View File

@@ -1,4 +1,3 @@
using System.Linq;
using Content.Client.Stylesheets;
using Content.Shared.CCVar;
using Content.Shared.Dataset;
@@ -7,133 +6,130 @@ using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Configuration;
using Robust.Shared.IoC;
using Robust.Shared.Timing;
using Robust.Shared.Localization;
using Robust.Shared.Network;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
namespace Content.Client.Launcher
namespace Content.Client.Launcher;
[GenerateTypedNameReferences]
public sealed partial class LauncherConnectingGui : Control
{
[GenerateTypedNameReferences]
public sealed partial class LauncherConnectingGui : Control
private const float RedialWaitTimeSeconds = 15f;
private readonly LauncherConnecting _state;
private readonly IRobustRandom _random;
private readonly IPrototypeManager _prototype;
private readonly IConfigurationManager _cfg;
private float _redialWaitTime = RedialWaitTimeSeconds;
public LauncherConnectingGui(LauncherConnecting state, IRobustRandom random,
IPrototypeManager prototype, IConfigurationManager config)
{
private const float RedialWaitTimeSeconds = 15f;
private readonly LauncherConnecting _state;
private readonly IRobustRandom _random;
private readonly IPrototypeManager _prototype;
private readonly IConfigurationManager _cfg;
_state = state;
_random = random;
_prototype = prototype;
_cfg = config;
private float _redialWaitTime = RedialWaitTimeSeconds;
RobustXamlLoader.Load(this);
public LauncherConnectingGui(LauncherConnecting state, IRobustRandom random,
IPrototypeManager prototype, IConfigurationManager config)
LayoutContainer.SetAnchorPreset(this, LayoutContainer.LayoutPreset.Wide);
Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
ChangeLoginTip();
ReconnectButton.OnPressed += _ => _state.RetryConnect();
// Redial shouldn't fail, but if it does, try a reconnect (maybe we're being run from debug)
RedialButton.OnPressed += _ =>
{
_state = state;
_random = random;
_prototype = prototype;
_cfg = config;
if (!_state.Redial())
_state.RetryConnect();
};
RetryButton.OnPressed += _ => _state.RetryConnect();
ExitButton.OnPressed += _ => _state.Exit();
RobustXamlLoader.Load(this);
var addr = state.Address;
if (addr != null)
ConnectingAddress.Text = addr;
LayoutContainer.SetAnchorPreset(this, LayoutContainer.LayoutPreset.Wide);
state.PageChanged += OnPageChanged;
state.ConnectFailReasonChanged += ConnectFailReasonChanged;
state.ConnectionStateChanged += ConnectionStateChanged;
Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
ConnectionStateChanged(state.ConnectionState);
ChangeLoginTip();
ReconnectButton.OnPressed += _ => _state.RetryConnect();
// Redial shouldn't fail, but if it does, try a reconnect (maybe we're being run from debug)
RedialButton.OnPressed += _ =>
{
if (!_state.Redial())
_state.RetryConnect();
};
RetryButton.OnPressed += _ => _state.RetryConnect();
ExitButton.OnPressed += _ => _state.Exit();
// Redial flag setup
var edim = IoCManager.Resolve<ExtendedDisconnectInformationManager>();
edim.LastNetDisconnectedArgsChanged += LastNetDisconnectedArgsChanged;
LastNetDisconnectedArgsChanged(edim.LastNetDisconnectedArgs);
}
var addr = state.Address;
if (addr != null)
ConnectingAddress.Text = addr;
private void ConnectFailReasonChanged(string? reason)
{
ConnectFailReason.SetMessage(reason == null
? ""
: Loc.GetString("connecting-fail-reason", ("reason", reason)));
}
state.PageChanged += OnPageChanged;
state.ConnectFailReasonChanged += ConnectFailReasonChanged;
state.ConnectionStateChanged += ConnectionStateChanged;
private void LastNetDisconnectedArgsChanged(NetDisconnectedArgs? args)
{
var redialFlag = args?.RedialFlag ?? false;
RedialButton.Visible = redialFlag;
ReconnectButton.Visible = !redialFlag;
}
ConnectionStateChanged(state.ConnectionState);
private void ChangeLoginTip()
{
var tipsDataset = _cfg.GetCVar(CCVars.LoginTipsDataset);
var loginTipsEnabled = _prototype.TryIndex<DatasetPrototype>(tipsDataset, out var tips);
// Redial flag setup
var edim = IoCManager.Resolve<ExtendedDisconnectInformationManager>();
edim.LastNetDisconnectedArgsChanged += LastNetDisconnectedArgsChanged;
LastNetDisconnectedArgsChanged(edim.LastNetDisconnectedArgs);
//LoginTips.Visible = loginTipsEnabled;
if (!loginTipsEnabled)
{
return;
}
private void ConnectFailReasonChanged(string? reason)
var tipList = tips!.Values;
if (tipList.Count == 0)
return;
var randomIndex = _random.Next(tipList.Count);
var tip = tipList[randomIndex];
//LoginTip.SetMessage(tip);
//LoginTipTitle.Text = Loc.GetString("connecting-window-tip", ("numberTip", randomIndex));
}
protected override void FrameUpdate(FrameEventArgs args)
{
base.FrameUpdate(args);
_redialWaitTime -= args.DeltaSeconds;
if (_redialWaitTime <= 0)
{
ConnectFailReason.SetMessage(reason == null
? ""
: Loc.GetString("connecting-fail-reason", ("reason", reason)));
RedialButton.Disabled = false;
RedialButton.Text = Loc.GetString("connecting-redial");
}
private void LastNetDisconnectedArgsChanged(NetDisconnectedArgs? args)
else
{
var redialFlag = args?.RedialFlag ?? false;
RedialButton.Visible = redialFlag;
ReconnectButton.Visible = !redialFlag;
}
private void ChangeLoginTip()
{
var tipsDataset = _cfg.GetCVar(CCVars.LoginTipsDataset);
var loginTipsEnabled = _prototype.TryIndex<DatasetPrototype>(tipsDataset, out var tips);
LoginTips.Visible = loginTipsEnabled;
if (!loginTipsEnabled)
{
return;
}
var tipList = tips!.Values;
if (tipList.Count == 0)
return;
var randomIndex = _random.Next(tipList.Count);
var tip = tipList[randomIndex];
LoginTip.SetMessage(tip);
LoginTipTitle.Text = Loc.GetString("connecting-window-tip", ("numberTip", randomIndex));
}
protected override void FrameUpdate(FrameEventArgs args)
{
base.FrameUpdate(args);
_redialWaitTime -= args.DeltaSeconds;
if (_redialWaitTime <= 0)
{
RedialButton.Disabled = false;
RedialButton.Text = Loc.GetString("connecting-redial");
}
else
{
RedialButton.Disabled = true;
RedialButton.Text = Loc.GetString("connecting-redial-wait", ("time", _redialWaitTime.ToString("00.000")));
}
}
private void OnPageChanged(LauncherConnecting.Page page)
{
ConnectingStatus.Visible = page == LauncherConnecting.Page.Connecting;
ConnectFail.Visible = page == LauncherConnecting.Page.ConnectFailed;
Disconnected.Visible = page == LauncherConnecting.Page.Disconnected;
if (page == LauncherConnecting.Page.Disconnected)
DisconnectReason.Text = _state.LastDisconnectReason;
}
private void ConnectionStateChanged(ClientConnectionState state)
{
ConnectStatus.Text = Loc.GetString($"connecting-state-{state}");
RedialButton.Disabled = true;
RedialButton.Text = Loc.GetString("connecting-redial-wait", ("time", _redialWaitTime.ToString("00.000")));
}
}
private void OnPageChanged(LauncherConnecting.Page page)
{
ConnectingStatus.Visible = page == LauncherConnecting.Page.Connecting;
ConnectFail.Visible = page == LauncherConnecting.Page.ConnectFailed;
Disconnected.Visible = page == LauncherConnecting.Page.Disconnected;
if (page == LauncherConnecting.Page.Disconnected)
DisconnectReason.Text = _state.LastDisconnectReason;
}
private void ConnectionStateChanged(ClientConnectionState state)
{
ConnectStatus.Text = Loc.GetString($"connecting-state-{state}");
}
}