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

feat.进一步的异形屏流程任务适配，修复一些bug

Browse Source
This commit is contained in:
MistEO
2021-11-13 22:02:13 +08:00
parent d434d423e3
commit 3c16fccca9
7 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/MeoAssistance/ProcessTask.cpp
View File

@@ -22,7 +22,8 @@ bool ProcessTask::run()
};
m_callback(AsstMsg::TaskStart, task_start_json, m_callback_arg);
ProcessTaskImageAnalyzer analyzer(ctrler.get_image(), m_cur_tasks_name);
const auto& image = ctrler.get_image();
ProcessTaskImageAnalyzer analyzer(image, m_cur_tasks_name);
if (!analyzer.analyze()) {
return false;
}
@@ -74,7 +75,7 @@ bool ProcessTask::run()
exec_click_task(rect);
break;
case ProcessTaskAction::ClickRand: {
static const Rect full_rect(0, 0, WindowWidthDefault, WindowHeightDefault);
static const Rect full_rect(0, 0, image.cols, image.rows);
exec_click_task(full_rect);
} break;
case ProcessTaskAction::SwipeToTheLeft:
@@ -167,18 +168,17 @@ void asst::ProcessTask::exec_swipe_task(ProcessTaskAction action)
if (!delay_random()) {
return;
}
const auto&& [width, height] = ctrler.get_scale_size();
const static Rect right_rect = ctrler.shaped_correct(
Rect(WindowWidthDefault * 0.8,
WindowWidthDefault * 0.4,
WindowWidthDefault * 0.1,
WindowWidthDefault * 0.2));
const static Rect right_rect(width * 0.8,
height * 0.4,
width * 0.1,
height * 0.2);
const static Rect left_rect = ctrler.shaped_correct(
Rect(WindowWidthDefault * 0.1,
WindowWidthDefault * 0.4,
WindowWidthDefault * 0.1,
WindowWidthDefault * 0.2));
const static Rect left_rect(width * 0.1,
height * 0.4,
width * 0.1,
height * 0.2);
switch (action) {
case asst::ProcessTaskAction::SwipeToTheLeft: