diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc index 66517b3..ddb4689 100755 --- a/server/gameserver/metamgr.cc +++ b/server/gameserver/metamgr.cc @@ -457,14 +457,14 @@ private: f8::ReadJsonMetaFile(res_path + std::get<0>(tuple) + ".json", itr->second); } { - auto itr = layer_meta_hash.find(std::get<0>(tuple)); + auto itr = layer_meta_hash.find(meta.map_pic()); if (itr == layer_meta_hash.end()) { - layer_meta_hash[std::get<0>(tuple)] = std::list(); - itr = layer_meta_hash.find(std::get<0>(tuple)); + layer_meta_hash[meta.map_pic()] = std::list(); + itr = layer_meta_hash.find(meta.map_pic()); } else { itr->second.clear(); } - f8::ReadJsonMetaFile(res_path + std::get<0>(tuple) + ".layers.json", itr->second); + f8::ReadJsonMetaFile(res_path + meta.map_pic() + ".layers.json", itr->second); } } } diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index 208b4cd..b65722e 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -33,6 +33,7 @@ message Map optional int32 map_mode = 10; optional int32 safearea = 11; optional string game_start_buff_list = 12; + optional string map_pic = 13; } message MapThing