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

feat: 优化保全派驻工具人部署策略，新增黑名单字段，修复一些卡住的问题，新增部分界面提示

Browse Source
This commit is contained in:
MistEO
2023-01-16 01:20:20 +08:00
parent 512299c5a9
commit 9da092b3b9
9 changed files with 63 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/MaaCore/Task/SSS/SSSDropRewardsTaskPlugin.cpp
View File

@@ -2,6 +2,7 @@
#include "Config/Miscellaneous/BattleDataConfig.h"
#include "Config/Miscellaneous/SSSCopilotConfig.h"
#include "Config/TaskData.h"
#include "Controller.h"
#include "Task/ProcessTask.h"
#include "Task/SSS/SSSBattleProcessTask.h"
@@ -39,6 +40,9 @@ bool asst::SSSDropRewardsTaskPlugin::_run()
std::vector<DropRecruitment> opers;
for (const auto& result : analyzer.get_result()) {
if (SSSCopilot.get_data().blacklist.contains(result.text)) {
continue;
}
auto role = BattleData.get_role(result.text);
opers.emplace_back(DropRecruitment {
.ocr_res = result, .role = role == Role::Unknown ? std::nullopt : std::optional<Role>(role) });
@@ -52,9 +56,10 @@ bool asst::SSSDropRewardsTaskPlugin::_run()
});
if (iter != opers.cend()) {
ctrler()->click(iter->ocr_res.rect);
sleep(Task.get("SSSDropRecruitmentOCR")->post_delay);
break;
}
}
return ProcessTask(*this, { "SSSDropRecruitmentConfrim" }).run();
return ProcessTask(*this, { "SSSDropRecruitmentConfrim" }).set_retry_times(5).run();
}