From de74e0ce0c4c3dc87fd30fc7bfb06d829a7f4a7f Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 4 Sep 2022 14:32:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dcopilot=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E6=96=87=E4=BB=B6=E7=9A=84=E6=A3=80=E6=9F=A5=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/CopilotTask.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/MeoAssistant/CopilotTask.cpp b/src/MeoAssistant/CopilotTask.cpp index 2408331b2f..8f9615e1f4 100644 --- a/src/MeoAssistant/CopilotTask.cpp +++ b/src/MeoAssistant/CopilotTask.cpp @@ -4,6 +4,7 @@ #include "BattleFormationTask.h" #include "BattleProcessTask.h" #include "CopilotConfiger.h" +#include "Logger.hpp" #include "ProcessTask.h" asst::CopilotTask::CopilotTask(const AsstCallback& callback, void* callback_arg) @@ -32,7 +33,9 @@ bool asst::CopilotTask::set_params(const json::value& params) } auto stage_name_opt = params.find("stage_name"); - if (!stage_name_opt) { + auto filename_opt = params.find("filename"); + if (!stage_name_opt || !filename_opt) { + Log.error("CopilotTask set_params failed, stage_name or filename not found"); return false; } @@ -43,11 +46,10 @@ bool asst::CopilotTask::set_params(const json::value& params) bool with_formation = params.get("formation", false); m_formation_task_ptr->set_enable(with_formation); - std::string filename = params.get("filename", std::string()); + std::string filename = std::move(filename_opt.value()); #ifdef _WIN32 filename = utils::utf8_to_ansi(filename); #endif // _WIN32 - // 文件名为空时，不加载资源，直接返回 true - return filename.empty() || Copilot.load(filename); + return Copilot.load(filename); }