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

refactor.删除实例化的TaskData

Browse Source
This commit is contained in:
MistEO
2022-03-09 23:40:28 +08:00
parent 50ccafdf44
commit e3b2401ca6
39 changed files with 144 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp
View File

@@ -59,14 +59,14 @@ bool asst::RoguelikeBattleTaskPlugin::get_stage_info()
bool calced = false;
if (m_stage_name.empty()) {
const auto stage_name_task_ptr = m_task_data->get("BattleStageName");
const auto stage_name_task_ptr = Task.get("BattleStageName");
sleep(stage_name_task_ptr->pre_delay);
constexpr int StageNameRetryTimes = 50;
for (int i = 0; i != StageNameRetryTimes; ++i) {
cv::Mat image = m_ctrler->get_image();
OcrImageAnalyzer name_analyzer(image);
name_analyzer.set_task_data(m_task_data);
name_analyzer.set_task_info(stage_name_task_ptr);
if (!name_analyzer.analyze()) {
continue;
@@ -134,8 +134,8 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle()
using Oper = asst::BattleImageAnalyzer::Oper;
BattleImageAnalyzer battle_analyzer(m_ctrler->get_image(), m_task_data);
battle_analyzer.set_task_data(m_task_data);
BattleImageAnalyzer battle_analyzer(m_ctrler->get_image());
if (!battle_analyzer.analyze()) {
return false;
}
@@ -173,8 +173,8 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle()
Role::Tank,
Role::Drone
};
const auto use_oper_task_ptr = m_task_data->get("BattleUseOper");
const auto swipe_oper_task_ptr = m_task_data->get("BattleSwipeOper");
const auto use_oper_task_ptr = Task.get("BattleUseOper");
const auto swipe_oper_task_ptr = Task.get("BattleSwipeOper");
// 点击当前最合适的干员
Oper opt_oper;
@@ -295,7 +295,7 @@ void asst::RoguelikeBattleTaskPlugin::clear()
//asst::Rect asst::RoguelikeBattleTaskPlugin::get_placed_by_cv()
//{
// BattlePerspectiveImageAnalyzer placed_analyzer(m_ctrler->get_image());
// placed_analyzer.set_task_data(m_task_data);
// placed_analyzer.set_src_homes(m_home_cache);
// if (!placed_analyzer.analyze()) {
// return Rect();