diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc index 09fd2fc..098c43a 100755 --- a/server/gameserver/metamgr.cc +++ b/server/gameserver/metamgr.cc @@ -142,34 +142,36 @@ private: parameter_hash[item.i->param_name()] = &item; } - for (auto& meta : map_meta_list) { - MetaData::Map& item = a8::FastAppend(map_list); - item.i = &meta; - item.Init(); - gamemap_hash[item.i->map_id()] = &item; - #if 1 - { - for (auto& tuple : item.template_list) { - auto itr = maptpl_meta_hash.find(std::get<0>(tuple)); - if (itr == maptpl_meta_hash.end()) { - maptpl_meta_hash[std::get<0>(tuple)] = std::list(); - itr = maptpl_meta_hash.find(std::get<0>(tuple)); - } else { - itr->second.clear(); + { + for (auto& meta : map_meta_list) { + MetaData::Map& item = a8::FastAppend(map_list); + item.i = &meta; + item.Init(); + gamemap_hash[item.i->map_id()] = &item; +#if 1 + { + for (auto& tuple : item.template_list) { + auto itr = maptpl_meta_hash.find(std::get<0>(tuple)); + if (itr == maptpl_meta_hash.end()) { + maptpl_meta_hash[std::get<0>(tuple)] = std::list(); + itr = maptpl_meta_hash.find(std::get<0>(tuple)); + } else { + itr->second.clear(); + } + f8::ReadJsonMetaFile(res_path + std::get<0>(tuple) + ".json", itr->second); } - f8::ReadJsonMetaFile(res_path + std::get<0>(tuple) + ".json", itr->second); - } - for (auto& pair : maptpl_meta_hash) { - std::vector things; - for (auto& itr : pair.second) { - auto& thing = a8::FastAppend(things); - thing.i = &itr; - thing.Init(); - } - maptpl_hash[pair.first] = things; } +#endif + } + for (auto& pair : maptpl_meta_hash) { + std::vector things; + for (auto& itr : pair.second) { + auto& thing = a8::FastAppend(things); + thing.i = &itr; + thing.Init(); + } + maptpl_hash[pair.first] = things; } - #endif } for (auto& meta : safearea_meta_list) {