server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2022-05-29 15:44:56 +08:00
parent cc17aa6bc2
commit fb48c897ee
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/httpproxy.cc
View File

@ -33,7 +33,7 @@ static void _ProxyCallback(f8::JsonHttpRequest* request)
if (req) { if (req) {
a8::XObject data; a8::XObject data;
data.ReadFromJsonString(request->request.Get("response").GetString()); data.ReadFromJsonString(request->request.Get("data").GetString());
if (data.GetType() == a8::XOT_SIMPLE) { if (data.GetType() == a8::XOT_SIMPLE) {
data.ReadFromJsonString("{}"); data.ReadFromJsonString("{}");
} }

23
server/gameserver/metamgr.cc
View File

@ -191,6 +191,7 @@ public:
std::list<metatable::TerrainJson> terrain_meta_list; std::list<metatable::TerrainJson> terrain_meta_list;
std::list<metatable::GunTalentGrow> talent_meta_list; std::list<metatable::GunTalentGrow> talent_meta_list;
std::list<metatable::FormulaPvp> formula_pvp_meta_list; std::list<metatable::FormulaPvp> formula_pvp_meta_list;
std::list<MetaData::FormulaPvp> formula_pvp_list;
std::list<metatable::HeroQuality> hero_quality_meta_list; std::list<metatable::HeroQuality> hero_quality_meta_list;
std::list<metatable::GunQuality> gun_quality_meta_list; std::list<metatable::GunQuality> gun_quality_meta_list;
@ -915,6 +916,12 @@ private:
talent_hash[a8::MakeInt64(meta.talent_id(), meta.talent_lv())] = item; talent_hash[a8::MakeInt64(meta.talent_id(), meta.talent_lv())] = item;
} }
for (auto& meta : formula_pvp_meta_list) {
MetaData::FormulaPvp item;
item.i = &meta;
formula_pvp_list.push_back(item);
}
for (auto& meta : hero_quality_meta_list) { for (auto& meta : hero_quality_meta_list) {
MetaData::HeroQuality item; MetaData::HeroQuality item;
item.i = &meta; item.i = &meta;
@ -926,7 +933,6 @@ private:
item.i = &meta; item.i = &meta;
gun_quality_hash[meta.quality()] = item; gun_quality_hash[meta.quality()] = item;
} }
} }
private: private:
@ -1264,18 +1270,23 @@ MetaData::Item* MetaMgr::GetHeroSkin(int hero_id)
MetaData::HeroQuality* MetaMgr::GetHeroQuality(int quality) MetaData::HeroQuality* MetaMgr::GetHeroQuality(int quality)
{ {
return nullptr; auto itr = loader_->hero_quality_hash.find(quality);
return itr != loader_->hero_quality_hash.end() ? &itr->second : nullptr;
} }
MetaData::GunQuality* MetaMgr::GetGunQuality(int quality) MetaData::GunQuality* MetaMgr::GetGunQuality(int quality)
{ {
return nullptr; auto itr = loader_->gun_quality_hash.find(quality);
return itr != loader_->gun_quality_hash.end() ? &itr->second : nullptr;
} }
MetaData::FormulaPvp* MetaMgr::GetFormulaPvp(float ranked_topx) MetaData::FormulaPvp* MetaMgr::GetFormulaPvp(float ranked_topx)
{ {
for (auto& meta : loader_->formula_pvp_meta_list) { MetaData::FormulaPvp* last_meta = nullptr;
for (auto& meta : loader_->formula_pvp_list) {
if (ranked_topx <= meta.i->top()) {
return &meta;
} }
return nullptr; }
return last_meta;
} }