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

style: clang format

Browse Source
This commit is contained in:
zzyyyl
2022-08-26 19:08:12 +08:00
parent 83546bd466
commit 98f949346e
146 changed files with 1579 additions and 2114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/MeoAssistant/BattleFormationTask.cpp
View File

@@ -2,10 +2,10 @@
#include "AsstRanges.hpp"
#include "Resource.h"
#include "Controller.h"
#include "ProcessTask.h"
#include "OcrWithFlagTemplImageAnalyzer.h"
#include "ProcessTask.h"
#include "Resource.h"
#include "AsstRanges.hpp"
@@ -80,22 +80,18 @@ bool asst::BattleFormationTask::select_opers_in_cur_page()
}
// 按位置排个序
ranges::sort(opers_result,
[](const TextRect& lhs, const TextRect& rhs) -> bool {
if (std::abs(lhs.rect.y - rhs.rect.y) < 5) { // y差距较小则理解为是同一排的，按x排序
return lhs.rect.x < rhs.rect.x;
}
else {
return lhs.rect.y < rhs.rect.y;
}
ranges::sort(opers_result, [](const TextRect& lhs, const TextRect& rhs) -> bool {
if (std::abs(lhs.rect.y - rhs.rect.y) < 5) { // y差距较小则理解为是同一排的，按x排序
return lhs.rect.x < rhs.rect.x;
}
);
else {
return lhs.rect.y < rhs.rect.y;
}
});
static const std::array<Rect, 3> SkillRectArray = {
Task.get("BattleQuickFormationSkill1")->specific_rect,
Task.get("BattleQuickFormationSkill2")->specific_rect,
Task.get("BattleQuickFormationSkill3")->specific_rect
};
static const std::array<Rect, 3> SkillRectArray = { Task.get("BattleQuickFormationSkill1")->specific_rect,
Task.get("BattleQuickFormationSkill2")->specific_rect,
Task.get("BattleQuickFormationSkill3")->specific_rect };
int skill = 1;
for (const auto& res : opers_result) {
@@ -141,8 +137,7 @@ void asst::BattleFormationTask::swipe_page()
static Rect end_rect = Task.get("InfrastOperListSwipeEnd")->specific_rect;
static int duration = Task.get("InfrastOperListSwipeBegin")->pre_delay;
m_ctrler->swipe(begin_rect, end_rect,
duration, true, Task.get("InfrastOperListSwipeBegin")->rear_delay, true);
m_ctrler->swipe(begin_rect, end_rect, duration, true, Task.get("InfrastOperListSwipeBegin")->rear_delay, true);
}
bool asst::BattleFormationTask::confirm_selection()