diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc index 6a718d1..febea2e 100644 --- a/server/imserver/handlermgr.cc +++ b/server/imserver/handlermgr.cc @@ -12,6 +12,8 @@ #include "groupmgr.h" #include "IMConnMgr.h" #include "synchelper.h" +#include "guildmgr.h" +#include "guild.h" #include "ss_proto.pb.h" #include "cs_proto.pb.h" @@ -93,6 +95,14 @@ void HandlerMgr::RegisterNetMsgHandlers() RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupQuit); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupDismiss); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupRename); + + RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildCreate); + RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildJoin); + RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildAgree); + RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildKick); + RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildQuit); + RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildDismiss); + RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildRename); } void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle, diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 390015b..777f3fb 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -609,6 +609,41 @@ void Player::_CMGroupRename(f8::MsgHdr& hdr, const cs::CMGroupRename& msg) #endif } +void Player::_CMGuildCreate(f8::MsgHdr& hdr, const cs::CMGuildCreate& msg) +{ + +} + +void Player::_CMGuildJoin(f8::MsgHdr& hdr, const cs::CMGuildJoin& msg) +{ + +} + +void Player::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg) +{ + +} + +void Player::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg) +{ + +} + +void Player::_CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& msg) +{ + +} + +void Player::_CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg) +{ + +} + +void Player::_CMGuildRename(f8::MsgHdr& hdr, const cs::CMGuildRename& msg) +{ + +} + void Player::_SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg) { if (!GetFriendById(msg.context().user_info().base_data().account_id())) { diff --git a/server/imserver/player.h b/server/imserver/player.h index 55becde..b643f3f 100644 --- a/server/imserver/player.h +++ b/server/imserver/player.h @@ -95,6 +95,14 @@ class Player void _CMGroupDismiss(f8::MsgHdr& hdr, const cs::CMGroupDismiss& msg); void _CMGroupRename(f8::MsgHdr& hdr, const cs::CMGroupRename& msg); + void _CMGuildCreate(f8::MsgHdr& hdr, const cs::CMGuildCreate& msg); + void _CMGuildJoin(f8::MsgHdr& hdr, const cs::CMGuildJoin& msg); + void _CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg); + void _CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg); + void _CMGuildQuit(f8::MsgHdr& hdr, const cs::CMGuildQuit& msg); + void _CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg); + void _CMGuildRename(f8::MsgHdr& hdr, const cs::CMGuildRename& msg); + void _SS_IM_FriendAgreeRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendAgreeRequest& msg); void _SS_IM_FriendDeleteRequest(f8::MsgHdr& hdr, const ss::SS_IM_FriendDeleteRequest& msg); void _SS_IM_FriendApply(f8::MsgHdr& hdr, const ss::SS_IM_FriendApply& msg); diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto index ca24bad..39065f2 100644 --- a/server/tools/protobuild/cs_msgid.proto +++ b/server/tools/protobuild/cs_msgid.proto @@ -33,6 +33,7 @@ enum CMMessageId_e _CMGroupDismiss = 206; _CMGroupRename = 207; + _CMGuildMsgBegin = 230; _CMGuildCreate = 231; _CMGuildJoin = 232; _CMGuildAgree = 233; @@ -40,6 +41,7 @@ enum CMMessageId_e _CMGuildQuit = 235; _CMGuildDismiss = 236; _CMGuildRename = 237; + _CMGuildMsgEnd = 270; } @@ -71,6 +73,7 @@ enum SMMessageId_e _SMGroupDismiss = 206; _SMGroupRename = 207; + _SMGuildMsgBegin = 230; _SMGuildCreate = 231; _SMGuildJoin = 232; _SMGuildAgree = 233; @@ -78,6 +81,7 @@ enum SMMessageId_e _SMGuildQuit = 235; _SMGuildDismiss = 236; _SMGuildRename = 237; + _SMGuildMsgEnd = 270; _SMUserStatusNotify = 501; _SMUserInfoUpdate = 502;