diff --git a/MeoAssistance/InfrastConfiger.cpp b/MeoAssistance/InfrastConfiger.cpp index 6bbe771675..1d868000c4 100644 --- a/MeoAssistance/InfrastConfiger.cpp +++ b/MeoAssistance/InfrastConfiger.cpp @@ -49,12 +49,15 @@ bool InfrastConfiger::_load(const std::string& filename) for (json::value& oper_name : comb_info["comb"].as_array()) { std::string oper_name_str = oper_name.as_string(); - m_mfg_opers.emplace(oper_name_str); comb_vec.emplace_back(std::move(oper_name_str)); } m_mfg_combs.emplace_back(std::move(comb_vec)); } m_mfg_end = root["Manufacturing"]["end"].as_string(); + for (json::value& oper : root["Manufacturing"]["all"].as_array()) + { + m_mfg_opers.emplace(oper["name"].as_string()); + } // 贸易站 TODO…… } diff --git a/MeoAssistance/src/Assistance.cpp b/MeoAssistance/src/Assistance.cpp index fa076fd411..bd977380cd 100644 --- a/MeoAssistance/src/Assistance.cpp +++ b/MeoAssistance/src/Assistance.cpp @@ -68,8 +68,13 @@ Assistance::Assistance(AsstCallback callback, void* callback_arg) return; } - // for debug - m_identify_ptr->add_text_image("森蚺", GetResourceDir() + "operators\\森蚺.png"); + for (const std::string& name : InfrastConfiger::get_instance().m_mfg_opers) { + ret = m_identify_ptr->add_text_image(name, GetResourceDir() + "operators\\" + Utf8ToGbk(name) + ".png"); + if (!ret) { + callback_error(); + return; + } + } m_working_thread = std::thread(working_proc, this); m_msg_thread = std::thread(msg_proc, this); diff --git a/MeoAssistance/src/Identify.cpp b/MeoAssistance/src/Identify.cpp index e48e0ce2c7..3d48b30061 100644 --- a/MeoAssistance/src/Identify.cpp +++ b/MeoAssistance/src/Identify.cpp @@ -250,10 +250,9 @@ std::vector