fix: 刷理智指定次数未完全消耗警告在剩余理智也会提示

This commit is contained in:
status102
2025-11-19 16:51:51 +08:00
parent 488834ccd3
commit 1b7d642fd6
3 changed files with 5 additions and 1 deletions

View File

@@ -62,6 +62,7 @@ bool asst::FightTimesTaskPlugin::_run()
if (m_fight_times >= m_fight_times_max) {
m_task_ptr->set_enable(false); // 战斗次数已达上限
Log.info(__FUNCTION__, "fight times reached max");
fight["details"]["finished"] = true;
callback(AsstMsg::SubTaskExtraInfo, fight);
return true;
}

View File

@@ -1980,7 +1980,7 @@ public class AsstProxy
AchievementTrackerHelper.Instance.SetProgress(AchievementIds.OverLimitAgent, FightTask.FightReport.TimesFinished);
}
if (FightTask.Instance.HasTimesLimited != false && FightTask.FightReport.TimesFinished + FightTask.FightReport.Series > FightTask.Instance.MaxTimes)
if (FightTask.Instance.HasTimesLimited != false && FightTask.FightReport.IsFinished && FightTask.FightReport.TimesFinished < FightTask.Instance.MaxTimes)
{
Instances.TaskQueueViewModel.AddLog(string.Format(LocalizationHelper.GetString("FightTimesUnused"), FightTask.FightReport.TimesFinished, FightTask.FightReport.Series, FightTask.FightReport.TimesFinished + FightTask.FightReport.Series, FightTask.Instance.MaxTimes), UiLogColor.Error);
}

View File

@@ -1040,5 +1040,8 @@ public class FightSettingsUserControlModel : TaskViewModel
[JsonProperty("times_finished")]
public int TimesFinished { get; set; }
[JsonProperty("finished")]
public bool IsFinished { get; set; }
}
}