mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-19 10:32:19 +08:00
rft: ProcessTask匹配命中状态更新统一化
This commit is contained in:
@@ -348,7 +348,6 @@ std::pair<ProcessTask::NodeStatus, TaskConstPtr> ProcessTask::find_and_run_task(
|
||||
}
|
||||
|
||||
m_pre_task_name = std::move(m_last_task_name);
|
||||
m_last_hit_detail = nullptr;
|
||||
|
||||
HitDetail hits;
|
||||
for (int cur_retry = 0; cur_retry <= m_retry_times; ++cur_retry) {
|
||||
@@ -364,8 +363,6 @@ std::pair<ProcessTask::NodeStatus, TaskConstPtr> ProcessTask::find_and_run_task(
|
||||
return { NodeStatus::Interrupted, nullptr };
|
||||
}
|
||||
if (hits = find_first(list); hits.task_ptr != nullptr) {
|
||||
m_last_matched_task_name = hits.task_ptr->name;
|
||||
m_last_task_name = hits.task_ptr->name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -373,12 +370,16 @@ std::pair<ProcessTask::NodeStatus, TaskConstPtr> ProcessTask::find_and_run_task(
|
||||
if (hits.task_ptr == nullptr) {
|
||||
return { NodeStatus::RetryFailed, nullptr };
|
||||
}
|
||||
else {
|
||||
m_last_matched_task_name = hits.task_ptr->name;
|
||||
m_last_task_name = hits.task_ptr->name;
|
||||
m_last_hit_detail = std::make_shared<HitDetail>(std::move(hits));
|
||||
}
|
||||
|
||||
if (need_exit()) {
|
||||
return { NodeStatus::Interrupted, nullptr };
|
||||
}
|
||||
|
||||
m_last_hit_detail = std::make_shared<HitDetail>(std::move(hits));
|
||||
return { run_task(*m_last_hit_detail), m_last_hit_detail->task_ptr };
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user