From a99f7ddfecb2abace0eb7b5cb013015755df30e6 Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Thu, 22 Dec 2022 12:34:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=B7=E4=BF=A1?= =?UTF-8?q?=E7=94=A8=E5=9C=A8=E9=83=A8=E5=88=86=E7=94=B5=E8=84=91=E4=B8=8A?= =?UTF-8?q?=E7=94=A8=E4=B8=8D=E4=BA=86=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Main/AsstProxy.cs | 5 ++++- src/MaaWpfGui/Main/SettingsViewModel.cs | 15 +++++++++++++++ .../UserControl/MallSettingsUserControl.xaml | 6 +++--- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 95ffedab1b..d1698d0426 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -500,7 +500,10 @@ namespace MaaWpfGui } else if (taskChain == "Mall") { - settingsModel.LastCreditFightTaskTime = Utils.GetYJTimeDateString(); + if (settingsModel.CreditFightTaskEnabledDisplay) + { + settingsModel.LastCreditFightTaskTime = Utils.GetYJTimeDateString(); + } } mainModel.AddLog(Localization.GetString("CompleteTask") + taskChain); diff --git a/src/MaaWpfGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs index 3e2328b0d1..4b8eddf614 100644 --- a/src/MaaWpfGui/Main/SettingsViewModel.cs +++ b/src/MaaWpfGui/Main/SettingsViewModel.cs @@ -1060,6 +1060,10 @@ namespace MaaWpfGui return _creditFightTaskEnabled; } } + else + { + return _creditFightTaskEnabled; + } return false; } @@ -1071,6 +1075,17 @@ namespace MaaWpfGui } } + public bool CreditFightTaskEnabledDisplay + { + get => _creditFightTaskEnabled; + + set + { + SetAndNotify(ref _creditFightTaskEnabled, value); + ViewStatusStorage.Set("Visit.CreditFightTaskEnabled", value.ToString()); + } + } + /* 信用商店设置 */ private bool _creditShopping = Convert.ToBoolean(ViewStatusStorage.Get("Mall.CreditShopping", bool.TrueString)); diff --git a/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml index 95700dac7b..03c6c42cda 100644 --- a/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml @@ -17,9 +17,9 @@ + Orientation="Horizontal">