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

feat: 优化单步任务的json解析逻辑

Browse Source
This commit is contained in:
MistEO
2023-01-27 15:13:15 +08:00
parent 0884b1325f
commit 107e42e9e8
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/MaaCore/Task/Interface/SingleStepTask.cpp
View File

@@ -2,6 +2,7 @@
#include "../SingleStep/SingleStepBattleProcessTask.h"
#include "Config/Miscellaneous/CopilotConfig.h"
#include "Utils/Logger.hpp"
asst::SingleStepTask::SingleStepTask(const AsstCallback& callback, Assistant* inst)
: InterfaceTask(callback, inst, TaskType)
@@ -9,14 +10,28 @@ asst::SingleStepTask::SingleStepTask(const AsstCallback& callback, Assistant* in
bool asst::SingleStepTask::set_params(const json::value& params)
{
std::string type = params.at("type").as_string();
std::string subtype = params.at("subtype").as_string();
const json::value& details = params.at("details");
std::string type = params.get("type", "");
std::string subtype = params.get("subtype", "");
auto details_opt = params.find("details");
if (type == "copilot" && subtype == "action") {
if (type == "copilot" && subtype == "action" && details_opt) {
auto task = std::make_shared<SingleStepBattleProcessTask>(m_callback, m_inst, TaskType);
// for debug
task->set_stage_name("OF-1");
// 请参考自动战斗协议
task->set_actions(CopilotConfig::parse_actions(details));
try {
task->set_actions(CopilotConfig::parse_actions(*details_opt));
}
catch (const json::exception& e) {
Log.error(__FUNCTION__, e.what());
return false;
}
catch (const std::exception& e) {
Log.error(__FUNCTION__, e.what());
return false;
}
m_subtasks.emplace_back(std::move(task));
return true;