From dbc74bb0ef9227673c12bf111012aabc2a795568 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 5 Dec 2021 23:51:20 +0800 Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=B0=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 2 +- src/MeoAssistance/InfrastProductionTask.h | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/resource/tasks.json b/resource/tasks.json index 1601d24f59..dc63d15d92 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -1397,7 +1397,7 @@ }, "DroneAssist-Trade-Stop": { "Doc": "如果找到了“无人机加速”按钮,却没有找到订单交付:说明上一次无人机没有把一个订单加速完成,也说明没有更多的无人机了,所以直接stop", - "template": "DroneAssist-Trade.png", + "template": "DroneAssistTrade.png", "action": "stop", "cache": false }, diff --git a/src/MeoAssistance/InfrastProductionTask.h b/src/MeoAssistance/InfrastProductionTask.h index 5e1e7e3d27..949112b0e2 100644 --- a/src/MeoAssistance/InfrastProductionTask.h +++ b/src/MeoAssistance/InfrastProductionTask.h @@ -13,8 +13,14 @@ namespace asst using InfrastAbstractTask::InfrastAbstractTask; virtual ~InfrastProductionTask() = default; -#ifndef LOG_TRACE - // 为了方便调试,把这三个接口拿到public来了 + void set_uses_of_drone(std::string uses_of_drones) noexcept + { + m_uses_of_drones = std::move(uses_of_drones); + } +#ifdef LOG_TRACE + public: +#else + // 为了方便调试,把这两个个接口拿到public来了 protected: #endif void set_facility(std::string facility_name) noexcept @@ -25,10 +31,6 @@ namespace asst { m_product = std::move(product_name); } - void set_uses_of_drone(std::string uses_of_drones) noexcept - { - m_uses_of_drones = std::move(uses_of_drones); - } protected: bool shift_facility_list();