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

feat(task): SubTaskStart 等回调增加识别结果

Browse Source 
插件现在可以获取识别结果
This commit is contained in:
zzyyyl
2023-12-19 16:15:41 +08:00
parent 403d988cf1
commit 32740ff54b
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/MaaCore/Task/ProcessTask.cpp
View File

@@ -117,6 +117,8 @@ bool ProcessTask::_run()
}
Rect rect;
json::value result;
// 如果第一个任务是JustReturn的，那就没必要再截图并计算了
if (front_task_ptr->algorithm == AlgorithmType::JustReturn) {
m_cur_task_ptr = front_task_ptr;
@@ -132,6 +134,14 @@ bool ProcessTask::_run()
return false;
}
m_cur_task_ptr = res_opt->task_ptr;
if (m_cur_task_ptr->algorithm == AlgorithmType::MatchTemplate) {
auto& raw_result = std::get<0>(res_opt->result);
result = json::object { { "score", raw_result.score } };
}
else if (m_cur_task_ptr->algorithm == AlgorithmType::OcrDetect) {
auto& raw_result = std::get<1>(res_opt->result);
result = json::object { { "score", raw_result.score }, { "text", raw_result.text } };
}
rect = res_opt->rect;
}
if (need_exit()) {
@@ -172,6 +182,7 @@ bool ProcessTask::_run()
{ "exec_times", exec_times },
{ "max_times", max_times },
{ "algorithm", enum_to_string(m_cur_task_ptr->algorithm) },
{ "result", result },
};
callback(AsstMsg::SubTaskStart, info);