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

feat: 重构基建名字过滤的逻辑，重新整理基建资源；新增支持多萝西组换班

Browse Source
This commit is contained in:
MistEO
2022-07-06 00:14:58 +08:00
parent e854641f48
commit 4402014e7a
144 changed files with 362 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/MeoAssistant/InfrastProductionTask.cpp
View File

@@ -10,6 +10,7 @@
#include "Logger.hpp"
#include "MatchImageAnalyzer.h"
#include "MultiMatchImageAnalyzer.h"
#include "OcrWithPreprocessImageAnalyzer.h"
#include "Resource.h"
#include "RuntimeStatus.h"
#include "ProcessTask.h"
@@ -207,7 +208,7 @@ size_t asst::InfrastProductionTask::opers_detect()
}
auto find_iter = std::find_if(
m_all_available_opers.cbegin(), m_all_available_opers.cend(),
[&](const infrast::BattleRealTimeOper& oper) -> bool {
[&](const infrast::Oper& oper) -> bool {
if (oper.skills != cur_oper.skills) {
return false;
}
@@ -235,7 +236,7 @@ bool asst::InfrastProductionTask::optimal_calc()
all_avaliable_combs.reserve(m_all_available_opers.size());
for (auto&& oper : m_all_available_opers) {
auto comb = efficient_regex_calc(oper.skills);
comb.name_hash = oper.name_hash;
comb.name_img = oper.name_img;
all_avaliable_combs.emplace_back(std::move(comb));
}
@@ -299,9 +300,6 @@ bool asst::InfrastProductionTask::optimal_calc()
return true;
}
const int name_hash_thres = std::dynamic_pointer_cast<HashTaskInfo>(
Task.get("InfrastOperNameHash"))->dist_threshold;
// 遍历所有组合，找到效率最高的
auto& all_group = Resrc.infrast().get_skills_group(facility_name());
for (const infrast::SkillsGroup& group : all_group) {
@@ -378,20 +376,24 @@ bool asst::InfrastProductionTask::optimal_calc()
return arg == opt;
});
if (find_iter != cur_available_opers.cend()) {
// 要求技能匹配的同时，hash也要匹配
bool hash_matched = false;
if (!opt.possible_hashs.empty()) {
for (const auto& [key, hash] : opt.possible_hashs) {
int dist = HashImageAnalyzer::hamming(find_iter->name_hash, hash);
Log.debug("optimal_calc | name hash dist", dist, hash, find_iter->name_hash);
if (dist < name_hash_thres) {
hash_matched = true;
break;
}
}
if (opt.name_filter.empty()) {
hash_matched = true;
}
else {
hash_matched = true;
OcrWithPreprocessImageAnalyzer name_analyzer(find_iter->name_img);
name_analyzer.set_replace(
std::dynamic_pointer_cast<OcrTaskInfo>(
Task.get("CharsNameOcrReplace"))
->replace_map);
Log.trace("Analyze name filter");
if (!name_analyzer.analyze()) {
continue;
}
std::string name = name_analyzer.get_result().front().text;
hash_matched = std::find(
opt.name_filter.cbegin(), opt.name_filter.cend(), name)
!= opt.name_filter.cend();
}
if (!hash_matched) {
++find_iter;
@@ -460,8 +462,6 @@ bool asst::InfrastProductionTask::opers_choose()
auto& facility_info = Resrc.infrast().get_facility_info(facility_name());
int cur_max_num_of_opers = facility_info.max_num_of_opers - m_cur_num_of_lokced_opers;
const int name_hash_thres = std::dynamic_pointer_cast<HashTaskInfo>(
Task.get("InfrastOperNameHash"))->dist_threshold;
const int face_hash_thres = std::dynamic_pointer_cast<HashTaskInfo>(
Task.get("InfrastOperFaceHash"))->dist_threshold;
@@ -499,7 +499,7 @@ bool asst::InfrastProductionTask::opers_choose()
Log.trace("before mood filter, opers size:", cur_all_opers.size());
// 小于心情阈值的干员则不可用
auto remove_iter = std::remove_if(cur_all_opers.begin(), cur_all_opers.end(),
[&](const infrast::BattleRealTimeOper& rhs) -> bool {
[&](const infrast::Oper& rhs) -> bool {
return rhs.mood_ratio < m_mood_threshold;
});
cur_all_opers.erase(remove_iter, cur_all_opers.end());
@@ -508,24 +508,27 @@ bool asst::InfrastProductionTask::opers_choose()
Log.trace("to find", opt_iter->skills.begin()->names.front());
auto find_iter = std::find_if(
cur_all_opers.cbegin(), cur_all_opers.cend(),
[&](const infrast::BattleRealTimeOper& lhs) -> bool {
[&](const infrast::Oper& lhs) -> bool {
if (lhs.skills != opt_iter->skills) {
return false;
}
if (!opt_iter->hash_filter) {
if (opt_iter->name_filter.empty()) {
return true;
}
else {
Log.trace("to comp hash");
// 既要技能相同，也要hash相同，双重校验
for (const auto& [_, hash] : opt_iter->possible_hashs) {
int dist = HashImageAnalyzer::hamming(lhs.name_hash, hash);
Log.debug("opers_choose | name hash dist", dist);
if (dist < name_hash_thres) {
return true;
}
OcrWithPreprocessImageAnalyzer name_analyzer(lhs.name_img);
name_analyzer.set_replace(
std::dynamic_pointer_cast<OcrTaskInfo>(
Task.get("CharsNameOcrReplace"))
->replace_map);
Log.trace("Analyze name filter");
if (!name_analyzer.analyze()) {
return false;
}
return false;
std::string name = name_analyzer.get_result().front().text;
return std::find(
opt_iter->name_filter.cbegin(), opt_iter->name_filter.cend(), name)
!= opt_iter->name_filter.cend();
}
});
@@ -550,7 +553,7 @@ bool asst::InfrastProductionTask::opers_choose()
{
auto avlb_iter = std::find_if(
m_all_available_opers.cbegin(), m_all_available_opers.cend(),
[&](const infrast::BattleRealTimeOper& lhs) -> bool {
[&](const infrast::Oper& lhs) -> bool {
int dist = HashImageAnalyzer::hamming(lhs.face_hash, find_iter->face_hash);
Log.debug("opers_choose | face hash dist", dist);
return dist < face_hash_thres;