From ff1668e6f0ecd24910281a4f4f8805b4d8a7da01 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 12 Aug 2023 16:36:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=BC=96=E9=98=9F=E6=97=B6=E4=B8=8D=E9=87=8D=E8=AF=95=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp | 7 +------ src/MaaCore/Task/Miscellaneous/BattleFormationTask.h | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp index 5cdad97c590..a18283524d8 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp @@ -157,11 +157,6 @@ std::vector asst::BattleFormationTask::analyzer_opers() } sort_by_vertical_(opers_result); - if (m_the_right_name == opers_result.back().text) { - return {}; - } - m_the_right_name = opers_result.back().text; - std::vector tr_res; for (const auto& res : opers_result) { tr_res.emplace_back(TextRect { res.rect, res.score, res.text }); @@ -256,7 +251,7 @@ bool asst::BattleFormationTask::click_role_table(battle::Role role) { battle::Role::Sniper, "Sniper" }, { battle::Role::Special, "Special" }, { battle::Role::Support, "Support" }, { battle::Role::Tank, "Tank" }, { battle::Role::Warrior, "Warrior" }, { battle::Role::Unknown, "All" }, }; - m_the_right_name.clear(); + m_last_oper_name.clear(); auto role_iter = RoleNameType.find(role); if (role_iter == RoleNameType.cend()) { diff --git a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.h b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.h index 221e04036da..0448cb43f1d 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.h +++ b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.h @@ -53,11 +53,9 @@ namespace asst std::string m_stage_name; std::unordered_map> m_formation; - std::string m_the_right_name; std::string m_support_unit_name; DataResource m_data_resource = DataResource::Copilot; std::vector m_additional; - std::string m_last_oper_name; }; }