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

fix: 修复使用干员组切换技能用法失效 (#8410)

Browse Source 
fix: 修复使用干员组切换技能用法失效
This commit is contained in:
status102
2024-02-26 08:05:13 +08:00
committed by GitHub
parent 23eec6d25b ece27dbf89
commit 339682c2e4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/MaaCore/Task/BattleHelper.h
View File

@@ -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<double, double>& delta);
std::string analyze_detail_page_oper_name(const cv::Mat& image);
@@ -70,8 +71,8 @@ namespace asst
std::optional<Rect> get_oper_rect_on_deployment(const std::string& name) const;
std::string m_stage_name;
std::unordered_map<Point, TilePack::TileInfo> m_side_tile_info;
std::unordered_map<Point, TilePack::TileInfo> m_normal_tile_info;
std::unordered_map<Point, TilePack::TileInfo> m_side_tile_info; // 子弹时间的坐标映射
std::unordered_map<Point, TilePack::TileInfo> m_normal_tile_info; // 正常的坐标映射
std::unordered_map<std::string, battle::SkillUsage> m_skill_usage;
std::unordered_map<std::string, int> m_skill_times;
std::unordered_map<std::string, int> m_skill_error_count;

4
src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp
View File

@@ -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;