From dfdaf261f5aa46dd8f1af04597c882d5ef3ca4ab Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 24 Dec 2020 13:07:03 +0800 Subject: [PATCH] 1 --- server/imserver/guild.cc | 8 ++++---- server/imserver/player.cc | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc index 6b23893..5f00bd6 100644 --- a/server/imserver/guild.cc +++ b/server/imserver/guild.cc @@ -530,9 +530,9 @@ void Guild::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg) return; } if (sender == member) { - SendErrorMsg(hdr.socket_handle, forward_msg->context(), TEXT("cant_kickout_self", "不能踢自己")); + SendErrorMsg(hdr.socket_handle, forward_msg->context(), TEXT("cannt_kickout_self", "不能踢自己")); respmsg.set_errcode(3); - respmsg.set_errmsg(TEXT("cant_kickout_self", "不能踢自己")); + respmsg.set_errmsg(TEXT("cannt_kickout_self", "不能踢自己")); GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, forward_msg->context(), respmsg); @@ -952,9 +952,9 @@ void Guild::_CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& return; } if (sender == member) { - SendErrorMsg(hdr.socket_handle, forward_msg->context(), TEXT("cant_setjob_self", "不能给自己任职")); + SendErrorMsg(hdr.socket_handle, forward_msg->context(), TEXT("cannt_setjob_self", "不能给自己任职")); respmsg.set_errcode(3); - respmsg.set_errmsg(TEXT("cant_setjob_self", "不能给自己任职")); + respmsg.set_errmsg(TEXT("cannt_setjob_self", "不能给自己任职")); GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, forward_msg->context(), respmsg); diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 50de3fc..38fe93d 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -248,14 +248,14 @@ void Player::_CMFriendApply(f8::MsgHdr& hdr, const cs::CMFriendApply& msg) } if (msg.friend_id() == AccountId()) { respmsg.set_errcode(2); - respmsg.set_errmsg(TEXT("cant_invite_self", "不能邀请自己")); + respmsg.set_errmsg(TEXT("cannt_invite_self", "不能邀请自己")); SendMsg(respmsg); return; } if (f8::ExtractGameIdFromAccountId(AccountId()) != f8::ExtractGameIdFromAccountId(msg.friend_id())) { respmsg.set_errcode(3); - respmsg.set_errmsg(TEXT("cant_invite_other_game_player", "不能邀请其他游戏玩家")); + respmsg.set_errmsg(TEXT("cannt_invite_other_game_player", "不能邀请其他游戏玩家")); SendMsg(respmsg); return; } @@ -389,7 +389,7 @@ void Player::_CMFriendAgree(f8::MsgHdr& hdr, const cs::CMFriendAgree& msg) } if (msg.apply().base_data().account_id() == AccountId()) { respmsg.set_errcode(2); - respmsg.set_errmsg(TEXT("cant_add_self", "不能添加自己")); + respmsg.set_errmsg(TEXT("cannt_add_self", "不能添加自己")); SendMsg(respmsg); return; }