diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc index 5734d9a..d1facd1 100644 --- a/server/imserver/guild.cc +++ b/server/imserver/guild.cc @@ -15,7 +15,7 @@ #include "framework/cpp/httpclientpool.h" -const int GUILD_MAX_MEMBER_NUM = 50; +const int GUILD_MAX_MEMBER_NUM = 5; enum GuildApplyStatus_e { diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc index b4225cb..8f9f5a9 100644 --- a/server/rankserver/guildmgr.cc +++ b/server/rankserver/guildmgr.cc @@ -31,6 +31,12 @@ static bool RankCmpFunc(const cs::MFGuildBasic* a, const cs::MFGuildBasic* b) if (a->guild_exp() < b->guild_exp()) { return false; } + if (a->member_num() > b->member_num()) { + return true; + } + if (a->member_num() < b->member_num()) { + return false; + } return a->guild_id() > b->guild_id(); } @@ -48,6 +54,12 @@ static bool SortedCmpFunc(const cs::MFGuildBasic* a, const cs::MFGuildBasic* b) if (a->guild_exp() < b->guild_exp()) { return false; } + if (a->member_num() > b->member_num()) { + return true; + } + if (a->member_num() < b->member_num()) { + return false; + } return a->guild_id() > b->guild_id(); } @@ -260,6 +272,9 @@ void GuildMgr::__GuildSearch(f8::JsonHttpRequest* request) a8::MutableXObject* guild_list = a8::MutableXObject::NewArray(); for (auto& pair : id_hash_) { cs::MFGuildBasic* guild = pair.second; + if (guild->member_num() <= 0) { + continue; + } if (guild->guild_name().find(search_name) != std::string::npos) { ++total_count; last_page_data.push_back(guild);