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

refactor: 迁移部分设置判断到SettingsViewModel

Browse Source
This commit is contained in:
SherkeyXD
2023-09-26 15:45:15 +08:00
parent ab3c4542ab
commit a6bd83e248
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1764,11 +1764,6 @@ namespace MaaWpfGui.Main
["theme"] = theme,
};
if (mode == 1 || mode == 4)
{
task_params["investment_enabled"] = true;
}
if (squad.Length > 0)
{
task_params["squad"] = squad;
@@ -1787,7 +1782,7 @@ namespace MaaWpfGui.Main
task_params["start_with_elite_two"] = start_with_elite_two;
task_params["use_support"] = use_support;
task_params["use_nonfriend_support"] = enable_nonfriend_support;
task_params["refresh_trader_with_dice"] = (theme == "Mizuki" ? refresh_trader_with_dice : false);
task_params["refresh_trader_with_dice"] = refresh_trader_with_dice;
AsstTaskId id = AsstAppendTaskWithEncoding("Roguelike", task_params);
_latestTaskId[TaskType.Roguelike] = id;

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

@@ -1766,7 +1766,10 @@ namespace MaaWpfGui.ViewModels.UI
/// </summary>
public bool RoguelikeInvestmentEnabled
{
get => bool.Parse(_roguelikeInvestmentEnabled);
get
{
return bool.Parse(_roguelikeInvestmentEnabled) || _roguelikeMode == "1";
}
set
{
SetAndNotify(ref _roguelikeInvestmentEnabled, value.ToString());
@@ -1778,7 +1781,10 @@ namespace MaaWpfGui.ViewModels.UI
public bool RoguelikeRefreshTraderWithDice
{
get => bool.Parse(_roguelikeRefreshTraderWithDice);
get
{
return bool.Parse(_roguelikeRefreshTraderWithDice) && _roguelikeTheme == "Mizuki";
}
set
{
SetAndNotify(ref _roguelikeRefreshTraderWithDice, value.ToString());