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

feat: 更新抄作业子弹时间操作逻辑

Browse Source
This commit is contained in:
MistEO
2023-04-16 23:44:09 +08:00
parent 07c804acc8
commit cf3adef12a
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,7 +173,7 @@ bool asst::BattleProcessTask::do_action(const battle::copilot::Action& action, s
break;
case ActionType::BulletTime:
ret = enter_bullet_time_for_next_action(action_index + 1, location, name);
ret = enter_bullet_time(name, location);
if (ret) m_in_bullet_time = true;
break;
@@ -337,32 +337,14 @@ bool asst::BattleProcessTask::wait_condition(const Action& action)
return true;
}
bool asst::BattleProcessTask::enter_bullet_time_for_next_action(size_t next_index, const Point& location,
const std::string& name)
bool asst::BattleProcessTask::enter_bullet_time(const std::string& name, const Point& location)
{
LogTraceFunction;
if (next_index > get_combat_data().actions.size()) {
Log.error("Bullet time does not have the next step!");
return false;
}
const auto& next_action = get_combat_data().actions.at(next_index);
bool ret = false;
switch (next_action.type) {
case ActionType::Deploy:
bool ret = location.empty() ? click_oper_on_battlefield(name) : click_oper_on_battlefield(location);
if (!ret) {
ret = click_oper_on_deployment(name);
break;
case ActionType::UseSkill:
case ActionType::Retreat:
ret = location.empty() ? click_oper_on_battlefield(name) : click_oper_on_battlefield(location);
break;
default:
Log.error("Bullet time 's next step is not deploy, skill or retreat!");
return false;
}
};
return ret;
}

2
src/MaaCore/Task/Miscellaneous/BattleProcessTask.h
View File

@@ -32,7 +32,7 @@ namespace asst
const std::string& get_name_from_group(const std::string& action_name);
void notify_action(const battle::copilot::Action& action);
bool wait_condition(const battle::copilot::Action& action);
bool enter_bullet_time_for_next_action(size_t next_index, const Point& location, const std::string& name);
bool enter_bullet_time(const std::string& name, const Point& location);
void sleep_and_do_strategy(unsigned millisecond);
battle::copilot::CombatData m_combat_data;