fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 02:23:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 非水月肉鸽不显示刷新商店获取指路鳞选项

Browse Source
This commit is contained in:
SherkeyXD
2023-09-25 23:43:53 +08:00
parent 0dde796ffc
commit 403003ffae
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/MaaWpfGui/Main/AsstProxy.cs
View File

@@ -1789,6 +1789,11 @@ namespace MaaWpfGui.Main
task_params["use_nonfriend_support"] = enable_nonfriend_support;
task_params["refresh_trader_with_dice"] = refresh_trader_with_dice;
if (theme != "Mizuki")
{
task_params["refresh_trader_with_dice"] = false;
}
AsstTaskId id = AsstAppendTaskWithEncoding("Roguelike", task_params);
_latestTaskId[TaskType.Roguelike] = id;
return id != 0;

15
src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
View File

@@ -1786,18 +1786,6 @@ namespace MaaWpfGui.ViewModels.UI
}
}
private bool _roguelikeRefreshTraderWithDiceEnabled = false;
public bool RoguelikeRefreshTraderWithDiceEnabled
{
get => _roguelikeRefreshTraderWithDiceEnabled;
set
{
SetAndNotify(ref _roguelikeRefreshTraderWithDiceEnabled, value);
RoguelikeRefreshTraderWithDice = false;
}
}
private string _roguelikeInvestsCount = ConfigurationHelper.GetValue(ConfigurationKeys.RoguelikeInvestsCount, "9999999");
/// <summary>
@@ -3587,7 +3575,6 @@ namespace MaaWpfGui.ViewModels.UI
switch (RoguelikeTheme)
{
case "Phantom":
RoguelikeRefreshTraderWithDiceEnabled = false;
foreach (var item in new ObservableCollection<CombinedData>
{
@@ -3600,7 +3587,6 @@ namespace MaaWpfGui.ViewModels.UI
break;
case "Mizuki":
RoguelikeRefreshTraderWithDiceEnabled = true;
foreach (var item in new ObservableCollection<CombinedData>
{
@@ -3616,7 +3602,6 @@ namespace MaaWpfGui.ViewModels.UI
break;
case "Sami":
RoguelikeRefreshTraderWithDiceEnabled = false;
foreach (var item in new ObservableCollection<CombinedData>
{

4
src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml
View File

@@ -20,6 +20,7 @@
<UserControl.Resources>
<local:InvestmentButtonEnabledConverter x:Key="InvestmentButtonEnabledConverter" />
<local:InvestmentButtonCheckedConverter x:Key="InvestmentButtonCheckedConverter" />
<local:RefreshTraderWithDiceVisibilityConverter x:Key="RefreshTraderWithDiceVisibilityConverter" />
</UserControl.Resources>
<StackPanel>
<StackPanel IsEnabled="{Binding Idle}" Visibility="{c:Binding !TaskSettingVisibilities.EnableAdvancedSettings}">
@@ -94,7 +95,8 @@
Margin="0,10"
Content="{DynamicResource RefreshTraderWithDice}"
IsChecked="{Binding RoguelikeRefreshTraderWithDice}"
IsEnabled="{Binding RoguelikeRefreshTraderWithDiceEnabled}" />
Visibility="{Binding RoguelikeTheme,
Converter={StaticResource RefreshTraderWithDiceVisibilityConverter}}" />
<ComboBox
Margin="0,5"
hc:InfoElement.Title="{DynamicResource StartingRoles}"

17
src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml.cs
View File

@@ -13,6 +13,7 @@
using System;
using System.Globalization;
using System.Reflection;
using System.Windows;
using System.Windows.Data;
namespace MaaWpfGui.Views.UserControl
@@ -79,4 +80,20 @@ namespace MaaWpfGui.Views.UserControl
}
}
public class RefreshTraderWithDiceVisibilityConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
string RoguelikeTheme = System.Convert.ToString(value);
if (RoguelikeTheme == "Mizuki")
return System.Windows.Visibility.Visible;
return System.Windows.Visibility.Collapsed;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotSupportedException();
}
}
}