From 63178a07d0bbe29477a2db3ef5fd1d1bdb255aac Mon Sep 17 00:00:00 2001 From: MistEO Date: Tue, 29 Mar 2022 22:49:01 +0800 Subject: [PATCH] =?UTF-8?q?feat.=E5=8A=A0=E5=85=A5=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=85=B3=E5=8D=A1=E5=9D=90=E6=A0=87=E6=88=AA=E5=9B=BE=E7=9A=84?= =?UTF-8?q?=E5=B0=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/BattleProcessTask.cpp | 7 ++++--- src/MeoAssistant/CopilotTask.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/MeoAssistant/BattleProcessTask.cpp b/src/MeoAssistant/BattleProcessTask.cpp index 02fa43f1bc..e20b1b7dde 100644 --- a/src/MeoAssistant/BattleProcessTask.cpp +++ b/src/MeoAssistant/BattleProcessTask.cpp @@ -42,13 +42,14 @@ bool asst::BattleProcessTask::get_stage_info() m_normal_tile_info = tile.calc(m_stage_name, false); m_side_tile_info = tile.calc(m_stage_name, true); -#ifdef ASST_DEBUG + //#ifdef ASST_DEBUG auto draw = m_ctrler->get_image(); for (const auto& [loc, info] : m_normal_tile_info) { std::string text = "( " + std::to_string(loc.x) + ", " + std::to_string(loc.y) + " )"; - cv::putText(draw, text, cv::Point(info.pos.x, info.pos.y), 1, 1, cv::Scalar(0, 0, 255)); + cv::putText(draw, text, cv::Point(info.pos.x - 30, info.pos.y), 1, 1.2, cv::Scalar(0, 0, 255), 2); } -#endif + cv::imwrite(utils::utf8_to_gbk(m_stage_name) + ".png", draw); + //#endif if (m_side_tile_info.empty() || m_normal_tile_info.empty()) { return false; diff --git a/src/MeoAssistant/CopilotTask.cpp b/src/MeoAssistant/CopilotTask.cpp index 31c53e850b..95c02ca18a 100644 --- a/src/MeoAssistant/CopilotTask.cpp +++ b/src/MeoAssistant/CopilotTask.cpp @@ -12,14 +12,14 @@ asst::CopilotTask::CopilotTask(AsstCallback callback, void* callback_arg) bool asst::CopilotTask::set_params(const json::value& params) { - if (!params.contains("filename") || !params.at("filename").is_string() - || !params.contains("stage_name") || !params.at("stage_name").is_string()) { + if (!params.contains("stage_name") || !params.at("stage_name").is_string()) { return false; } - std::string filename = params.at("filename").as_string(); std::string stage_name = params.at("stage_name").as_string(); m_battle_task_ptr->set_stage_name(stage_name); - return Resrc.battle().load(filename); + std::string filename = params.get("filename", std::string()); + // 文件名为空时，不加载资源，直接返回 true + return filename.empty() || Resrc.battle().load(filename); }