diff --git a/server/imserver/player.cc b/server/imserver/player.cc index c7ddb8d..33d8bd4 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -712,27 +712,75 @@ void Player::_CMGuildJoin(f8::MsgHdr& hdr, const cs::CMGuildJoin& msg) void Player::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg) { - + cs::SMGuildAgree respmsg; + if (GuildId() == 0) { + respmsg.set_errcode(1); + respmsg.set_errmsg("你还没有公会"); + SendMsg(respmsg); + return; + } + #if 0 + SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()), + msg); + #endif } void Player::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg) { - + cs::SMGuildKick respmsg; + if (GuildId() == 0) { + respmsg.set_errcode(1); + respmsg.set_errmsg("你还没有公会"); + SendMsg(respmsg); + return; + } + #if 0 + SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()), + msg); + #endif } void Player::_CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& msg) { - + cs::SMGuildQuit respmsg; + if (GuildId() == 0) { + SendMsg(respmsg); + return; + } + #if 0 + SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()), + msg); + #endif } void Player::_CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg) { - + cs::SMGuildDismiss respmsg; + if (GuildId() == 0) { + respmsg.set_errcode(1); + respmsg.set_errmsg("你还没有公会"); + SendMsg(respmsg); + return; + } + #if 0 + SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()), + msg); + #endif } void Player::_CMGuildRename(f8::MsgHdr& hdr, const cs::CMGuildRename& msg) { - + cs::SMGuildRename respmsg; + if (GuildId() == 0) { + respmsg.set_errcode(1); + respmsg.set_errmsg("你还没有公会"); + SendMsg(respmsg); + return; + } + #if 0 + SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()), + msg); + #endif } void Player::_CMGuildSearch(f8::MsgHdr& hdr, const cs::CMGuildSearch& msg) @@ -872,12 +920,30 @@ void Player::_CMGuildRank(f8::MsgHdr& hdr, const cs::CMGuildRank& msg) void Player::_CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg) { - + cs::SMGuildMemberList respmsg; + if (GuildId() == 0) { + respmsg.set_errcode(1); + respmsg.set_errmsg("你还没有公会"); + SendMsg(respmsg); + return; + } + #if 0 + SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()), + msg); + #endif } void Player::_CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg) { - + cs::SMGuildLog respmsg; + if (GuildId() == 0) { + SendMsg(respmsg); + return; + } + #if 0 + SyncHelper::Instance()->SendIMConnMsg(JsonDataMgr::Instance()->GetIMInstanceId(msg.guild_id()), + msg); + #endif } void Player::_SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg)