This commit is contained in:
aozhiwei 2020-09-27 13:17:09 +08:00
parent ae2c35fdf5
commit b77fb89fa4
4 changed files with 23 additions and 3 deletions

View File

@ -64,6 +64,12 @@ enum GuildMemberQuitReason
kGuildDismisss = 2 kGuildDismisss = 2
}; };
enum GuildMemberUpdateReason
{
kGuildUpdateReasonJoin = 0,
kGuildUpdateReasonAgree = 1,
};
const char* const PROJ_NAME_FMT = "friend_imserver"; const char* const PROJ_NAME_FMT = "friend_imserver";
const char* const PROJ_ROOT_FMT = "/data/logs/%s"; const char* const PROJ_ROOT_FMT = "/data/logs/%s";

View File

@ -148,7 +148,7 @@ void Guild::_CMGuildJoin(f8::MsgHdr& hdr, const cs::CMGuildJoin& msg)
GuildMember* member = GetMember(forward_msg->context().user_info().base_data().account_id()); GuildMember* member = GetMember(forward_msg->context().user_info().base_data().account_id());
if (member) { if (member) {
SyncHelper::Instance()->SyncGuildMemberUpdate(this, member, kGuildUpdateReasonJoin);
} else { } else {
DBHelper::Instance()->AddGuildApply(this, forward_msg->context().user_info()); DBHelper::Instance()->AddGuildApply(this, forward_msg->context().user_info());
} }
@ -159,7 +159,9 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
ss::SS_IM_ForwardGuildCMMsg *forward_msg = (ss::SS_IM_ForwardGuildCMMsg*)hdr.user_data; ss::SS_IM_ForwardGuildCMMsg *forward_msg = (ss::SS_IM_ForwardGuildCMMsg*)hdr.user_data;
cs::SMGuildAgree respmsg; cs::SMGuildAgree respmsg;
if (GetMember(forward_msg->context().user_info().base_data().account_id())) { GuildMember* member = GetMember(forward_msg->context().user_info().base_data().account_id());
if (member) {
SyncHelper::Instance()->SyncGuildMemberUpdate(this, member, kGuildUpdateReasonAgree);
GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle, GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
forward_msg->context(), forward_msg->context(),
respmsg); respmsg);
@ -201,7 +203,7 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
forward_msg->context(), forward_msg->context(),
respmsg); respmsg);
GuildMember* member = new GuildMember(); member = new GuildMember();
TypeConvert::Convert(forward_msg->context().user_info().base_data(), *member); TypeConvert::Convert(forward_msg->context().user_info().base_data(), *member);
AddMember(member); AddMember(member);

View File

@ -95,6 +95,13 @@ void SyncHelper::SyncApplyFriend(Player* hum, const std::string& target_id)
delete notifymsg; delete notifymsg;
} }
void SyncHelper::SyncGuildMemberUpdate(Guild* guild,
GuildMember* member,
int reason)
{
}
void SyncHelper::SyncGuildMemberQuit(Guild* guild, void SyncHelper::SyncGuildMemberQuit(Guild* guild,
const std::string& sender_id, const std::string& sender_id,
const std::string& target_id, const std::string& target_id,

View File

@ -11,6 +11,7 @@ namespace ss
} }
class Guild; class Guild;
struct GuildMember;
class Player; class Player;
struct timer_list; struct timer_list;
class SyncHelper : public a8::Singleton<SyncHelper> class SyncHelper : public a8::Singleton<SyncHelper>
@ -31,6 +32,10 @@ public:
void SyncUpdateFriend(Player* hum, const std::string& target_id); void SyncUpdateFriend(Player* hum, const std::string& target_id);
void SyncApplyFriend(Player* hum, const std::string& target_id); void SyncApplyFriend(Player* hum, const std::string& target_id);
void SyncGuildMemberUpdate(Guild* guild,
GuildMember* member,
int reason);
void SyncGuildMemberQuit(Guild* guild, void SyncGuildMemberQuit(Guild* guild,
const std::string& sender_id, const std::string& sender_id,
const std::string& target_id, const std::string& target_id,