From 760d6adac55fea779f8b6dcab4d128e7388a878b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 11 May 2021 13:06:54 +0800 Subject: [PATCH] 1 --- server/gameserver/metamgr.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc index c88dd38..c32528b 100755 --- a/server/gameserver/metamgr.cc +++ b/server/gameserver/metamgr.cc @@ -126,6 +126,7 @@ public: f8::ReadCsvMetaFile(res_path + "map@map.csv", map_meta_list); f8::ReadCsvMetaFile(res_path + "safearea@safearea.csv", safearea_meta_list); f8::ReadCsvMetaFile(res_path + "item@item.csv", item_meta_list); + f8::ReadCsvMetaFile(res_path + "buff@buff.csv", buff_meta_list); f8::ReadCsvMetaFile(res_path + "equip@equip.csv", equip_meta_list); f8::ReadCsvMetaFile(res_path + "player@player.csv", player_meta_list); f8::ReadCsvMetaFile(res_path + "player@player.csv", player_meta_list); @@ -136,7 +137,6 @@ public: f8::ReadJsonMetaFile(res_path + "maps.json", building_meta_list); f8::ReadCsvMetaFile(res_path + "dress@dress.csv", dress_meta_list); f8::ReadCsvMetaFile(res_path + "skill@skill.csv", skill_meta_list); - f8::ReadCsvMetaFile(res_path + "buff@buff.csv", buff_meta_list); f8::ReadCsvMetaFile(res_path + "attr@attr.csv", attr_meta_list); f8::ReadCsvMetaFile(res_path + "rankReward@rankReward.csv", rankreward_meta_list); f8::ReadCsvMetaFile(res_path + "killReward@killReward.csv", killreward_meta_list); @@ -513,6 +513,16 @@ private: safearea_hash[item.i->id()] = &item; } + for (auto& meta : buff_meta_list) { + if (!IsValidBuffEffect(meta.buff_effect())) { + abort(); + } + MetaData::Buff& item = a8::FastAppend(buff_list); + item.i = &meta; + item.Init(); + buff_hash[item.i->buff_id()] = &item; + } + for (auto& meta : item_meta_list) { MetaData::Item& item = a8::FastAppend(item_list); item.i = &meta; @@ -598,16 +608,6 @@ private: attr_name_hash[item.i->attr_ename()] = &item; } - for (auto& meta : buff_meta_list) { - if (!IsValidBuffEffect(meta.buff_effect())) { - abort(); - } - MetaData::Buff& item = a8::FastAppend(buff_list); - item.i = &meta; - item.Init(); - buff_hash[item.i->buff_id()] = &item; - } - for (auto& meta : skill_meta_list) { MetaData::Skill& item = a8::FastAppend(skill_list); item.i = &meta;