From 2024bfb99092097061035e502be00f6e29240943 Mon Sep 17 00:00:00 2001 From: bob <605277374@qq.com> Date: Mon, 23 Jun 2025 10:52:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=AE=BE=E7=BD=AE=E6=8C=89?= =?UTF-8?q?=E9=94=AE=E7=BB=91=E5=AE=9A=E5=92=8C=E5=8F=96=E6=B6=88=E7=BB=91?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Settings/Base/InputOption.cs | 16 +++++++++++++-- .../Services/Settings/Base/OptionBase.cs | 6 ++++++ Assets/Scripts/UI/Settings/SettingPanel.cs | 19 ++++++++++++++++++ Config/language/Language.xlsx | Bin 11390 -> 11917 bytes 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Common/Services/Settings/Base/InputOption.cs b/Assets/Scripts/Common/Services/Settings/Base/InputOption.cs index bc4829e87..2956f5bd8 100644 --- a/Assets/Scripts/Common/Services/Settings/Base/InputOption.cs +++ b/Assets/Scripts/Common/Services/Settings/Base/InputOption.cs @@ -25,8 +25,8 @@ namespace NBF.Setting public override void Apply() { // 保存绑定 - PlayerPrefs.SetString(SaveKey, InputAction.SaveBindingOverridesAsJson()); - SaveValue = Value; + InputSaveValue = InputAction.SaveBindingOverridesAsJson(); + PlayerPrefs.SetString(SaveKey, InputSaveValue); OnApply(); } @@ -66,6 +66,18 @@ namespace NBF.Setting } } + public override void Cancel() + { + if (!string.IsNullOrEmpty(InputSaveValue)) + { + InputAction.LoadBindingOverridesFromJson(InputSaveValue); + } + else + { + Reset(); + } + } + public override string GetDisplayString() { if (InputAction != null) diff --git a/Assets/Scripts/Common/Services/Settings/Base/OptionBase.cs b/Assets/Scripts/Common/Services/Settings/Base/OptionBase.cs index 612fc4f74..9be244d6b 100644 --- a/Assets/Scripts/Common/Services/Settings/Base/OptionBase.cs +++ b/Assets/Scripts/Common/Services/Settings/Base/OptionBase.cs @@ -83,6 +83,12 @@ namespace NBF.Setting Value = DefaultValue; } + public virtual void Cancel() + { + + } + + public virtual string GetDisplayString() { return GetValue().ToString(); diff --git a/Assets/Scripts/UI/Settings/SettingPanel.cs b/Assets/Scripts/UI/Settings/SettingPanel.cs index f3ffa540b..4aea1d956 100644 --- a/Assets/Scripts/UI/Settings/SettingPanel.cs +++ b/Assets/Scripts/UI/Settings/SettingPanel.cs @@ -131,6 +131,7 @@ namespace NBF { option.Apply(); } + Notices.Success("TEXT_OP_SUCCESS"); } private void OnResetSettings() @@ -240,6 +241,7 @@ namespace NBF { if (b) { + CancelAndBack(); Hide(); } }); @@ -250,6 +252,23 @@ namespace NBF } } + private void CancelAndBack() + { + + var groupNames = Settings.Instance.GetAllTabs(); + foreach (var group in groupNames) + { + var options = Settings.Instance.GetOptionsByTab(group); + foreach (var option in options) + { + if (option.HaveNotApple()) + { + option.Cancel(); + } + } + } + } + protected override void OnHide() { base.OnHide(); diff --git a/Config/language/Language.xlsx b/Config/language/Language.xlsx index 9051766c8b90c565bd4635474e43b5831bb7850e..776c81703c071b433a23d195a124604513609869 100644 GIT binary patch delta 5323 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 OU6OjMVTtEA?SB9bjHO2a delta 4829 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 M*3Hzm