From 8d846090967ba8a5758966bdc60f207da7fbacef Mon Sep 17 00:00:00 2001 From: ABA2396 <2396806385@qq.com> Date: Fri, 22 Jul 2022 01:33:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E6=82=AC=E5=81=9C=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserControl/AutoRecruitSettingsUserControl.xaml | 2 +- src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml | 5 +++-- src/MeoAsstGui/UserControl/InfrastSettingsUserControl.xaml | 2 +- src/MeoAsstGui/ViewModels/SettingsViewModel.cs | 4 ++-- src/MeoAsstGui/Views/CopilotView.xaml | 3 ++- src/MeoAsstGui/Views/TaskQueueView.xaml | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml index 1a895641ff..7f1d13326f 100644 --- a/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml +++ b/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml @@ -26,7 +26,7 @@ - + diff --git a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml index 1ec9101656..3015a6279e 100644 --- a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml +++ b/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml @@ -40,7 +40,7 @@ - - + + ItemsSource="{Binding Path=InfrastItemViewModels}" ToolTip="标签顺序可拖动"> diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs index fe9a2fc63f..6d57146c1a 100644 --- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs +++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs @@ -131,7 +131,7 @@ namespace MeoAsstGui new CombData { Display = "兼容模式", Value = "Compatible" }, }; - _dormThresholdLabel = "宿舍入驻心情阈值:" + _dormThreshold + "%"; + _dormThresholdLabel = "基建工作心情阈值:" + _dormThreshold + "%"; RoguelikeModeList = new List { @@ -313,7 +313,7 @@ namespace MeoAsstGui get { return _dormThreshold; } set { - DormThresholdLabel = "宿舍入驻心情阈值:" + _dormThreshold + "%"; + DormThresholdLabel = "基建工作心情阈值:" + _dormThreshold + "%"; SetAndNotify(ref _dormThreshold, value); ViewStatusStorage.Set("Infrast.DormThreshold", value.ToString()); } diff --git a/src/MeoAsstGui/Views/CopilotView.xaml b/src/MeoAsstGui/Views/CopilotView.xaml index e0d706ffba..351271c38f 100644 --- a/src/MeoAsstGui/Views/CopilotView.xaml +++ b/src/MeoAsstGui/Views/CopilotView.xaml @@ -23,7 +23,8 @@