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: 修正resource_dir

Browse Source
This commit is contained in:
Hydrogina
2022-11-24 16:43:01 +08:00
parent 61bc4f2da4
commit 5af2011055
2 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/MeoAssistant/Task/CreditFightTask.cpp
View File

@@ -4,47 +4,50 @@
#include "TaskData.h"
#include "CopilotTask.h"
#include "Plugin/GameCrashRestartTaskPlugin.h"
#include "Sub/ProcessTask.h"
#include "CopilotTask.h"
#include "Sub/StageNavigationTask.h"
#include "Utils/AsstRanges.hpp"
#include "Utils/WorkingDir.hpp"
asst::CreditFightTask::CreditFightTask(AsstCallback callback, void* callback_arg)
: PackageTask(std::move(callback), callback_arg, TaskType),
m_start_up_task_ptr(std::make_shared<ProcessTask>(m_callback, m_callback_arg, TaskType)),
m_stage_navigation_task_ptr(std::make_shared<StageNavigationTask>(m_callback, m_callback_arg, TaskType)),
m_fight_task_ptr(std::make_shared<ProcessTask>(m_callback, m_callback_arg, TaskType)),
m_copilot_task_ptr(std::make_shared<CopilotTask>(m_callback, m_callback_arg))
: PackageTask(std::move(callback), callback_arg, TaskType)
{
m_stage_navigation_task_ptr->set_enable(false).set_ignore_error(false);
// 战斗结束后
m_fight_task_ptr->set_tasks({ "EndOfActionAndStop" }).set_ignore_error(false);
m_game_restart_plugin_ptr = m_fight_task_ptr->register_plugin<GameCrashRestartTaskPlugin>();
m_game_restart_plugin_ptr->set_retry_times(0);
m_subtasks.emplace_back(m_start_up_task_ptr);
m_subtasks.emplace_back(m_stage_navigation_task_ptr);
m_subtasks.emplace_back(m_copilot_task_ptr);
m_subtasks.emplace_back(m_fight_task_ptr);
std::shared_ptr<ProcessTask> start_up_task_ptr =
std::make_shared<ProcessTask>(m_callback, m_callback_arg, m_task_chain);
std::shared_ptr<StageNavigationTask> stage_navigation_task_ptr =
std::make_shared<StageNavigationTask>(m_callback, m_callback_arg, m_task_chain);
std::shared_ptr<ProcessTask> fight_task_ptr =
std::make_shared<ProcessTask>(m_callback, m_callback_arg, m_task_chain);
std::shared_ptr<CopilotTask> copilot_task_ptr = std::make_shared<CopilotTask>(m_callback, m_callback_arg);
std::shared_ptr<GameCrashRestartTaskPlugin> game_restart_plugin_ptr = nullptr;
stage_navigation_task_ptr->set_enable(false).set_ignore_error(false);
const std::string stage = "OF-1";
if (!m_running) {
m_start_up_task_ptr->set_tasks({ "StageBegin" }).set_times_limit("GoLastBattle", 0);
m_stage_navigation_task_ptr->set_stage_name(stage);
m_stage_navigation_task_ptr->set_enable(true);
}
//开始
start_up_task_ptr->set_tasks({ "StageBegin" }).set_times_limit("GoLastBattle", 0);
//关卡导航
stage_navigation_task_ptr->set_stage_name(stage);
stage_navigation_task_ptr->set_enable(true);
//自动战斗
json::value copilotparams;
copilotparams["stage_name"] = "activities/act3d0/level_act3d0_01";// OF-1
copilotparams["filename"] = "resource/credit_fight_copilot.json";
copilotparams["formation"] = true;
m_copilot_task_ptr->set_params(copilotparams);
}
copilotparams["stage_name"] = "activities/act3d0/level_act3d0_01"; // OF-1
std::string copilot_path = utils::path_to_utf8_string(ResDir.get()) + "\\resource\\credit_fight_copilot.json";
copilotparams["filename"] = copilot_path;
copilotparams["formation"] = true;
copilot_task_ptr->set_params(copilotparams);
// 战斗结束后
fight_task_ptr->set_tasks({ "EndOfActionAndStop" }).set_ignore_error(false);
game_restart_plugin_ptr = fight_task_ptr->register_plugin<GameCrashRestartTaskPlugin>();
game_restart_plugin_ptr->set_retry_times(0);
m_subtasks.emplace_back(start_up_task_ptr);
m_subtasks.emplace_back(stage_navigation_task_ptr);
m_subtasks.emplace_back(copilot_task_ptr);
m_subtasks.emplace_back(fight_task_ptr);
}

6
src/MeoAssistant/Task/CreditFightTask.h
View File

@@ -19,10 +19,6 @@ namespace asst
static constexpr const char* TaskType = "CreditFight";
protected:
std::shared_ptr<ProcessTask> m_start_up_task_ptr = nullptr;
std::shared_ptr<ProcessTask> m_fight_task_ptr = nullptr;
std::shared_ptr<CopilotTask> m_copilot_task_ptr = nullptr;
std::shared_ptr<StageNavigationTask> m_stage_navigation_task_ptr = nullptr;
std::shared_ptr<GameCrashRestartTaskPlugin> m_game_restart_plugin_ptr = nullptr;
};
}