This commit is contained in:
aozhiwei 2020-12-08 20:07:10 +08:00
parent fe63c678f0
commit ec2e2b949f
4 changed files with 22 additions and 1 deletions

View File

@ -48,21 +48,35 @@ void ChatMgr::FillSMUpdatePrivateChatRedPointNotify(Player* hum,
void ChatMgr::ProcWorldChat(Player* hum, const cs::CMSendChatMsg& msg) void ChatMgr::ProcWorldChat(Player* hum, const cs::CMSendChatMsg& msg)
{ {
++world_msg_id_; ++world_msg_id_;
cs::MFChatMsg* p = new cs::MFChatMsg(); cs::MFChatMsg* p = new cs::MFChatMsg();
p->set_msg_uuid(world_msg_id_); p->set_msg_uuid(world_msg_id_);
world_msgrec_.curr_id = world_msg_id_; world_msgrec_.curr_id = world_msg_id_;
world_msgrec_.msg_list.push_back(p); world_msgrec_.msg_list.push_back(p);
// hum-> if (hum->chat_channel == kCCWorld) {
cs::SMChatMsgNotify notifymsg;
hum->SendMsg(notifymsg);
} else {
hum->MarkNewMsg();
}
} }
void ChatMgr::ProcPrivateChat(Player* hum, const cs::CMSendChatMsg& msg) void ChatMgr::ProcPrivateChat(Player* hum, const cs::CMSendChatMsg& msg)
{ {
++private_msg_id_;
cs::MFChatMsg* p = new cs::MFChatMsg();
p->set_msg_uuid(private_msg_id_);
} }
void ChatMgr::ProcGuildChat(Player* hum, const cs::CMSendChatMsg& msg) void ChatMgr::ProcGuildChat(Player* hum, const cs::CMSendChatMsg& msg)
{ {
++guild_msg_id_;
cs::MFChatMsg* p = new cs::MFChatMsg();
p->set_msg_uuid(guild_msg_id_);
} }
ChatedUserRec* ChatMgr::GetChatedUser(const std::string& account_id) ChatedUserRec* ChatMgr::GetChatedUser(const std::string& account_id)

View File

@ -40,6 +40,7 @@ class ChatMgr : public a8::Singleton<ChatMgr>
private: private:
long long private_msg_id_ = 1000; long long private_msg_id_ = 1000;
long long world_msg_id_ = 1000; long long world_msg_id_ = 1000;
long long guild_msg_id_ = 1000;
ChatMsgRec world_msgrec_; ChatMsgRec world_msgrec_;
std::map<long long, ChatMsgRec> guild_msgrec_; std::map<long long, ChatMsgRec> guild_msgrec_;
std::map<long long, cs::MFChatMsg*> private_msg_hash_; std::map<long long, cs::MFChatMsg*> private_msg_hash_;

View File

@ -1514,6 +1514,11 @@ void Player::SaveToDB(a8::XParams param, f8::AsyncDBOnOkFunc on_ok, f8::AsyncDBO
role_data.last_save_time = App::Instance()->nowtime; role_data.last_save_time = App::Instance()->nowtime;
} }
void Player::MarkNewMsg()
{
}
Friend* Player::GetFriendById(const std::string& friend_id) Friend* Player::GetFriendById(const std::string& friend_id)
{ {
auto itr = friend_hash_.find(friend_id); auto itr = friend_hash_.find(friend_id);

View File

@ -164,6 +164,7 @@ class Player
int GetFriendNum(); int GetFriendNum();
void SaveToDB(a8::XParams param, f8::AsyncDBOnOkFunc on_ok, f8::AsyncDBOnErrorFunc on_error); void SaveToDB(a8::XParams param, f8::AsyncDBOnOkFunc on_ok, f8::AsyncDBOnErrorFunc on_error);
void MarkNewMsg();
private: private:
void FillFriendList(::google::protobuf::RepeatedPtrField< ::cs::MFUserInfo >* friend_list); void FillFriendList(::google::protobuf::RepeatedPtrField< ::cs::MFUserInfo >* friend_list);