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

feat: 更新保全协议，整合drops字段，并支持战斗中获取战利品action

Browse Source
This commit is contained in:
MistEO
2023-01-14 23:22:44 +08:00
parent 7f6a301bd6
commit 1c917b5e53
11 changed files with 145 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,6 +262,9 @@ bool asst::BattleProcessTask::wait_condition(const Action& action)
break;
}
}
if (!check_in_battle(image)) {
return false;
}
do_strategy_and_update_image();
}
}
@@ -273,6 +276,9 @@ bool asst::BattleProcessTask::wait_condition(const Action& action)
if (m_kills >= action.kills) {
break;
}
if (!check_in_battle(image)) {
return false;
}
do_strategy_and_update_image();
}
}
@@ -284,6 +290,9 @@ bool asst::BattleProcessTask::wait_condition(const Action& action)
if (m_cost >= action.costs) {
break;
}
if (!check_in_battle(image)) {
return false;
}
do_strategy_and_update_image();
}
}
@@ -298,6 +307,9 @@ bool asst::BattleProcessTask::wait_condition(const Action& action)
if (cooling_count == action.cooling) {
break;
}
if (!check_in_battle(image)) {
return false;
}
do_strategy_and_update_image();
}
}
@@ -312,6 +324,9 @@ bool asst::BattleProcessTask::wait_condition(const Action& action)
iter != m_cur_deployment_opers.cend() && iter->second.available) {
break;
}
if (!check_in_battle(image)) {
return false;
}
do_strategy_and_update_image();
}
}