From 1d92fd2174e45e65188dd6f16fcbf3b361d05f45 Mon Sep 17 00:00:00 2001 From: zzyyyl <74587068+zzyyyl@users.noreply.github.com> Date: Tue, 5 Jul 2022 18:56:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=9C=A8=E4=B8=8D=E5=8B=BE?= =?UTF-8?q?=E9=80=89`=E5=90=83=E7=90=86=E6=99=BA=E8=8D=AF`=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?`=E5=90=83=E7=9F=B3=E5=A4=B4`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml index 88bf77cde2..d76de3c90c 100644 --- a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml +++ b/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml @@ -30,7 +30,7 @@ - + From 5d2745686f4bdc08fab5fa4305e8214e6582f2f9 Mon Sep 17 00:00:00 2001 From: zzyyyl <74587068+zzyyyl@users.noreply.github.com> Date: Tue, 5 Jul 2022 19:18:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=8F=96=E6=B6=88=E5=8B=BE?= =?UTF-8?q?=E9=80=89=20`=E5=90=83=E7=90=86=E6=99=BA=E8=8D=AF`=20=E5=B0=B1?= =?UTF-8?q?=E5=8F=96=E6=B6=88=20`=E5=90=83=E7=9F=B3=E5=A4=B4`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs index 2f43cc9b3d..2c5df7cb4c 100644 --- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs +++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs @@ -945,6 +945,10 @@ namespace MeoAsstGui set { SetAndNotify(ref _useMedicine, value); + if (!value) + { + UseStone = false; + } ViewStatusStorage.Set("MainFunction.UseMedicine", value.ToString()); } }