diff --git a/MeoAssistance/Assistance.cpp b/MeoAssistance/Assistance.cpp index 936ab3e4ec..33e6e5fd68 100644 --- a/MeoAssistance/Assistance.cpp +++ b/MeoAssistance/Assistance.cpp @@ -216,8 +216,9 @@ bool Assistance::start_debug_task() std::unique_lock lock(m_mutex); - auto task_ptr = std::make_shared(task_callback, (void*)this); - m_tasks_deque.emplace_back(task_ptr); + { + append_match_task("Debug", {"UavAssist-MFG"}); + } m_thread_idle = false; m_condvar.notify_one(); @@ -334,7 +335,8 @@ bool asst::Assistance::start_infrast() // 贸易站换班 m_tasks_deque.emplace_back(shift_task_ptr); - + // 无人机加速贸易站 + append_match_task(InfrastTaskCahin, { "UavAssist-Trade" }); // 全操作完之后,再返回基建的主界面 append_match_task(InfrastTaskCahin, { "InfrastBegin" }); diff --git a/resource/config.json b/resource/config.json index 3c0b24a98f..85db1bb2e9 100644 --- a/resource/config.json +++ b/resource/config.json @@ -601,6 +601,60 @@ "next": [ "Stop" ] + }, + "UavAssist-MFG": { + "template": "UavAssist-MFG.png", + "action": "clickSelf", + "cache": false, + "maxTimes": 1, + "Doc": "涓嶅悓浜庤锤鏄撶珯锛屽埗閫犵珯鐨勬棤浜烘満鏄竴娆℃у叏鐢ㄦ帀鐨勶紝鎵浠ュ彧鎵ц涓娆″氨澶熶簡", + "next": [ + "UavMax", + "UavConfirm" + ] + }, + "UavAssist-Trade": { + "template": "UavAssist-Trade.png", + "action": "clickSelf", + "cache": false, + "next": [ + "UavMax", + "UavConfirm" + ] + }, + "UavMax": { + "template": "UavMax.png", + "action": "clickSelf", + "next": [ + "UavConfirm" + ] + }, + "UavConfirm": { + "template": "UavConfirm.png", + "action": "clickSelf", + "rearDelay": 2000, + "next": [ + "DeliverableOrder", + "UavAssist-Trade-Stop", + "UavAssist-MFG" + ] + }, + "DeliverableOrder": { + "template": "DeliverableOrder.png", + "cache": false, + "action": "clickSelf", + "next": [ + "DeliverableOrder", + "UavAssist-Trade" + ] + }, + "UavAssist-Trade-Stop": { + "Doc": "濡傛灉鎵惧埌浜嗏滄棤浜烘満鍔犻熲濇寜閽紝鍗存病鏈夋壘鍒拌鍗曚氦浠橈細璇存槑涓婁竴娆℃棤浜烘満娌℃湁鎶婁竴涓鍗曞姞閫熷畬鎴愶紝涔熻鏄庢病鏈夋洿澶氱殑鏃犱汉鏈轰簡锛屾墍浠ョ洿鎺top", + "template": "UavAssist-Trade.png", + "action": "stop", + "cache": false, + "next": [ + ] } } } diff --git a/resource/template/DeliverableOrder.png b/resource/template/DeliverableOrder.png new file mode 100644 index 0000000000..bdb79214c3 Binary files /dev/null and b/resource/template/DeliverableOrder.png differ diff --git a/resource/template/UavAssist-MFG.png b/resource/template/UavAssist-MFG.png new file mode 100644 index 0000000000..8c30eaa03f Binary files /dev/null and b/resource/template/UavAssist-MFG.png differ diff --git a/resource/template/UavAssist-Trade.png b/resource/template/UavAssist-Trade.png new file mode 100644 index 0000000000..ba85d1a57e Binary files /dev/null and b/resource/template/UavAssist-Trade.png differ diff --git a/resource/template/UavConfirm.png b/resource/template/UavConfirm.png new file mode 100644 index 0000000000..36ba8df862 Binary files /dev/null and b/resource/template/UavConfirm.png differ diff --git a/resource/template/UavMax.png b/resource/template/UavMax.png new file mode 100644 index 0000000000..9be7380996 Binary files /dev/null and b/resource/template/UavMax.png differ