diff --git a/src/MaaCore/Task/Experiment/CombatRecordRecognitionTask.cpp b/src/MaaCore/Task/Experiment/CombatRecordRecognitionTask.cpp index 5ec6fda9eb..4bfa6acb39 100644 --- a/src/MaaCore/Task/Experiment/CombatRecordRecognitionTask.cpp +++ b/src/MaaCore/Task/Experiment/CombatRecordRecognitionTask.cpp @@ -157,9 +157,9 @@ bool asst::CombatRecordRecognitionTask::analyze_formation() std::vector opers; opers.emplace_back(battle::OperUsage { name, 0, battle::SkillUsage::NotUse }); json::object oper_json { { "name", name }, { "skill", 0 }, { "skill_usage", 0 } }; - m_copilot_json["opers"].array_emplace(std::move(oper_json)); + m_copilot_json["opers"].emplace(std::move(oper_json)); - cb_formation.array_emplace(name); + cb_formation.emplace(name); asst::imwrite(utils::path("debug/video_export/formation/") / utils::path(name + ".png"), avatar); } callback(AsstMsg::SubTaskCompleted, cb_info); diff --git a/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp b/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp index 7826371d88..bcddac6d47 100644 --- a/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp +++ b/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp @@ -342,7 +342,7 @@ bool asst::StageDropsTaskPlugin::upload_to_server(const std::string& subtask, Re } json::value format_drop = drop; format_drop.as_object().erase("itemName"); - all_drops.array_emplace(std::move(format_drop)); + all_drops.emplace(std::move(format_drop)); } body["source"] = UploadDataSource; body["version"] = Version; diff --git a/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp b/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp index 238c1df022..c55e1bf0ad 100644 --- a/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp +++ b/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp @@ -194,7 +194,7 @@ void asst::StageQueueMissionCompletedTaskPlugin::upload_to_penguin(std::string s } json::value format_drop = drop; format_drop.as_object().erase("itemName"); - all_drops.array_emplace(std::move(format_drop)); + all_drops.emplace(std::move(format_drop)); } body["source"] = UploadDataSource; body["version"] = Version; diff --git a/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp b/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp index f525836694..7880bb7123 100644 --- a/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/AutoRecruitTask.cpp @@ -777,7 +777,7 @@ void asst::AutoRecruitTask::upload_to_penguin(Rng&& tags) body["stageId"] = "recruit"; auto& all_drops = body["drops"]; for (const auto& tag : tags) { - all_drops.array_emplace(json::object { + all_drops.emplace(json::object { { "dropType", "NORMAL_DROP" }, { "itemId", tag }, { "quantity", 1 }, diff --git a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp index 233a565113..c72ff41aa5 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp @@ -434,7 +434,7 @@ bool asst::BattleFormationTask::parse_formation() if (opers_vec.empty()) { continue; } - formation.array_emplace(name); + formation.emplace(name); // 判断干员/干员组的职业，放进对应的分组 bool same_role = true; diff --git a/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp b/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp index e1d99276c6..1939fceb38 100644 --- a/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp @@ -69,7 +69,7 @@ void asst::DepotRecognitionTask::callback_analyze_result(bool done) auto& arkplanner_data_items = arkplanner_obj["items"]; for (const auto& [item_id, item_info] : m_all_items) { - arkplanner_data_items.array_emplace(json::object { + arkplanner_data_items.emplace(json::object { { "id", item_id }, { "have", item_info.quantity }, { "name", item_info.item_name }, @@ -83,7 +83,7 @@ void asst::DepotRecognitionTask::callback_analyze_result(bool done) auto& lolicon = details["lolicon"]; auto& lolicon_obj = lolicon["object"]; for (const auto& [item_id, item_info] : m_all_items) { - lolicon_obj.object_emplace(item_id, item_info.quantity); + lolicon_obj.emplace(item_id, item_info.quantity); } lolicon["data"] = lolicon_obj.to_string(); } diff --git a/tools/ResourceUpdater/main.cpp b/tools/ResourceUpdater/main.cpp index aa55fe2499..6155f581d6 100644 --- a/tools/ResourceUpdater/main.cpp +++ b/tools/ResourceUpdater/main.cpp @@ -521,8 +521,8 @@ bool update_infrast_data(const std::filesystem::path& input_dir, const std::file } } if (new_name) { - skill["name"].array_emplace(name); - skill["desc"].array_emplace(desc); + skill["name"].emplace(name); + skill["desc"].emplace(desc); } // 历史遗留问题，以前的图片是从wiki上爬的，都是大写开头 @@ -857,7 +857,7 @@ bool update_battle_chars_info(const std::filesystem::path& official_dir, const s } } } - chars.object_emplace(id, std::move(char_new_data)); + chars.emplace(id, std::move(char_new_data)); } for (const auto& [oper_id, token_id_list] : tokens) { std::vector token_names_list; @@ -880,7 +880,7 @@ bool update_battle_chars_info(const std::filesystem::path& official_dir, const s Amiya_data["rangeId"] = json::array { "1-1", "1-1", "1-1" }; Amiya_data["rarity"] = 5; Amiya_data["position"] = "MELEE"; - chars.object_emplace("char_1001_amiya2", std::move(Amiya_data)); + chars.emplace("char_1001_amiya2", std::move(Amiya_data)); const auto& out_file = output_dir / "battle_data.json"; std::ofstream ofs(out_file, std::ios::out); @@ -1003,7 +1003,7 @@ bool update_recruitment_data(const std::filesystem::path& input_dir, const std:: return false; } - opers.array_emplace(json::object { { "id", id }, + opers.emplace(json::object { { "id", id }, { "name", name }, { "rarity", info_iter->second.rarity }, { "tags", json::array(info_iter->second.tags) } }); @@ -1024,7 +1024,7 @@ bool update_recruitment_data(const std::filesystem::path& input_dir, const std:: auto& tags = result["tags"]; for (const auto& [id, tag] : tags_name) { std::string base_name = base_tags_name.at(id); - tags.object_emplace(base_name, tag); + tags.emplace(base_name, tag); } std::ofstream ofs(output, std::ios::out);