From ece27dbf89588df767d573637f8748e42d6a97b8 Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Sun, 25 Feb 2024 20:58:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=B9=B2=E5=91=98=E7=BB=84=E5=88=87=E6=8D=A2=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E7=94=A8=E6=B3=95=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/BattleHelper.h | 7 ++++--- src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/MaaCore/Task/BattleHelper.h b/src/MaaCore/Task/BattleHelper.h index 7e1efffc6a..4799c78453 100644 --- a/src/MaaCore/Task/BattleHelper.h +++ b/src/MaaCore/Task/BattleHelper.h @@ -62,7 +62,8 @@ namespace asst bool click_skill(bool keep_waiting = true); // 这个是带识别的,转好了才点 bool cancel_oper_selection(); // 修正终点超出范围的滑动,纠正时是否需要顺时针旋转 - void fix_swipe_out_of_limit(Point& p1, Point& p2, int width, int height, int max_distance = INT_MAX, double radian = 0); + void fix_swipe_out_of_limit(Point& p1, Point& p2, int width, int height, int max_distance = INT_MAX, + double radian = 0); bool move_camera(const std::pair& delta); std::string analyze_detail_page_oper_name(const cv::Mat& image); @@ -70,8 +71,8 @@ namespace asst std::optional get_oper_rect_on_deployment(const std::string& name) const; std::string m_stage_name; - std::unordered_map m_side_tile_info; - std::unordered_map m_normal_tile_info; + std::unordered_map m_side_tile_info; // 子弹时间的坐标映射 + std::unordered_map m_normal_tile_info; // 正常的坐标映射 std::unordered_map m_skill_usage; std::unordered_map m_skill_times; std::unordered_map m_skill_error_count; diff --git a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp index a598aa136e..5406a36619 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp @@ -191,8 +191,8 @@ bool asst::BattleProcessTask::do_action(const battle::copilot::Action& action, s break; case ActionType::SkillUsage: - m_skill_usage[action.name] = action.modify_usage; - if (action.modify_usage == SkillUsage::Times) m_skill_times[action.name] = action.modify_times; + m_skill_usage[name] = action.modify_usage; + if (action.modify_usage == SkillUsage::Times) m_skill_times[name] = action.modify_times; ret = true; break;