From eaebcdca5fb78682349c5abf9dc0ac3e19d740eb Mon Sep 17 00:00:00 2001 From: MistEO Date: Wed, 8 Sep 2021 22:26:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90=E8=B4=B8?= =?UTF-8?q?=E6=98=93=E7=AB=99=E6=8D=A2=E7=8F=AD=E7=9A=84=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MeoAssistance/Assistance.cpp | 17 +++- MeoAssistance/InfrastStationTask.cpp | 6 +- resource/infrast.json | 80 +++++++++++++++++- .../template/special/AddOperator-Trade.png | Bin 0 -> 1967 bytes 4 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 resource/template/special/AddOperator-Trade.png diff --git a/MeoAssistance/Assistance.cpp b/MeoAssistance/Assistance.cpp index 33e6e5fd68..aa026cc3fb 100644 --- a/MeoAssistance/Assistance.cpp +++ b/MeoAssistance/Assistance.cpp @@ -216,8 +216,23 @@ bool Assistance::start_debug_task() std::unique_lock lock(m_mutex); + //{ + // append_match_task("Debug", {"UavAssist-MFG"}); + //} { - append_match_task("Debug", {"UavAssist-MFG"}); + constexpr static const char* InfrastTaskCahin = "Infrast"; + auto shift_task_ptr = std::make_shared(task_callback, (void*)this); + + auto ret = get_opers_idtf_result(); + if (!ret) { + DebugTraceInfo("Get opers info error"); + //return false; + } + else { + shift_task_ptr->set_all_opers_info(std::move(ret.value())); + } + shift_task_ptr->set_task_chain(InfrastTaskCahin); + m_tasks_deque.emplace_back(shift_task_ptr); } m_thread_idle = false; diff --git a/MeoAssistance/InfrastStationTask.cpp b/MeoAssistance/InfrastStationTask.cpp index 23c27e4bd3..ba6c855267 100644 --- a/MeoAssistance/InfrastStationTask.cpp +++ b/MeoAssistance/InfrastStationTask.cpp @@ -57,8 +57,9 @@ bool asst::InfrastStationTask::run() image = get_format_image(); } // 如果当前界面没有添加干员的按钮，那就不换班 - auto&& [algorithm, score, add_rect] = m_identify_ptr->find_image(image, "AddOperator"); - if (score < Configer::TemplThresholdDefault) { + auto&& [algorithm1, score1, add_rect1] = m_identify_ptr->find_image(image, "AddOperator"); + auto&& [algorithm2, score2, add_rect2] = m_identify_ptr->find_image(image, "AddOperator-Trade"); + if (score1 < Configer::TemplThresholdDefault && score2 < Configer::TemplThresholdDefault) { continue; } @@ -71,6 +72,7 @@ bool asst::InfrastStationTask::run() } } //点击添加干员的那个按钮 + Rect add_rect = score1 >= score2 ? std::move(add_rect1) : std::move(add_rect2); m_control_ptr->click(add_rect); sleep(2000); diff --git a/resource/infrast.json b/resource/infrast.json index e561967a8d..b1566cf547 100644 --- a/resource/infrast.json +++ b/resource/infrast.json @@ -59,12 +59,90 @@ "endFlag": [ "鏈堣澶", "鐐庣啍" ], "endFlag_Doc": "璇嗗埆鍒拌繖閲岄潰鐨勫悕瀛楋紝灏变笉缁х画寰鍚庤瘑鍒簡锛屼竴鑸敤鍒楄〃閲岀殑鏈鍚庝竴涓汉鍚" }, + { + "facility": "PureGold", + "Doc": "鍒堕犵珯-璧ら噾", + "combs": [ + { + "opers": [ + { + "name": "鐮", + "elite": 2 + }, + { + "name": "澶滅儫", + "elite": 0 + }, + { + "name": "鏂戠偣", + "elite": 1 + } + ], + "efficiency": 95 + } + ], + "endFlag": [ "鏈堣澶", "鐐庣啍" ], + "endFlag_Doc": "璇嗗埆鍒拌繖閲岄潰鐨勫悕瀛楋紝灏变笉缁х画寰鍚庤瘑鍒簡锛屼竴鑸敤鍒楄〃閲岀殑鏈鍚庝竴涓汉鍚" + }, { "facility": "TradeMoney", "Doc": "璐告槗绔-榫欓棬甯", "combs": [ + { + "opers": [ + { + "name": "宸亱", + "elite": 2 + }, + { + "name": "榫欒垖鍏", + "elite": 2 + }, + { + "name": "鍗″か鍗", + "elite": 2 + } + ], + "efficiency": 150, + "Doc": "杩欎笁涓湁鏁堢巼鍔犳垚锛屼笉鐭ラ亾鎬庝箞绠楃殑锛屽弽姝ｅ緢楂橈紝鍏堟寜150鍐" + }, + { + "opers": [ + { + "name": "宸亱", + "elite": 2 + }, + { + "name": "榫欒垖鍏", + "elite": 2 + }, + { + "name": "鏌忓枡", + "elite": 2 + } + ], + "efficiency": 150, + "Doc": "杩欎笁涓湁鏁堢巼鍔犳垚锛屼笉鐭ラ亾鎬庝箞绠楃殑锛屽弽姝ｅ緢楂橈紝鍏堟寜150鍐" + }, + { + "opers": [ + { + "name": "鑳藉ぉ浣", + "elite": 2 + }, + { + "name": "鎷夋櫘鍏板痉", + "elite": 2 + }, + { + "name": "寰峰厠钀ㄦ柉", + "elite": 2 + } + ], + "efficiency": 100 + } ], - "endFlag": [ ], + "endFlag": [ "妗冮噾濞", "鏆楅攣" ], "endFlag_Doc": "璇嗗埆鍒拌繖閲岄潰鐨勫悕瀛楋紝灏变笉缁х画寰鍚庤瘑鍒簡锛屼竴鑸敤鍒楄〃閲岀殑鏈鍚庝竴涓汉鍚" } ], diff --git a/resource/template/special/AddOperator-Trade.png b/resource/template/special/AddOperator-Trade.png new file mode 100644 index 0000000000000000000000000000000000000000..8686aaf7ff3771fa7e26970ca7a94f140dd82419 GIT binary patch literal 1967 zcmV;g2T=HlP) z&5jc}5Xb-JI6VoZ!i_VW&}t<<#AU=8W|D5#9^B

7+zx-?Tz$@xP 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 B+A9D6 literal 0 HcmV?d00001