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

Merge branch 'feat/loop_battle' into dev

Browse Source
This commit is contained in:
MistEO
2023-01-11 22:56:27 +08:00
parent 51de1132fa 737a754ced
commit 89cf31d2bf
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resource/tasks.json
View File

@@ -9643,5 +9643,23 @@
175,
132
]
},
"ClickCornerUntilStartButton": {
"algorithm": "JustReturn",
"action": "ClickRect",
"specificRect": [
1000,
120,
270,
10
],
"next": [
"BattleStartPreFlag",
"ClickCornerUntilStartButton"
]
},
"BattleStartPreFlag": {
"baseTask": "BattleStartPre",
"action": "DoNothing"
}
}

22
src/MaaCore/Task/Interface/CopilotTask.cpp
View File

@@ -12,17 +12,23 @@ asst::CopilotTask::CopilotTask(const AsstCallback& callback, Assistant* inst)
m_formation_task_ptr(std::make_shared<BattleFormationTask>(callback, inst, TaskType)),
m_battle_task_ptr(std::make_shared<BattleProcessTask>(callback, inst, TaskType))
{
auto start_1_tp = std::make_shared<ProcessTask>(callback, inst, TaskType);
start_1_tp->set_tasks({ "BattleStartPre" }).set_retry_times(0).set_ignore_error(true);
m_subtasks.emplace_back(start_1_tp);
for (int i = 0; i != 1000; ++i) {
auto start_1_tp = std::make_shared<ProcessTask>(callback, inst, TaskType);
start_1_tp->set_tasks({ "BattleStartPre" }).set_retry_times(0).set_ignore_error(true);
m_subtasks.emplace_back(start_1_tp);
m_subtasks.emplace_back(m_formation_task_ptr);
m_subtasks.emplace_back(m_formation_task_ptr);
auto start_2_tp = std::make_shared<ProcessTask>(callback, inst, TaskType);
start_2_tp->set_tasks({ "BattleStartAll" }).set_ignore_error(false);
m_subtasks.emplace_back(start_2_tp);
auto start_2_tp = std::make_shared<ProcessTask>(callback, inst, TaskType);
start_2_tp->set_tasks({ "BattleStartAll" }).set_ignore_error(false);
m_subtasks.emplace_back(start_2_tp);
m_subtasks.emplace_back(m_battle_task_ptr)->set_retry_times(0);
m_subtasks.emplace_back(m_battle_task_ptr)->set_retry_times(0);
auto stop_task_ptr = std::make_shared<ProcessTask>(callback, inst, TaskType);
stop_task_ptr->set_tasks({ "ClickCornerUntilStartButton" });
m_subtasks.emplace_back(stop_task_ptr);
}
}
bool asst::CopilotTask::set_params(const json::value& params)