From bd9c8a75c0d17143836963573b21db5571bc7fde Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Thu, 26 Dec 2024 00:10:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=91=D0=A0=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthPanel/AuthPanelBoundUserInterface.cs | 25 +++--- .../_White/AuthPanel/AuthPanelMenu.xaml | 12 +-- .../_White/AuthPanel/AuthPanelMenu.xaml.cs | 58 ++++++------ .../_White/AuthPanel/AuthPanelSystem.cs | 90 +++++++++++++------ .../ERTRecruitment/ERTRecruitmentRule.cs | 8 +- .../ERTRecruitmentRuleComponent.cs | 5 +- Resources/Locale/ru-RU/_white/auth-panel.ftl | 10 ++- Resources/Locale/ru-RU/guidebook/guides.ftl | 1 + Resources/Prototypes/Guidebook/security.yml | 6 ++ .../Entities/Structures/Wallmounts/auth.yml | 3 + .../Prototypes/_White/event_prototypes.yml | 1 - .../Guidebook/Security/AuthPanel.xml | 31 +++++++ 12 files changed, 164 insertions(+), 86 deletions(-) create mode 100644 Resources/ServerInfo/Guidebook/Security/AuthPanel.xml diff --git a/Content.Client/_White/AuthPanel/AuthPanelBoundUserInterface.cs b/Content.Client/_White/AuthPanel/AuthPanelBoundUserInterface.cs index 29dbb73a86..014f54574c 100644 --- a/Content.Client/_White/AuthPanel/AuthPanelBoundUserInterface.cs +++ b/Content.Client/_White/AuthPanel/AuthPanelBoundUserInterface.cs @@ -17,9 +17,9 @@ public sealed class AuthPanelBoundUserInterface : BoundUserInterface _menu = new AuthPanelMenu(); - _menu.OnRedButtonPressed(_=>SendButtonPressed(AuthPanelAction.ERTRecruit)); - _menu.OnAccessButtonPressed(_=>SendButtonPressed(AuthPanelAction.AddAccess)); - _menu.OnBluespaceWeaponButtonPressed(_=>SendButtonPressed(AuthPanelAction.BluespaceWeapon)); + _menu.OnRedButtonPressed(_ => SendButtonPressed(AuthPanelAction.ERTRecruit)); + // _menu.OnAccessButtonPressed(_ => SendButtonPressed(AuthPanelAction.AddAccess)); + // _menu.OnBluespaceWeaponButtonPressed(_ => SendButtonPressed(AuthPanelAction.BluespaceWeapon)); _menu.OnClose += Close; _menu.OpenCentered(); @@ -27,26 +27,27 @@ public sealed class AuthPanelBoundUserInterface : BoundUserInterface public void SendButtonPressed(AuthPanelAction button) { - SendMessage(new AuthPanelButtonPressedMessage(button,_menu?.GetReason())); + SendMessage(new AuthPanelButtonPressedMessage(button, _menu?.GetReason())); } protected override void UpdateState(BoundUserInterfaceState state) { - if(state is not AuthPanelConfirmationActionState confirmationActionState) + if (state is not AuthPanelConfirmationActionState confirmationActionState) return; var action = confirmationActionState.Action; - if(action.Action is AuthPanelAction.AddAccess) - _menu?.SetAccessCount(action.ConfirmedPeopleCount,action.MaxConfirmedPeopleCount); - if(action.Action is AuthPanelAction.ERTRecruit) - _menu?.SetRedCount(action.ConfirmedPeopleCount,action.MaxConfirmedPeopleCount); - if(action.Action is AuthPanelAction.BluespaceWeapon) - _menu?.SetWeaponCount(action.ConfirmedPeopleCount,action.MaxConfirmedPeopleCount); + // if (action.Action is AuthPanelAction.AddAccess) + // _menu?.SetAccessCount(action.ConfirmedPeopleCount, action.MaxConfirmedPeopleCount); + if (action.Action is AuthPanelAction.ERTRecruit) + _menu?.SetRedCount(action.ConfirmedPeopleCount, action.MaxConfirmedPeopleCount); + // if (action.Action is AuthPanelAction.BluespaceWeapon) + // _menu?.SetWeaponCount(action.ConfirmedPeopleCount, action.MaxConfirmedPeopleCount); _menu?.SetReason(action.Reason); - + if (action.ConfirmedPeopleCount == 0) + _menu?.UnlockReason(); } protected override void Dispose(bool disposing) diff --git a/Content.Client/_White/AuthPanel/AuthPanelMenu.xaml b/Content.Client/_White/AuthPanel/AuthPanelMenu.xaml index eb2b67705d..28b10fd96e 100644 --- a/Content.Client/_White/AuthPanel/AuthPanelMenu.xaml +++ b/Content.Client/_White/AuthPanel/AuthPanelMenu.xaml @@ -1,9 +1,9 @@ + Title="{Loc 'auth-panel-name'}" + MinSize="500 300" + SetSize="500 300">