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

Тайминги + фикс всего.

Browse Source
This commit is contained in:
Іван Оніщенко
2025-01-07 18:27:35 +03:00
parent 5c7d9dd420
commit c7e31c53ab
5 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.Client/_White/Administration/HoursPanelSystems/HoursPanel.xaml.cs
View File

@@ -17,17 +17,17 @@ namespace Content.Client._White.Administration.HoursPanelSystems;
public sealed partial class HoursPanel : DefaultWindow public sealed partial class HoursPanel : DefaultWindow
{ {
private HoursPanelSystem _huetaSystem =new(); public HoursPanelSystem _huetaSystem;
public HoursPanel() public HoursPanel()
{ {
// var owner = new HoursPanelSystem(this);
var owner = _huetaSystem;
owner._panel = this;
RobustXamlLoader.Load(this); RobustXamlLoader.Load(this);
var entityManager = IoCManager.Resolve<IEntityManager>();
_huetaSystem = entityManager.System<HoursPanelSystem>();
_huetaSystem._panel = this;
var owner = _huetaSystem;
var roles = new Dictionary<int, string>(); var roles = new Dictionary<int, string>();
PlayerNameLine.OnTextChanged += _ => OnNamesChanged(); PlayerNameLine.OnTextChanged += _ => OnNamesChanged();
PlayerNameLine.OnTextEntered += _ => OnNameSubmited(owner, roles); PlayerNameLine.OnTextEntered += _ => OnNameSubmited(owner, roles);
@@ -39,14 +39,20 @@ public sealed partial class HoursPanel : DefaultWindow
SaveButton.OnPressed += _ => OnSaveButtonOnPressed(); SaveButton.OnPressed += _ => OnSaveButtonOnPressed();
OnNamesChanged(); OnNamesChanged();
InitRoleList(roles); InitRoleList(roles);
} }
public void UpdateTime(TimeSpan? time) public void UpdateTime(TimeSpan? time)
{ {
if (time == null) if (time == null)
TimeDisplayer.Text = $"Время игры: нет данных"; TimeDisplayer.Text = $"Время игры: нет данных";
else else
TimeDisplayer.Text = $"Время игры: {time}"; TimeDisplayer.Text = $"Время игры: {time}";
} }
private void OnItemSelected(OptionButton.ItemSelectedEventArgs args, HoursPanelSystem owner, Dictionary<int, string> roles) private void OnItemSelected(OptionButton.ItemSelectedEventArgs args, HoursPanelSystem owner, Dictionary<int, string> roles)
@@ -127,6 +133,8 @@ public sealed partial class HoursPanel : DefaultWindow
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand( IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
$"playtime_addrole {PlayerNameLine.Text} {roles[RoleOption.SelectedId]} {MinutesLine.Text}"); $"playtime_addrole {PlayerNameLine.Text} {roles[RoleOption.SelectedId]} {MinutesLine.Text}");
SaveButton.Disabled = false; SaveButton.Disabled = false;
_huetaSystem.SendPlayerTimeRequest(new HoursPanelMessageToServer(PlayerNameLine.Text, roles[RoleOption.SelectedId]));
} }
private void OnSaveButtonOnPressed() private void OnSaveButtonOnPressed()

17
Content.Client/_White/Administration/HoursPanelSystems/HoursPanelSystem.cs
View File

@@ -8,17 +8,14 @@ public sealed class HoursPanelSystem : EntitySystem
public HoursPanel? _panel; public HoursPanel? _panel;
//private HoursPanel _panel;
public HoursPanelSystem() public HoursPanelSystem()
{ {
} }
//private HoursPanel _panel;
//public HoursPanelSystem(HoursPanel panel)
//{
// _panel = panel;
//}
public override void Initialize() public override void Initialize()
{ {
@@ -29,14 +26,14 @@ public sealed class HoursPanelSystem : EntitySystem
private void OnHoursPanelMessage(HoursPanelMessageToClient message, EntitySessionEventArgs eventArgs) private void OnHoursPanelMessage(HoursPanelMessageToClient message, EntitySessionEventArgs eventArgs)
{ {
_panel.UpdateTime(message.Time); _panel?.UpdateTime(message.Time);
} }
public void SendPlayerTimeRequest(HoursPanelMessageToServer message) public void SendPlayerTimeRequest(HoursPanelMessageToServer message)
{ {
var _entityManager = IoCManager.Resolve<EntityManager>(); var _entityManager = IoCManager.Resolve<EntityManager>();
var _che = _entityManager.System<CheZaHuetaSystem>(); var _che = _entityManager.System<CheZaHuetaSystem>();
_che.SendNetMessage(message); _che.SendNetMessage(message);
//RaiseNetworkEvent(message); // RaiseNetworkEvent(message);
} }
} }

2
Content.Server/_White/Administration/HoursPanelSystem.cs
View File

@@ -17,7 +17,7 @@ public sealed class HoursPanelSystem : EntitySystem
} }
private void OnHoursPanelMessage(HoursPanelMessageToServer message, EntitySessionEventArgs eventArgs) private void OnHoursPanelMessage(HoursPanelMessageToServer message, EntitySessionEventArgs eventArgs)
{ {
if (_playerManager.TryGetSessionByUsername(message.PlayerCKey, out var player)) if (!_playerManager.TryGetSessionByUsername(message.PlayerCKey, out var player))
return; return;
if (player == null) if (player == null)

1
Content.Shared/_White/Administration/HoursPanelSystem/HoursPanelMessages.cs
View File

@@ -14,6 +14,7 @@ public sealed class HoursPanelMessageToServer : EntityEventArgs
} }
} }
[Serializable, NetSerializable]
public sealed class HoursPanelMessageToClient : EntityEventArgs public sealed class HoursPanelMessageToClient : EntityEventArgs
{ {
public TimeSpan Time { get; } public TimeSpan Time { get; }

2
global.json
View File

@@ -1,5 +1,5 @@
{ {
"sdk": { "sdk": {
"version": "8.0.205" "version": "8.0.202"
} }
} }