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

fix: update skill ready matching for battle task

Browse Source
This commit is contained in:
Horror Proton
2022-11-24 16:29:57 +08:00
parent 1e694868f5
commit 749d7d0fa3
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/MeoAssistant/Task/Miscellaneous/BattleProcessTask.cpp
View File

@@ -6,21 +6,23 @@
#include <thread>
#include "Utils/NoWarningCV.h"
#include "Utils/Ranges.hpp"
#include "Controller.h"
#include "Vision/MatchImageAnalyzer.h"
#include "Vision/Miscellaneous/BattleImageAnalyzer.h"
#include "Vision/OcrWithPreprocessImageAnalyzer.h"
#include "Config/Miscellaneous/CopilotConfig.h"
#include "Config/Miscellaneous/TilePack.h"
#include "Config/TaskData.h"
#include "Config/TemplResource.h"
#include "Vision/MatchImageAnalyzer.h"
#include "Vision/Miscellaneous/BattleImageAnalyzer.h"
#include "Vision/OcrWithPreprocessImageAnalyzer.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
#include "Utils/MoreCV.hpp"
#include "Utils/ImageIo.hpp"
void asst::BattleProcessTask::set_stage_name(std::string name)
void
asst::BattleProcessTask::set_stage_name(std::string name)
{
m_stage_name = std::move(name);
}
@@ -645,21 +647,21 @@ bool asst::BattleProcessTask::wait_to_end(const BattleAction& action)
bool asst::BattleProcessTask::try_possible_skill(const cv::Mat& image)
{
auto task_ptr = Task.get("BattleAutoSkillFlag");
const Rect& skill_roi_move = task_ptr->rect_move;
auto task_ptr = Task.get<MatchTaskInfo>("BattleAutoSkillFlag");
const Rect& skill_roi_move = task_ptr->rect_move;
cv::Mat temp = TemplResource::get_instance().get_templ(task_ptr->templ_name);
MatchImageAnalyzer analyzer(image);
analyzer.set_task_info(task_ptr);
bool used = false;
for (auto& info : m_used_opers | views::values) {
if (info.info.skill_usage != BattleSkillUsage::Possibly && info.info.skill_usage != BattleSkillUsage::Once) {
continue;
}
const Rect roi = Rect { info.pos.x, info.pos.y, 0, 0 }.move(skill_roi_move);
analyzer.set_roi(roi);
if (!analyzer.analyze()) {
continue;
}
const auto roi = make_rect<cv::Rect>(Rect { info.pos.x, info.pos.y, 0, 0 }.move(skill_roi_move));
const auto result = find_skill_ready(image(roi), temp);
if (result.empty()) continue;
m_ctrler->click(info.pos);
sleep(Task.get("BattleUseOper")->pre_delay);
used |= ProcessTask(*this, { "BattleSkillReadyOnClick" }).set_task_delay(0).run();