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": "杩欎笁涓湁鏁堢巼鍔犳垚锛屼笉鐭ラ亾鎬庝箞绠楃殑锛屽弽姝e緢楂橈紝鍏堟寜150鍐" + }, + { + "opers": [ + { + "name": "宸亱", + "elite": 2 + }, + { + "name": "榫欒垖鍏", + "elite": 2 + }, + { + "name": "鏌忓枡", + "elite": 2 + } + ], + "efficiency": 150, + "Doc": "杩欎笁涓湁鏁堢巼鍔犳垚锛屼笉鐭ラ亾鎬庝箞绠楃殑锛屽弽姝e緢楂橈紝鍏堟寜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 0000000000..8686aaf7ff Binary files /dev/null and b/resource/template/special/AddOperator-Trade.png differ