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

1

Browse Source
This commit is contained in:
aozhiwei 2022-11-28 15:28:17 +08:00
parent ce5e659264
commit 17ec97e887
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/imserver/guildmgr.cc
View File

@ -49,7 +49,7 @@ public:
hdr.user_data = &forward_msg; hdr.user_data = &forward_msg;
if (guild->Status() == kGuildDismissed) { if (guild->Status() == kGuildDismissed) {
cs::SMShowErrorMsg notifymsg; cs::SMShowErrorMsg notifymsg;
notifymsg.set_msg(TEXT("guild_dismissed", "dismissed")); notifymsg.set_msg(TEXT("guild_dismissed", "force dismissed"));
GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle, GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle,
forward_msg.context(), forward_msg.context(),
notifymsg); notifymsg);
@ -287,10 +287,9 @@ void GuildMgr::LoadGuild(long long guild_id)
" join_unlimited, join_cond1, join_cond2, createtime, channel, " " join_unlimited, join_cond1, join_cond2, createtime, channel, "
" owner_vip_lv, owner_head, creator_vip_lv, creator_head, " " owner_vip_lv, owner_head, creator_vip_lv, creator_head, "
" owner_sex, creator_sex " " owner_sex, creator_sex "
"FROM `guild` WHERE guild_id=%d AND guild_status <> %d;", "FROM `guild` WHERE guild_id=%d;",
{ {
guild_id, guild_id
kGuildDismissed
}, },
a8::XParams() a8::XParams()
.SetSender(guild_id), .SetSender(guild_id),

7
server/rankserver/constant.h
View File

@ -13,6 +13,13 @@ enum InnerMesssage_e
IM_HttpResponse, IM_HttpResponse,
}; };
enum GuildStatus_e
{
kGuildCreatePending = 0,
kGuildCreated = 1,
kGuildDismissed = 2
};
//网络处理对象 //网络处理对象
enum NetHandler_e enum NetHandler_e
{ {

4
server/rankserver/guildmgr.cc
View File

@ -800,7 +800,7 @@ void GuildMgr::UpdateRank(cs::MFGuildBasic* guild)
guild->_gameid(), guild->_gameid(),
rank_cmp_func_, rank_cmp_func_,
MAX_RANK_LIST_NUM); MAX_RANK_LIST_NUM);
if (guild->_guild_status() == 2 || if (guild->_guild_status() == kGuildDismissed ||
guild->member_num() <= 0) { guild->member_num() <= 0) {
rank_list->Remove(guild); rank_list->Remove(guild);
} else { } else {
@ -814,7 +814,7 @@ void GuildMgr::UpdateRank(cs::MFGuildBasic* guild)
guild->_gameid(), guild->_gameid(),
sorted_cmp_func_, sorted_cmp_func_,
MAX_SORTED_LIST_NUM); MAX_SORTED_LIST_NUM);
if (guild->_guild_status() == 2 || if (guild->_guild_status() == kGuildDismissed ||
guild->member_num() <= 0) { guild->member_num() <= 0) {
rank_list->Remove(guild); rank_list->Remove(guild);
} else { } else {