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

fix: 定时逻辑错误

Browse Source
This commit is contained in:
uye
2023-07-16 00:49:14 +08:00
parent cdc2624142
commit 3233774df6
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,7 +244,7 @@ namespace MaaWpfGui.ViewModels.UI
refreshCustomInfrastPlanIndexByPeriod();
if (!runningState.GetIdle() && !Instances.SettingsViewModel.ForceScheduledStart)
if (!runningState.GetIdle() && !Instances.SettingsViewModel.ForceScheduledStart && !Instances.SettingsViewModel.CustomConfig)
{
return;
}
@@ -277,9 +277,12 @@ namespace MaaWpfGui.ViewModels.UI
if (timeToChangeConfig)
{
// CurrentConfiguration设置后会重启
Instances.SettingsViewModel.CurrentConfiguration = Instances.SettingsViewModel.TimerModels.Timers[2].TimerConfig;
return;
if (Instances.SettingsViewModel.CustomConfig)
{
// CurrentConfiguration设置后会重启
Instances.SettingsViewModel.CurrentConfiguration = Instances.SettingsViewModel.TimerModels.Timers[configIndex].TimerConfig;
return;
}
}
if (timeToStart)
@@ -289,14 +292,19 @@ namespace MaaWpfGui.ViewModels.UI
if (!runningState.GetIdle())
{
await Stop();
if (!Instances.AsstProxy.AsstAppendCloseDown())
{
AddLog(LocalizationHelper.GetString("CloseArknightsFailed"), UiLogColor.Error);
}
}
if (!Instances.AsstProxy.AsstAppendCloseDown())
{
AddLog(LocalizationHelper.GetString("CloseArknightsFailed"), UiLogColor.Error);
}
ResetFightVariables();
}
else if (!runningState.GetIdle())
{
return;
}
LinkStart();
}