diff --git a/server/imserver/constant.h b/server/imserver/constant.h index 5326cb0..6962fca 100644 --- a/server/imserver/constant.h +++ b/server/imserver/constant.h @@ -53,7 +53,8 @@ enum NetHandler_e enum ReadPointFlag { - RPF_Apply = 0 + RPF_FriendApply = 0, + RPF_GuildApply = 1 }; enum GuildMemberQuitReason diff --git a/server/imserver/player.cc b/server/imserver/player.cc index e894949..8742e21 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -238,7 +238,7 @@ void Player::_CMFriendApplyList(f8::MsgHdr& hdr, const cs::CMFriendApplyList& ms cs::SMFriendApplyList respmsg; hum->FillApplyList(*paging, respmsg); hum->SendMsg(respmsg); - a8::UnSetBitFlag(hum->red_point_flags_, RPF_Apply); + a8::UnSetBitFlag(hum->red_point_flags_, RPF_FriendApply); hum->SyncRedPoint(); } delete paging; @@ -1687,7 +1687,7 @@ void Player::RecalcRedPoint() Player* hum = PlayerMgr::Instance()->GetPlayerByAccountId(param.sender.GetString()); if (hum) { if (data_set && data_set->size() > 0) { - a8::SetBitFlag(hum->red_point_flags_, RPF_Apply); + a8::SetBitFlag(hum->red_point_flags_, RPF_FriendApply); hum->SyncRedPoint(); } } diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index fb37268..a71cd6f 100644 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -641,7 +641,7 @@ message SMUpdateAccountInfo //更新红点信息 message SMUpdateRedPointNotify { - optional int32 red_point_flags = 1; //红点信息 1<<0: 好友申请 + optional int32 red_point_flags = 1; //红点信息 1<<0:好友申请 1<<1:公会申请 } //显示飘字