From 9783be9f634e8128d917bd96a3b5e74e8933d835 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 20 Mar 2024 20:07:11 +0800 Subject: [PATCH] 1 --- server/imserver_new/player/player.go | 62 +++++++++++++++++++++++-- server/imserver_new/player/playermgr.go | 4 ++ 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/server/imserver_new/player/player.go b/server/imserver_new/player/player.go index 2cd7a4b4..f5b07ac7 100644 --- a/server/imserver_new/player/player.go +++ b/server/imserver_new/player/player.go @@ -111,10 +111,11 @@ func (p *Player) CMSearchUser(hdr *f5.MsgHdr, msg *cs.CMSearchUser) { rspMsg.Errmsg = &errMsg } else { rspMsg.SinceId = &lastId + /* for _, friendProfile := range listFriend { rspUser := p.FillMFUser(friendProfile) rspMsg.Users = append(rspMsg.Users, rspUser) - } + }*/ } p.SendMsg(rspMsg) }) @@ -130,7 +131,7 @@ func (p *Player) CMSearchUserByAccountId(hdr *f5.MsgHdr, msg *cs.CMSearchUserByA rspMsg.Errmsg = &errMsg } else { if playerProfile != nil { - rspMsg.Users = p.FillMFUser(playerProfile) + //rspMsg.Users = p.FillMFUser(playerProfile) } } p.SendMsg(rspMsg) @@ -151,8 +152,10 @@ func (p *Player) CMListPendingFriendRequest(hdr *f5.MsgHdr, msg *cs.CMListPendin if profile == nil { continue } + /* pendingUser := p.FillMFUser(profile) rspMsg.Users = append(rspMsg.Users, pendingUser) + */ } f5.GetSysLog().Info("CMListPendingFriendRequest count:%d\n", len(rspMsg.Users)) @@ -178,12 +181,14 @@ func (p *Player) CMListFriend(hdr *f5.MsgHdr, msg *cs.CMListFriend) { if !ok { return } + /* for _, fid := range friendIds { userProfile := GetCacheMgr().GetPlayerProfile(fid) rspUser := p.FillMFUser(userProfile) rspMsg.Users = append(rspMsg.Users, rspUser) } p.SendMsg(rspMsg) + */ }) } @@ -200,8 +205,10 @@ func (p *Player) CMBlacklist(hdr *f5.MsgHdr, msg *cs.CMBlacklist) { if blockedPlayerProfile == nil { continue } + /* user := p.FillMFUser(blockedPlayerProfile) rspMsg.Users = append(rspMsg.Users, user) + */ } p.SendMsg(rspMsg) } @@ -386,6 +393,7 @@ func IsValidChatChannel(chatChannel int32) bool { // CMGuildInfo 公会信息 func (p *Player) CMGuildInfo(hdr *f5.MsgHdr, msg *cs.CMGuildInfo) { + /* var accountId = p.GetAccountId() if len(msg.GetAccountId()) > 0 { accountId = msg.GetAccountId() @@ -396,13 +404,16 @@ func (p *Player) CMGuildInfo(hdr *f5.MsgHdr, msg *cs.CMGuildInfo) { rspMsg.Guild = p.FillMFGuild(guild) } p.SendMsg(rspMsg) + */ } // CMRecommendGuildList 推荐公会列表 func (p *Player) CMRecommendGuildList(hdr *f5.MsgHdr, msg *cs.CMRecommendGuildList) { + /* rspMsg := new(cs.SMRecommendGuildList) rspMsg.RecommendGuilds = p.FillMFGuilds(GetGuildMgr().RandomGuilds()) p.SendMsg(rspMsg) + */ } // CMGetTopGuildsByTotalStars 公会排行 总星星数排行 @@ -432,6 +443,7 @@ func (p *Player) CMGetTopGuildsByTotalStars(hdr *f5.MsgHdr, msg *cs.CMGetTopGuil // CMCreateGuild 创建公会 func (p *Player) CMCreateGuild(hdr *f5.MsgHdr, msg *cs.CMCreateGuild) { + /* avatar := msg.GetAvatar() guildMgr.CreateGuild( p, avatar, msg.GetName(), p.accountId, @@ -445,10 +457,12 @@ func (p *Player) CMCreateGuild(hdr *f5.MsgHdr, msg *cs.CMCreateGuild) { } p.SendMsg(rspMsg) }) + */ } // CMApplyToGuild 申请者加入公会 func (p *Player) CMApplyToGuild(hdr *f5.MsgHdr, msg *cs.CMApplyToGuild) { + /* guildMgr.ApplyToGuild( msg.GetGuildId(), p.accountId, func(errCode int32, errMsg string, guild *Guild) { @@ -479,10 +493,12 @@ func (p *Player) CMApplyToGuild(hdr *f5.MsgHdr, msg *cs.CMApplyToGuild) { } }, ) + */ } // CMApplyList 请求申请者列表 func (p *Player) CMApplyList(hdr *f5.MsgHdr, msg *cs.CMApplyList) { + /* rspMsg := new(cs.SMApplyList) guild := guildMgr.GetGuildByAccountId(p.accountId) if guild != nil { @@ -501,10 +517,12 @@ func (p *Player) CMApplyList(hdr *f5.MsgHdr, msg *cs.CMApplyList) { } } p.SendMsg(rspMsg) + */ } // CMApprove 同意申请者加入公会 func (p *Player) CMApprove(hdr *f5.MsgHdr, msg *cs.CMApprove) { + /* guildMgr.Approve( p.accountId, msg.GetApplicantAccountId(), func(errCode int32, errMsg string, guild *Guild) { @@ -535,10 +553,12 @@ func (p *Player) CMApprove(hdr *f5.MsgHdr, msg *cs.CMApprove) { } }, ) + */ } // CMReject 拒绝申请者加入公会 func (p *Player) CMReject(hdr *f5.MsgHdr, msg *cs.CMReject) { + /* guildMgr.Reject( p.accountId, msg.GetApplicantAccountId(), func(errCode int32, errMsg string) { @@ -550,10 +570,12 @@ func (p *Player) CMReject(hdr *f5.MsgHdr, msg *cs.CMReject) { p.SendMsg(rspMsg) }, ) + */ } // CMLeaveGuild 离开公会 func (p *Player) CMLeaveGuild(hdr *f5.MsgHdr, msg *cs.CMLeaveGuild) { + /* guildMgr.LeaveGuild( p.accountId, func(errCode int32, errMsg string, guild *Guild) { @@ -584,10 +606,12 @@ func (p *Player) CMLeaveGuild(hdr *f5.MsgHdr, msg *cs.CMLeaveGuild) { } }, ) + */ } // CMDismissMember 开除成员 func (p *Player) CMDismissMember(hdr *f5.MsgHdr, msg *cs.CMDismissMember) { + /* guildMgr.DismissMember( p.accountId, msg.GetDismissAccountId(), @@ -623,10 +647,12 @@ func (p *Player) CMDismissMember(hdr *f5.MsgHdr, msg *cs.CMDismissMember) { } }, ) + */ } // CMSetMemberLevel 设置公会成员等级 func (p *Player) CMSetMemberLevel(hdr *f5.MsgHdr, msg *cs.CMSetMemberLevel) { + /* guildMgr.SetMemberLevel( p.accountId, msg.GetMemberAccountId(), @@ -659,10 +685,12 @@ func (p *Player) CMSetMemberLevel(hdr *f5.MsgHdr, msg *cs.CMSetMemberLevel) { } } }) + */ } // CMDisband 解散公会 func (p *Player) CMDisband(hdr *f5.MsgHdr, msg *cs.CMDisband) { + /* guildMgr.Disband( p.accountId, func(errCode int32, errMsg string, guild *Guild) { @@ -673,10 +701,12 @@ func (p *Player) CMDisband(hdr *f5.MsgHdr, msg *cs.CMDisband) { } p.SendMsg(rspMsg) }) + */ } // CMSetNotice 设置公告 func (p *Player) CMSetNotice(hdr *f5.MsgHdr, msg *cs.CMSetNotice) { + /* guildMgr.SetNotice( p.accountId, msg.GetContent(), @@ -688,10 +718,12 @@ func (p *Player) CMSetNotice(hdr *f5.MsgHdr, msg *cs.CMSetNotice) { } p.SendMsg(rspMsg) }) + */ } // CMSetAvatar 设置头像 func (p *Player) CMSetAvatar(hdr *f5.MsgHdr, msg *cs.CMSetAvatar) { + /* guildMgr.SetAvatar( p.accountId, msg.GetAvatar(), @@ -703,10 +735,12 @@ func (p *Player) CMSetAvatar(hdr *f5.MsgHdr, msg *cs.CMSetAvatar) { } p.SendMsg(rspMsg) }) + */ } // CMSetName 设置公会名称 func (p *Player) CMSetName(hdr *f5.MsgHdr, msg *cs.CMSetName) { + /* guildMgr.SetName( p, msg.GetName(), @@ -720,10 +754,12 @@ func (p *Player) CMSetName(hdr *f5.MsgHdr, msg *cs.CMSetName) { } p.SendMsg(rspMsg) }) + */ } // CMSetJoinCond 设置公会加入条件 func (p *Player) CMSetJoinCond(hdr *f5.MsgHdr, msg *cs.CMSetJoinCond) { + /* guildMgr.SetJoinCond( p.accountId, msg.GetJoinCond(), @@ -736,11 +772,12 @@ func (p *Player) CMSetJoinCond(hdr *f5.MsgHdr, msg *cs.CMSetJoinCond) { } p.SendMsg(rspMsg) }) + */ } // CMGuildMembersList 公会成员列表 func (p *Player) CMGuildMembersList(hdr *f5.MsgHdr, msg *cs.CMGuildMembersList) { - rspMsg := new(cs.SMGuildMembersList) + /*rspMsg := new(cs.SMGuildMembersList) guild := guildMgr.GetGuildByAccountId(p.accountId) if guild == nil { @@ -757,10 +794,12 @@ func (p *Player) CMGuildMembersList(hdr *f5.MsgHdr, msg *cs.CMGuildMembersList) } } p.SendMsg(rspMsg) + */ } // CMSearchGuilds 搜索公会 func (p *Player) CMSearchGuilds(hdr *f5.MsgHdr, msg *cs.CMSearchGuilds) { + /* rspMsg := new(cs.SMSearchGuilds) for _, guild := range guildMgr.guilds { if guild.Name == msg.GetName() { @@ -770,6 +809,7 @@ func (p *Player) CMSearchGuilds(hdr *f5.MsgHdr, msg *cs.CMSearchGuilds) { } f5.GetSysLog().Info("CMSearchGuilds name[%s], result:%d \n", msg.GetName(), len(rspMsg.Guilds)) p.SendMsg(rspMsg) + */ // Like search //guildMgr.SearchGuild(sinceId, name, func(errCode int32, errMsg string, lastId int64, guildIds []int64) { // rspMsg := new(cs.SMSearchGuilds) @@ -791,6 +831,7 @@ func (p *Player) CMSearchGuilds(hdr *f5.MsgHdr, msg *cs.CMSearchGuilds) { // CMGuildLogs 请求公会日志 func (p *Player) CMGuildLogs(hdr *f5.MsgHdr, msg *cs.CMGuildLogs) { + /* rspMsg := new(cs.SMGuildLogs) guild := guildMgr.GetGuildByAccountId(p.accountId) if guild == nil { @@ -807,8 +848,10 @@ func (p *Player) CMGuildLogs(hdr *f5.MsgHdr, msg *cs.CMGuildLogs) { rspMsg.GuildLogs = append(rspMsg.GuildLogs, guildLog) } p.SendMsg(rspMsg) + */ } +/* func (p *Player) FillMFGuildMember(member *GuildMember) *cs.MFGuildMember { profile := cacheMgr.GetPlayerProfile(member.AccountId) if profile == nil { @@ -827,8 +870,11 @@ func (p *Player) FillMFGuildMember(member *GuildMember) *cs.MFGuildMember { LastLoginTime: &profile.LastLoginTime, } return guildMember + return nil } +*/ +/* // FillMFGuild 填充公会 func (p *Player) FillMFGuild(guild *Guild) *cs.MFGuild { // 总星星数 @@ -870,8 +916,10 @@ func (p *Player) FillMFGuild(guild *Guild) *cs.MFGuild { } return resGuild } +*/ // FillMFGuilds 填充公会列表 +/* func (p *Player) FillMFGuilds(guilds []*Guild) []*cs.MFGuild { var resGuilds []*cs.MFGuild for _, g := range guilds { @@ -880,8 +928,10 @@ func (p *Player) FillMFGuilds(guilds []*Guild) []*cs.MFGuild { } return resGuilds } +*/ // FillMFUser 填充好友信息 +/* func (p *Player) FillMFUser(profile *PlayerProfile) *cs.MFUser { var guildId int64 = 0 var guildName = "" @@ -905,9 +955,11 @@ func (p *Player) FillMFUser(profile *PlayerProfile) *cs.MFUser { } return resUser } +*/ // FillMFChatUser 填充聊天信息 func (p *Player) FillMFChatUser() *cs.MFChatUser { + /* accountId := p.accountId profile := cacheMgr.GetPlayerProfile(accountId) if profile == nil { @@ -937,9 +989,13 @@ func (p *Player) FillMFChatUser() *cs.MFChatUser { LastLoginTime: &profile.LastLoginTime, } return res + */ + return nil } +/* func (p *Player) IncrPrivateChatLastId() uint64 { p.privateChatLastId++ return p.privateChatLastId } +*/ diff --git a/server/imserver_new/player/playermgr.go b/server/imserver_new/player/playermgr.go index 05158c68..645af01b 100644 --- a/server/imserver_new/player/playermgr.go +++ b/server/imserver_new/player/playermgr.go @@ -129,6 +129,7 @@ func (this *PlayerMgr) CMLoginResult(hdr *f5.MsgHdr, msg *cs.CMLogin, rsp f5.Htt // Add to online user this.addPlayer(&player) this.addSocketHash(hdr.GetSocket(), &player) + /* // Add player profile playerProfile := &PlayerProfile{ AccountId: accountId, @@ -159,6 +160,7 @@ func (this *PlayerMgr) CMLoginResult(hdr *f5.MsgHdr, msg *cs.CMLogin, rsp f5.Htt rspMsg.ServerInfo = serverInfo rspMsg.AccountId = &resObj.Info.AccountID GetWspListener().SendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) + */ } func (this *PlayerMgr) reportServerState(masterIp string, masterPort int32) { @@ -237,6 +239,7 @@ func (this *PlayerMgr) CMReconnect(hdr *f5.MsgHdr, msg *cs.CMReconnect) { } // GetRemotePlayerInfo +/* func (this *PlayerMgr) GetRemotePlayerInfo(player *Player, cb func(errCode int32, errMsg string, p *PlayerProfile)) { params := map[string]string{ "c": "User", @@ -297,3 +300,4 @@ func (this *PlayerMgr) GetRemotePlayerInfo(player *Player, cb func(errCode int32 cb(resObj.ErrCode, resObj.ErrMsg, playerProfile) }) } +*/