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 2020-10-13 18:35:29 +08:00
parent beb7b96837
commit c3b7e3f256
4 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/imserver/guild.cc
View File

@ -278,9 +278,9 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
cs::SMGuildAgree respmsg; cs::SMGuildAgree respmsg;
if (IsFull()) { if (IsFull()) {
SendErrorMsg(hdr.socket_handle, forward_msg->context(), "战斗人数已达上限"); SendErrorMsg(hdr.socket_handle, forward_msg->context(), "战队人数已达上限");
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("战斗人数已达上限"); respmsg.set_errmsg("战队人数已达上限");
GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
forward_msg->context(), forward_msg->context(),
respmsg); respmsg);
@ -359,7 +359,7 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
); );
guild->ClearApplyBySenderId(msg_copy->apply().base_data().account_id()); guild->ClearApplyBySenderId(msg_copy->apply().base_data().account_id());
} else { } else {
guild->SendErrorMsg(param.param2, forward_msg_copy->context(), "对方已经有战斗"); guild->SendErrorMsg(param.param2, forward_msg_copy->context(), "对方已经有战队");
} }
} }
} }
@ -943,9 +943,9 @@ void Guild::_CMGuildAgreeInvite(f8::MsgHdr& hdr, const cs::CMGuildAgreeInvite& m
return; return;
} }
if (IsFull()) { if (IsFull()) {
SendErrorMsg(hdr.socket_handle, forward_msg->context(), "战斗人数已达上限"); SendErrorMsg(hdr.socket_handle, forward_msg->context(), "战队人数已达上限");
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("战斗人数已达上限"); respmsg.set_errmsg("战队人数已达上限");
GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
forward_msg->context(), forward_msg->context(),
respmsg); respmsg);
@ -1467,9 +1467,9 @@ void Guild::GuildAgreeCb(int socket_handle, const ss::MFIMMsgConext& context, co
return; return;
} }
if (IsFull()) { if (IsFull()) {
SendErrorMsg(socket_handle, context, "战斗人数已达上限"); SendErrorMsg(socket_handle, context, "战队人数已达上限");
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("战斗人数已达上限"); respmsg.set_errmsg("战队人数已达上限");
GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle, GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle,
context, context,
respmsg); respmsg);

2
server/imserver/guildmgr.cc
View File

@ -48,7 +48,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("战斗已解散"); notifymsg.set_msg("战队已解散");
GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle, GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle,
forward_msg.context(), forward_msg.context(),
notifymsg); notifymsg);

34
server/imserver/player.cc
View File

@ -655,7 +655,7 @@ void Player::_CMGuildInfo(f8::MsgHdr& hdr, const cs::CMGuildInfo& msg)
cs::SMGuildInfo respmsg; cs::SMGuildInfo respmsg;
if (msg.guild_id() == 0 && GuildId() == 0) { if (msg.guild_id() == 0 && GuildId() == 0) {
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你还没有战斗"); respmsg.set_errmsg("你还没有战队");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
@ -666,16 +666,16 @@ void Player::_CMGuildCreate(f8::MsgHdr& hdr, const cs::CMGuildCreate& msg)
{ {
cs::SMGuildCreate respmsg; cs::SMGuildCreate respmsg;
if (GuildId() != 0) { if (GuildId() != 0) {
ShowErrorMsg("你已经有战斗"); ShowErrorMsg("你已经有战队");
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你已经有战斗"); respmsg.set_errmsg("你已经有战队");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
if (role_data.today_create_guild_times >= MAX_DAILY_CREATE_GUILD_TIMES) { if (role_data.today_create_guild_times >= MAX_DAILY_CREATE_GUILD_TIMES) {
ShowErrorMsg("今日创建战斗次数已达上限"); ShowErrorMsg("今日创建战队次数已达上限");
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("今日创建战斗次数已达上限"); respmsg.set_errmsg("今日创建战队次数已达上限");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
@ -757,14 +757,14 @@ void Player::_CMGuildJoin(f8::MsgHdr& hdr, const cs::CMGuildJoin& msg)
cs::SMGuildJoin respmsg; cs::SMGuildJoin respmsg;
if (msg.guild_id() == 0 && GuildId() == 0) { if (msg.guild_id() == 0 && GuildId() == 0) {
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你已经有战斗"); respmsg.set_errmsg("你已经有战队");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
if (role_data.today_apply_guild_times >= MAX_DAILY_APPPLY_GUILD_TIMES) { if (role_data.today_apply_guild_times >= MAX_DAILY_APPPLY_GUILD_TIMES) {
ShowErrorMsg("今日申请战斗次数已达上限"); ShowErrorMsg("今日申请战队次数已达上限");
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("今日申请战斗次数已达上限"); respmsg.set_errmsg("今日申请战队次数已达上限");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
@ -790,7 +790,7 @@ void Player::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
cs::SMGuildAgree respmsg; cs::SMGuildAgree respmsg;
if (GuildId() == 0) { if (GuildId() == 0) {
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你还没有战斗"); respmsg.set_errmsg("你还没有战队");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
@ -802,7 +802,7 @@ void Player::_CMGuildRefuse(f8::MsgHdr& hdr, const cs::CMGuildRefuse& msg)
cs::SMGuildRefuse respmsg; cs::SMGuildRefuse respmsg;
if (GuildId() == 0) { if (GuildId() == 0) {
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你还没有战斗"); respmsg.set_errmsg("你还没有战队");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
@ -814,7 +814,7 @@ void Player::_CMGuildKick(f8::MsgHdr& hdr, const cs::CMGuildKick& msg)
cs::SMGuildKick respmsg; cs::SMGuildKick respmsg;
if (GuildId() == 0) { if (GuildId() == 0) {
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你还没有战斗"); respmsg.set_errmsg("你还没有战队");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
@ -836,7 +836,7 @@ void Player::_CMGuildDismiss(f8::MsgHdr& hdr, const cs::CMGuildDismiss& msg)
cs::SMGuildDismiss respmsg; cs::SMGuildDismiss respmsg;
if (GuildId() == 0) { if (GuildId() == 0) {
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你还没有战斗"); respmsg.set_errmsg("你还没有战队");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
@ -848,7 +848,7 @@ void Player::_CMGuildChange(f8::MsgHdr& hdr, const cs::CMGuildChange& msg)
cs::SMGuildChange respmsg; cs::SMGuildChange respmsg;
if (GuildId() == 0) { if (GuildId() == 0) {
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你还没有战斗"); respmsg.set_errmsg("你还没有战队");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
@ -992,7 +992,7 @@ void Player::_CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& ms
cs::SMGuildMemberList respmsg; cs::SMGuildMemberList respmsg;
if (GuildId() == 0) { if (GuildId() == 0) {
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你还没有战斗"); respmsg.set_errmsg("你还没有战队");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
@ -1014,7 +1014,7 @@ void Player::_CMGuildApplyList(f8::MsgHdr& hdr, const cs::CMGuildApplyList& msg)
cs::SMGuildApplyList respmsg; cs::SMGuildApplyList respmsg;
if (GuildId() == 0) { if (GuildId() == 0) {
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你还没有战斗"); respmsg.set_errmsg("你还没有战队");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
@ -1028,7 +1028,7 @@ void Player::_CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob
cs::SMGuildMemberSetJob respmsg; cs::SMGuildMemberSetJob respmsg;
if (GuildId() == 0) { if (GuildId() == 0) {
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你还没有战斗"); respmsg.set_errmsg("你还没有战队");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
@ -1044,7 +1044,7 @@ void Player::_CMGuildAgreeInvite(f8::MsgHdr& hdr, const cs::CMGuildAgreeInvite&
SendMsg(respmsg); SendMsg(respmsg);
} else { } else {
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你已经有战斗"); respmsg.set_errmsg("你已经有战队");
SendMsg(respmsg); SendMsg(respmsg);
} }
return; return;

20
server/rankserver/guildmgr.cc
View File

@ -149,7 +149,7 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
TypeConvert::Convert(request, guild); TypeConvert::Convert(request, guild);
if (guild->guild_name().empty()) { if (guild->guild_name().empty()) {
request->resp_xobj->SetVal("errcode", 2); request->resp_xobj->SetVal("errcode", 2);
request->resp_xobj->SetVal("errmsg", "战斗名字不能为空"); request->resp_xobj->SetVal("errmsg", "战队名字不能为空");
delete guild; delete guild;
return; return;
} }
@ -161,7 +161,7 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
guild->guild_name() guild->guild_name()
)) { )) {
request->resp_xobj->SetVal("errcode", 3); request->resp_xobj->SetVal("errcode", 3);
request->resp_xobj->SetVal("errmsg", "战斗名已经存在"); request->resp_xobj->SetVal("errmsg", "战队名已经存在");
delete guild; delete guild;
return; return;
} }
@ -179,13 +179,13 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
} }
if (MetaMgr::Instance()->HasDirtyWord(guild->guild_name())) { if (MetaMgr::Instance()->HasDirtyWord(guild->guild_name())) {
request->resp_xobj->SetVal("errcode", 4); request->resp_xobj->SetVal("errcode", 4);
request->resp_xobj->SetVal("errmsg", "战斗名含有违禁字符"); request->resp_xobj->SetVal("errmsg", "战队名含有违禁字符");
delete guild; delete guild;
return; return;
} }
if (MetaMgr::Instance()->HasDirtyWord(guild->guild_declaration())) { if (MetaMgr::Instance()->HasDirtyWord(guild->guild_declaration())) {
request->resp_xobj->SetVal("errcode", 5); request->resp_xobj->SetVal("errcode", 5);
request->resp_xobj->SetVal("errmsg", "战斗宣言含有违禁字符"); request->resp_xobj->SetVal("errmsg", "战队宣言含有违禁字符");
delete guild; delete guild;
return; return;
} }
@ -369,7 +369,7 @@ void GuildMgr::__GuildRename(f8::JsonHttpRequest* request)
if (guild->guild_declaration() != guild_declaration) { if (guild->guild_declaration() != guild_declaration) {
if (MetaMgr::Instance()->HasDirtyWord(guild_declaration)) { if (MetaMgr::Instance()->HasDirtyWord(guild_declaration)) {
request->resp_xobj->SetVal("errcode", 1); request->resp_xobj->SetVal("errcode", 1);
request->resp_xobj->SetVal("errmsg", "战斗宣言含有违禁字符"); request->resp_xobj->SetVal("errmsg", "战队宣言含有违禁字符");
return; return;
} }
} }
@ -380,7 +380,7 @@ void GuildMgr::__GuildRename(f8::JsonHttpRequest* request)
} }
if (guild_name.empty()) { if (guild_name.empty()) {
request->resp_xobj->SetVal("errcode", 1); request->resp_xobj->SetVal("errcode", 1);
request->resp_xobj->SetVal("errmsg", "战斗名不能为空"); request->resp_xobj->SetVal("errmsg", "战队名不能为空");
return; return;
} }
if (GetGuildByName(guild->_gameid(), if (GetGuildByName(guild->_gameid(),
@ -389,7 +389,7 @@ void GuildMgr::__GuildRename(f8::JsonHttpRequest* request)
guild->_name_ext2(), guild->_name_ext2(),
guild_name)) { guild_name)) {
request->resp_xobj->SetVal("errcode", 1); request->resp_xobj->SetVal("errcode", 1);
request->resp_xobj->SetVal("errmsg", "战斗名已经存在"); request->resp_xobj->SetVal("errmsg", "战队名已经存在");
return; return;
} }
if (a8::GetUtf8Length(guild_name.c_str()) > MAX_GUILD_NAME_LEN) { if (a8::GetUtf8Length(guild_name.c_str()) > MAX_GUILD_NAME_LEN) {
@ -406,7 +406,7 @@ void GuildMgr::__GuildRename(f8::JsonHttpRequest* request)
} }
if (MetaMgr::Instance()->HasDirtyWord(guild_name)) { if (MetaMgr::Instance()->HasDirtyWord(guild_name)) {
request->resp_xobj->SetVal("errcode", 1); request->resp_xobj->SetVal("errcode", 1);
request->resp_xobj->SetVal("errmsg", "战斗名含有违禁字符"); request->resp_xobj->SetVal("errmsg", "战队名含有违禁字符");
return; return;
} }
@ -525,13 +525,13 @@ void GuildMgr::__GenTestData(f8::JsonHttpRequest* request)
{ {
gameid, gameid,
guild_id, guild_id,
a8::Format("测试战斗%d", { i + 1}), a8::Format("测试战队%d", { i + 1}),
1, 1,
1, 1,
1, 1,
0, 0,
"", "",
"战斗宣言", "战队宣言",
"", "",
1, 1,
"1", "1",