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

rft: WpfGui重构 拆分一键长草-获取信用及购物任务 (#11218)

Browse Source 
* rft: WpfGui重构 拆分`一键长草-获取信用及购物任务`

* perf: 修改绑定
This commit is contained in:
status102
2024-11-22 18:41:11 +08:00
committed by GitHub
parent 0e7a5e8974
commit 89fe3ddcc2
7 changed files with 321 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
View File

@@ -1678,24 +1678,24 @@ namespace MaaWpfGui.ViewModels.UI
private bool AppendMall()
{
var buyFirst = Instances.SettingsViewModel.CreditFirstList.Split(';', '；')
var buyFirst = SettingsViewModel.MallTask.CreditFirstList.Split(';', '；')
.Select(s => s.Trim());
var blackList = Instances.SettingsViewModel.CreditBlackList.Split(';', '；')
var blackList = SettingsViewModel.MallTask.CreditBlackList.Split(';', '；')
.Select(s => s.Trim());
blackList = blackList.Union(_blackCharacterListMapping[SettingsViewModel.GameSettings.ClientType]);
return Instances.AsstProxy.AsstAppendMall(
!string.IsNullOrEmpty(this.Stage) && Instances.SettingsViewModel.CreditFightTaskEnabled,
Instances.SettingsViewModel.CreditFightSelectFormation,
Instances.SettingsViewModel.CreditVisitFriendsEnabled,
Instances.SettingsViewModel.CreditShopping,
!string.IsNullOrEmpty(this.Stage) && SettingsViewModel.MallTask.CreditFightTaskEnabled,
SettingsViewModel.MallTask.CreditFightSelectFormation,
SettingsViewModel.MallTask.CreditVisitFriendsEnabled,
SettingsViewModel.MallTask.CreditShopping,
buyFirst.ToArray(),
blackList.ToArray(),
Instances.SettingsViewModel.CreditForceShoppingIfCreditFull,
Instances.SettingsViewModel.CreditOnlyBuyDiscount,
Instances.SettingsViewModel.CreditReserveMaxCredit);
SettingsViewModel.MallTask.CreditForceShoppingIfCreditFull,
SettingsViewModel.MallTask.CreditOnlyBuyDiscount,
SettingsViewModel.MallTask.CreditReserveMaxCredit);
}
private static bool AppendAward()