From 18cbfdfd1361d33f252fda9561d6e16b9fc6be58 Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Sat, 17 Sep 2022 14:21:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=9D=90=E6=96=99=E9=80=89=E6=8B=A9=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserControl/FightSettingsUserControl.xaml | 1 - .../ViewModels/TaskQueueViewModel.cs | 34 +------------------ 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml index 304413c44f..9e91e3ea92 100644 --- a/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml +++ b/src/MeoAsstGui/UserControl/FightSettingsUserControl.xaml @@ -108,7 +108,6 @@ Margin="0,6" VerticalContentAlignment="Center" DisplayMemberPath="Display" - IsDropDownOpen="{Binding IsDropDown}" IsEditable="True" IsTextSearchEnabled="False" Loaded="{s:Action DropsList_Loaded}" diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs index 176fab3d6b..02076f282c 100644 --- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs +++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs @@ -1619,8 +1619,6 @@ namespace MeoAsstGui } private string _dropsItem = string.Empty; - private bool _isFirstLoadDropItem = true; - private long _preSetDropsItemTicks = 0; /// /// Gets or sets the item of drops. @@ -1628,37 +1626,7 @@ namespace MeoAsstGui public string DropsItem { get => _dropsItem; - set - { - if (_isFirstLoadDropItem) - { - _isFirstLoadDropItem = false; - } - else - { - IsDropDown = true; - } - - if (DateTime.Now.Ticks - _preSetDropsItemTicks < 50) - { - return; - } - - _preSetDropsItemTicks = DateTime.Now.Ticks; - - SetAndNotify(ref _dropsItem, value); - } - } - - private bool _isDropDown = false; - - /// - /// Gets or sets a value indicating whether it is dropdown. - /// - public bool IsDropDown - { - get => _isDropDown; - set => SetAndNotify(ref _isDropDown, value); + set => SetAndNotify(ref _dropsItem, value); } private string _dropsQuantity = ViewStatusStorage.Get("MainFunction.Drops.Quantity", "5");