From c2eec25e39532cd8a539d7bf5ccc83f25e6a21d6 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 28 Sep 2020 11:01:51 +0800 Subject: [PATCH] 1 --- server/imserver/guild.cc | 4 ++-- server/imserver/guild.h | 2 +- server/imserver/handlermgr.cc | 4 ++-- server/imserver/player.cc | 4 ++-- server/imserver/player.h | 2 +- server/tools/protobuild/cs_msgid.proto | 4 ++-- server/tools/protobuild/cs_proto.proto | 4 ++-- server/tools/protobuild/ss_msgid.proto | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc index 987a214..fd0fefd 100644 --- a/server/imserver/guild.cc +++ b/server/imserver/guild.cc @@ -308,12 +308,12 @@ void Guild::_CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg) SaveToDB(); } -void Guild::_CMGuildRename(f8::MsgHdr& hdr, const cs::CMGuildRename& msg) +void Guild::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg) { ss::SS_IM_ForwardGuildCMMsg *forward_msg = (ss::SS_IM_ForwardGuildCMMsg*)hdr.user_data; guild_name_ = msg.new_name(); - cs::SMGuildRename respmsg; + cs::SMGuildChange respmsg; GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, forward_msg->context(), respmsg); diff --git a/server/imserver/guild.h b/server/imserver/guild.h index d6081d1..4c31094 100644 --- a/server/imserver/guild.h +++ b/server/imserver/guild.h @@ -22,7 +22,7 @@ public: 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 _CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg); void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg); void _CMGuildApplyList(f8::MsgHdr& hdr, const cs::CMGuildApplyList& msg); void _CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg); diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc index c447cbc..89e0a1f 100644 --- a/server/imserver/handlermgr.cc +++ b/server/imserver/handlermgr.cc @@ -110,7 +110,7 @@ void HandlerMgr::RegisterNetMsgHandlers() RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildKick); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildQuit); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildDismiss); - RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildRename); + RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildChange); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildSearch); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildRank); RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberList); @@ -124,7 +124,7 @@ void HandlerMgr::RegisterNetMsgHandlers() RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildKick); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildQuit); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildDismiss); - RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildRename); + RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildChange); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildMemberList); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildApplyList); RegisterNetMsgHandler(&guild_msghandler, &Guild::_CMGuildLog); diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 8997fba..1eadac4 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -757,9 +757,9 @@ void Player::_CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg) ForwardGuildCMMsg(hdr, GuildId()); } -void Player::_CMGuildRename(f8::MsgHdr& hdr, const cs::CMGuildRename& msg) +void Player::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg) { - cs::SMGuildRename respmsg; + cs::SMGuildChange respmsg; if (GuildId() == 0) { respmsg.set_errcode(1); respmsg.set_errmsg("你还没有公会"); diff --git a/server/imserver/player.h b/server/imserver/player.h index 82f149a..f3f5466 100644 --- a/server/imserver/player.h +++ b/server/imserver/player.h @@ -102,7 +102,7 @@ class Player 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 _CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg); void _CMGuildSearch(f8::MsgHdr& hdr, const cs::CMGuildSearch& msg); void _CMGuildRank(f8::MsgHdr& hdr, const cs::CMGuildRank& msg); void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg); diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto index 7a677a3..2067a99 100644 --- a/server/tools/protobuild/cs_msgid.proto +++ b/server/tools/protobuild/cs_msgid.proto @@ -40,7 +40,7 @@ enum CMMessageId_e _CMGuildKick = 234; _CMGuildQuit = 235; _CMGuildDismiss = 236; - _CMGuildRename = 237; + _CMGuildChange = 237; _CMGuildInfo = 238; _CMGuildSearch = 239; _CMGuildRank = 240; @@ -87,7 +87,7 @@ enum SMMessageId_e _SMGuildKick = 234; _SMGuildQuit = 235; _SMGuildDismiss = 236; - _SMGuildRename = 237; + _SMGuildChange = 237; _SMGuildInfo = 238; _SMGuildSearch = 239; _SMGuildRank = 240; diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 545933a..e5652ed 100644 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -431,11 +431,11 @@ message SMGuildDismiss } //公会改名 -message CMGuildRename +message CMGuildChange { optional string new_name = 1; //新公会名 } -message SMGuildRename +message SMGuildChange { optional int32 errcode = 1; //错误码 optional string errmsg = 2; //错误信息 diff --git a/server/tools/protobuild/ss_msgid.proto b/server/tools/protobuild/ss_msgid.proto index d9c92ee..ace578d 100644 --- a/server/tools/protobuild/ss_msgid.proto +++ b/server/tools/protobuild/ss_msgid.proto @@ -44,7 +44,7 @@ enum SSMessageId_e _SS_IM_ForwardGuildCMMsg = 1027; _SS_IM_ForwardGuildSMMsg = 1028; _SS_IM_GuildMemberQuitRequest = 1031; - _SS_IM_GuildMemberQuitResponsea = 1032; + _SS_IM_GuildMemberQuitResponse = 1032; _SS_IM_GuildMemberUpdateRequest = 1033; _SS_IM_GuildMemberUpdateResponse = 1034; }