fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: build error on linux, and perf json parsing of Tile

Browse Source
This commit is contained in:
MistEO
2022-12-21 21:36:06 +08:00
parent 9d707eab16
commit e1e9d33c83
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/MaaCore/Config/Miscellaneous/TilePack.cpp
View File

@@ -13,7 +13,7 @@ bool asst::TilePack::load(const std::filesystem::path& path)
return false;
}
std::vector<json::object> tiles_array;
std::vector<json::value> tiles_array;
for (const auto& entry : std::filesystem::directory_iterator(path)) {
const auto& file_path = entry.path();
if (file_path.extension() != ".json") {
@@ -26,10 +26,11 @@ bool asst::TilePack::load(const std::filesystem::path& path)
}
auto& json = json_opt.value();
if (json.is_array()) {
tiles_array.insert(tiles_array.end(), json.as_array().begin(), json.as_array().end());
tiles_array.insert(tiles_array.end(), std::make_move_iterator(json.as_array().begin()),
std::make_move_iterator(json.as_array().end()));
}
else if (json.is_object()) {
tiles_array.emplace_back(json_opt->as_object());
tiles_array.emplace_back(std::move(*json_opt));
}
else {
Log.error("Invalid json file:", file_path);