server/game2006go
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-03-20 20:07:11 +08:00
parent 538b94401b
commit 9783be9f63
2 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
server/imserver_new/player/player.go
View File

@ -111,10 +111,11 @@ func (p *Player) CMSearchUser(hdr *f5.MsgHdr, msg *cs.CMSearchUser) {
rspMsg.Errmsg = &errMsg rspMsg.Errmsg = &errMsg
} else { } else {
rspMsg.SinceId = &lastId rspMsg.SinceId = &lastId
/*
for _, friendProfile := range listFriend { for _, friendProfile := range listFriend {
rspUser := p.FillMFUser(friendProfile) rspUser := p.FillMFUser(friendProfile)
rspMsg.Users = append(rspMsg.Users, rspUser) rspMsg.Users = append(rspMsg.Users, rspUser)
} }*/
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
}) })
@ -130,7 +131,7 @@ func (p *Player) CMSearchUserByAccountId(hdr *f5.MsgHdr, msg *cs.CMSearchUserByA
rspMsg.Errmsg = &errMsg rspMsg.Errmsg = &errMsg
} else { } else {
if playerProfile != nil { if playerProfile != nil {
rspMsg.Users = p.FillMFUser(playerProfile) //rspMsg.Users = p.FillMFUser(playerProfile)
} }
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
@ -151,8 +152,10 @@ func (p *Player) CMListPendingFriendRequest(hdr *f5.MsgHdr, msg *cs.CMListPendin
if profile == nil { if profile == nil {
continue continue
} }
/*
pendingUser := p.FillMFUser(profile) pendingUser := p.FillMFUser(profile)
rspMsg.Users = append(rspMsg.Users, pendingUser) rspMsg.Users = append(rspMsg.Users, pendingUser)
*/
} }
f5.GetSysLog().Info("CMListPendingFriendRequest count:%d\n", len(rspMsg.Users)) 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 { if !ok {
return return
} }
/*
for _, fid := range friendIds { for _, fid := range friendIds {
userProfile := GetCacheMgr().GetPlayerProfile(fid) userProfile := GetCacheMgr().GetPlayerProfile(fid)
rspUser := p.FillMFUser(userProfile) rspUser := p.FillMFUser(userProfile)
rspMsg.Users = append(rspMsg.Users, rspUser) rspMsg.Users = append(rspMsg.Users, rspUser)
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
*/
}) })
} }
@ -200,8 +205,10 @@ func (p *Player) CMBlacklist(hdr *f5.MsgHdr, msg *cs.CMBlacklist) {
if blockedPlayerProfile == nil { if blockedPlayerProfile == nil {
continue continue
} }
/*
user := p.FillMFUser(blockedPlayerProfile) user := p.FillMFUser(blockedPlayerProfile)
rspMsg.Users = append(rspMsg.Users, user) rspMsg.Users = append(rspMsg.Users, user)
*/
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
} }
@ -386,6 +393,7 @@ func IsValidChatChannel(chatChannel int32) bool {
// CMGuildInfo 公会信息 // CMGuildInfo 公会信息
func (p *Player) CMGuildInfo(hdr *f5.MsgHdr, msg *cs.CMGuildInfo) { func (p *Player) CMGuildInfo(hdr *f5.MsgHdr, msg *cs.CMGuildInfo) {
/*
var accountId = p.GetAccountId() var accountId = p.GetAccountId()
if len(msg.GetAccountId()) > 0 { if len(msg.GetAccountId()) > 0 {
accountId = msg.GetAccountId() accountId = msg.GetAccountId()
@ -396,13 +404,16 @@ func (p *Player) CMGuildInfo(hdr *f5.MsgHdr, msg *cs.CMGuildInfo) {
rspMsg.Guild = p.FillMFGuild(guild) rspMsg.Guild = p.FillMFGuild(guild)
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
*/
} }
// CMRecommendGuildList 推荐公会列表 // CMRecommendGuildList 推荐公会列表
func (p *Player) CMRecommendGuildList(hdr *f5.MsgHdr, msg *cs.CMRecommendGuildList) { func (p *Player) CMRecommendGuildList(hdr *f5.MsgHdr, msg *cs.CMRecommendGuildList) {
/*
rspMsg := new(cs.SMRecommendGuildList) rspMsg := new(cs.SMRecommendGuildList)
rspMsg.RecommendGuilds = p.FillMFGuilds(GetGuildMgr().RandomGuilds()) rspMsg.RecommendGuilds = p.FillMFGuilds(GetGuildMgr().RandomGuilds())
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
*/
} }
// CMGetTopGuildsByTotalStars 公会排行 总星星数排行 // CMGetTopGuildsByTotalStars 公会排行 总星星数排行
@ -432,6 +443,7 @@ func (p *Player) CMGetTopGuildsByTotalStars(hdr *f5.MsgHdr, msg *cs.CMGetTopGuil
// CMCreateGuild 创建公会 // CMCreateGuild 创建公会
func (p *Player) CMCreateGuild(hdr *f5.MsgHdr, msg *cs.CMCreateGuild) { func (p *Player) CMCreateGuild(hdr *f5.MsgHdr, msg *cs.CMCreateGuild) {
/*
avatar := msg.GetAvatar() avatar := msg.GetAvatar()
guildMgr.CreateGuild( guildMgr.CreateGuild(
p, avatar, msg.GetName(), p.accountId, p, avatar, msg.GetName(), p.accountId,
@ -445,10 +457,12 @@ func (p *Player) CMCreateGuild(hdr *f5.MsgHdr, msg *cs.CMCreateGuild) {
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
}) })
*/
} }
// CMApplyToGuild 申请者加入公会 // CMApplyToGuild 申请者加入公会
func (p *Player) CMApplyToGuild(hdr *f5.MsgHdr, msg *cs.CMApplyToGuild) { func (p *Player) CMApplyToGuild(hdr *f5.MsgHdr, msg *cs.CMApplyToGuild) {
/*
guildMgr.ApplyToGuild( guildMgr.ApplyToGuild(
msg.GetGuildId(), p.accountId, msg.GetGuildId(), p.accountId,
func(errCode int32, errMsg string, guild *Guild) { func(errCode int32, errMsg string, guild *Guild) {
@ -479,10 +493,12 @@ func (p *Player) CMApplyToGuild(hdr *f5.MsgHdr, msg *cs.CMApplyToGuild) {
} }
}, },
) )
*/
} }
// CMApplyList 请求申请者列表 // CMApplyList 请求申请者列表
func (p *Player) CMApplyList(hdr *f5.MsgHdr, msg *cs.CMApplyList) { func (p *Player) CMApplyList(hdr *f5.MsgHdr, msg *cs.CMApplyList) {
/*
rspMsg := new(cs.SMApplyList) rspMsg := new(cs.SMApplyList)
guild := guildMgr.GetGuildByAccountId(p.accountId) guild := guildMgr.GetGuildByAccountId(p.accountId)
if guild != nil { if guild != nil {
@ -501,10 +517,12 @@ func (p *Player) CMApplyList(hdr *f5.MsgHdr, msg *cs.CMApplyList) {
} }
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
*/
} }
// CMApprove 同意申请者加入公会 // CMApprove 同意申请者加入公会
func (p *Player) CMApprove(hdr *f5.MsgHdr, msg *cs.CMApprove) { func (p *Player) CMApprove(hdr *f5.MsgHdr, msg *cs.CMApprove) {
/*
guildMgr.Approve( guildMgr.Approve(
p.accountId, msg.GetApplicantAccountId(), p.accountId, msg.GetApplicantAccountId(),
func(errCode int32, errMsg string, guild *Guild) { func(errCode int32, errMsg string, guild *Guild) {
@ -535,10 +553,12 @@ func (p *Player) CMApprove(hdr *f5.MsgHdr, msg *cs.CMApprove) {
} }
}, },
) )
*/
} }
// CMReject 拒绝申请者加入公会 // CMReject 拒绝申请者加入公会
func (p *Player) CMReject(hdr *f5.MsgHdr, msg *cs.CMReject) { func (p *Player) CMReject(hdr *f5.MsgHdr, msg *cs.CMReject) {
/*
guildMgr.Reject( guildMgr.Reject(
p.accountId, msg.GetApplicantAccountId(), p.accountId, msg.GetApplicantAccountId(),
func(errCode int32, errMsg string) { func(errCode int32, errMsg string) {
@ -550,10 +570,12 @@ func (p *Player) CMReject(hdr *f5.MsgHdr, msg *cs.CMReject) {
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
}, },
) )
*/
} }
// CMLeaveGuild 离开公会 // CMLeaveGuild 离开公会
func (p *Player) CMLeaveGuild(hdr *f5.MsgHdr, msg *cs.CMLeaveGuild) { func (p *Player) CMLeaveGuild(hdr *f5.MsgHdr, msg *cs.CMLeaveGuild) {
/*
guildMgr.LeaveGuild( guildMgr.LeaveGuild(
p.accountId, p.accountId,
func(errCode int32, errMsg string, guild *Guild) { func(errCode int32, errMsg string, guild *Guild) {
@ -584,10 +606,12 @@ func (p *Player) CMLeaveGuild(hdr *f5.MsgHdr, msg *cs.CMLeaveGuild) {
} }
}, },
) )
*/
} }
// CMDismissMember 开除成员 // CMDismissMember 开除成员
func (p *Player) CMDismissMember(hdr *f5.MsgHdr, msg *cs.CMDismissMember) { func (p *Player) CMDismissMember(hdr *f5.MsgHdr, msg *cs.CMDismissMember) {
/*
guildMgr.DismissMember( guildMgr.DismissMember(
p.accountId, p.accountId,
msg.GetDismissAccountId(), msg.GetDismissAccountId(),
@ -623,10 +647,12 @@ func (p *Player) CMDismissMember(hdr *f5.MsgHdr, msg *cs.CMDismissMember) {
} }
}, },
) )
*/
} }
// CMSetMemberLevel 设置公会成员等级 // CMSetMemberLevel 设置公会成员等级
func (p *Player) CMSetMemberLevel(hdr *f5.MsgHdr, msg *cs.CMSetMemberLevel) { func (p *Player) CMSetMemberLevel(hdr *f5.MsgHdr, msg *cs.CMSetMemberLevel) {
/*
guildMgr.SetMemberLevel( guildMgr.SetMemberLevel(
p.accountId, p.accountId,
msg.GetMemberAccountId(), msg.GetMemberAccountId(),
@ -659,10 +685,12 @@ func (p *Player) CMSetMemberLevel(hdr *f5.MsgHdr, msg *cs.CMSetMemberLevel) {
} }
} }
}) })
*/
} }
// CMDisband 解散公会 // CMDisband 解散公会
func (p *Player) CMDisband(hdr *f5.MsgHdr, msg *cs.CMDisband) { func (p *Player) CMDisband(hdr *f5.MsgHdr, msg *cs.CMDisband) {
/*
guildMgr.Disband( guildMgr.Disband(
p.accountId, p.accountId,
func(errCode int32, errMsg string, guild *Guild) { func(errCode int32, errMsg string, guild *Guild) {
@ -673,10 +701,12 @@ func (p *Player) CMDisband(hdr *f5.MsgHdr, msg *cs.CMDisband) {
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
}) })
*/
} }
// CMSetNotice 设置公告 // CMSetNotice 设置公告
func (p *Player) CMSetNotice(hdr *f5.MsgHdr, msg *cs.CMSetNotice) { func (p *Player) CMSetNotice(hdr *f5.MsgHdr, msg *cs.CMSetNotice) {
/*
guildMgr.SetNotice( guildMgr.SetNotice(
p.accountId, p.accountId,
msg.GetContent(), msg.GetContent(),
@ -688,10 +718,12 @@ func (p *Player) CMSetNotice(hdr *f5.MsgHdr, msg *cs.CMSetNotice) {
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
}) })
*/
} }
// CMSetAvatar 设置头像 // CMSetAvatar 设置头像
func (p *Player) CMSetAvatar(hdr *f5.MsgHdr, msg *cs.CMSetAvatar) { func (p *Player) CMSetAvatar(hdr *f5.MsgHdr, msg *cs.CMSetAvatar) {
/*
guildMgr.SetAvatar( guildMgr.SetAvatar(
p.accountId, p.accountId,
msg.GetAvatar(), msg.GetAvatar(),
@ -703,10 +735,12 @@ func (p *Player) CMSetAvatar(hdr *f5.MsgHdr, msg *cs.CMSetAvatar) {
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
}) })
*/
} }
// CMSetName 设置公会名称 // CMSetName 设置公会名称
func (p *Player) CMSetName(hdr *f5.MsgHdr, msg *cs.CMSetName) { func (p *Player) CMSetName(hdr *f5.MsgHdr, msg *cs.CMSetName) {
/*
guildMgr.SetName( guildMgr.SetName(
p, p,
msg.GetName(), msg.GetName(),
@ -720,10 +754,12 @@ func (p *Player) CMSetName(hdr *f5.MsgHdr, msg *cs.CMSetName) {
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
}) })
*/
} }
// CMSetJoinCond 设置公会加入条件 // CMSetJoinCond 设置公会加入条件
func (p *Player) CMSetJoinCond(hdr *f5.MsgHdr, msg *cs.CMSetJoinCond) { func (p *Player) CMSetJoinCond(hdr *f5.MsgHdr, msg *cs.CMSetJoinCond) {
/*
guildMgr.SetJoinCond( guildMgr.SetJoinCond(
p.accountId, p.accountId,
msg.GetJoinCond(), msg.GetJoinCond(),
@ -736,11 +772,12 @@ func (p *Player) CMSetJoinCond(hdr *f5.MsgHdr, msg *cs.CMSetJoinCond) {
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
}) })
*/
} }
// CMGuildMembersList 公会成员列表 // CMGuildMembersList 公会成员列表
func (p *Player) CMGuildMembersList(hdr *f5.MsgHdr, msg *cs.CMGuildMembersList) { func (p *Player) CMGuildMembersList(hdr *f5.MsgHdr, msg *cs.CMGuildMembersList) {
rspMsg := new(cs.SMGuildMembersList) /*rspMsg := new(cs.SMGuildMembersList)
guild := guildMgr.GetGuildByAccountId(p.accountId) guild := guildMgr.GetGuildByAccountId(p.accountId)
if guild == nil { if guild == nil {
@ -757,10 +794,12 @@ func (p *Player) CMGuildMembersList(hdr *f5.MsgHdr, msg *cs.CMGuildMembersList)
} }
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
*/
} }
// CMSearchGuilds 搜索公会 // CMSearchGuilds 搜索公会
func (p *Player) CMSearchGuilds(hdr *f5.MsgHdr, msg *cs.CMSearchGuilds) { func (p *Player) CMSearchGuilds(hdr *f5.MsgHdr, msg *cs.CMSearchGuilds) {
/*
rspMsg := new(cs.SMSearchGuilds) rspMsg := new(cs.SMSearchGuilds)
for _, guild := range guildMgr.guilds { for _, guild := range guildMgr.guilds {
if guild.Name == msg.GetName() { 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)) f5.GetSysLog().Info("CMSearchGuilds name[%s], result:%d \n", msg.GetName(), len(rspMsg.Guilds))
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
*/
// Like search // Like search
//guildMgr.SearchGuild(sinceId, name, func(errCode int32, errMsg string, lastId int64, guildIds []int64) { //guildMgr.SearchGuild(sinceId, name, func(errCode int32, errMsg string, lastId int64, guildIds []int64) {
// rspMsg := new(cs.SMSearchGuilds) // rspMsg := new(cs.SMSearchGuilds)
@ -791,6 +831,7 @@ func (p *Player) CMSearchGuilds(hdr *f5.MsgHdr, msg *cs.CMSearchGuilds) {
// CMGuildLogs 请求公会日志 // CMGuildLogs 请求公会日志
func (p *Player) CMGuildLogs(hdr *f5.MsgHdr, msg *cs.CMGuildLogs) { func (p *Player) CMGuildLogs(hdr *f5.MsgHdr, msg *cs.CMGuildLogs) {
/*
rspMsg := new(cs.SMGuildLogs) rspMsg := new(cs.SMGuildLogs)
guild := guildMgr.GetGuildByAccountId(p.accountId) guild := guildMgr.GetGuildByAccountId(p.accountId)
if guild == nil { if guild == nil {
@ -807,8 +848,10 @@ func (p *Player) CMGuildLogs(hdr *f5.MsgHdr, msg *cs.CMGuildLogs) {
rspMsg.GuildLogs = append(rspMsg.GuildLogs, guildLog) rspMsg.GuildLogs = append(rspMsg.GuildLogs, guildLog)
} }
p.SendMsg(rspMsg) p.SendMsg(rspMsg)
*/
} }
/*
func (p *Player) FillMFGuildMember(member *GuildMember) *cs.MFGuildMember { func (p *Player) FillMFGuildMember(member *GuildMember) *cs.MFGuildMember {
profile := cacheMgr.GetPlayerProfile(member.AccountId) profile := cacheMgr.GetPlayerProfile(member.AccountId)
if profile == nil { if profile == nil {
@ -827,8 +870,11 @@ func (p *Player) FillMFGuildMember(member *GuildMember) *cs.MFGuildMember {
LastLoginTime: &profile.LastLoginTime, LastLoginTime: &profile.LastLoginTime,
} }
return guildMember return guildMember
return nil
} }
*/
/*
// FillMFGuild 填充公会 // FillMFGuild 填充公会
func (p *Player) FillMFGuild(guild *Guild) *cs.MFGuild { func (p *Player) FillMFGuild(guild *Guild) *cs.MFGuild {
// 总星星数 // 总星星数
@ -870,8 +916,10 @@ func (p *Player) FillMFGuild(guild *Guild) *cs.MFGuild {
} }
return resGuild return resGuild
} }
*/
// FillMFGuilds 填充公会列表 // FillMFGuilds 填充公会列表
/*
func (p *Player) FillMFGuilds(guilds []*Guild) []*cs.MFGuild { func (p *Player) FillMFGuilds(guilds []*Guild) []*cs.MFGuild {
var resGuilds []*cs.MFGuild var resGuilds []*cs.MFGuild
for _, g := range guilds { for _, g := range guilds {
@ -880,8 +928,10 @@ func (p *Player) FillMFGuilds(guilds []*Guild) []*cs.MFGuild {
} }
return resGuilds return resGuilds
} }
*/
// FillMFUser 填充好友信息 // FillMFUser 填充好友信息
/*
func (p *Player) FillMFUser(profile *PlayerProfile) *cs.MFUser { func (p *Player) FillMFUser(profile *PlayerProfile) *cs.MFUser {
var guildId int64 = 0 var guildId int64 = 0
var guildName = "" var guildName = ""
@ -905,9 +955,11 @@ func (p *Player) FillMFUser(profile *PlayerProfile) *cs.MFUser {
} }
return resUser return resUser
} }
*/
// FillMFChatUser 填充聊天信息 // FillMFChatUser 填充聊天信息
func (p *Player) FillMFChatUser() *cs.MFChatUser { func (p *Player) FillMFChatUser() *cs.MFChatUser {
/*
accountId := p.accountId accountId := p.accountId
profile := cacheMgr.GetPlayerProfile(accountId) profile := cacheMgr.GetPlayerProfile(accountId)
if profile == nil { if profile == nil {
@ -937,9 +989,13 @@ func (p *Player) FillMFChatUser() *cs.MFChatUser {
LastLoginTime: &profile.LastLoginTime, LastLoginTime: &profile.LastLoginTime,
} }
return res return res
*/
return nil
} }
/*
func (p *Player) IncrPrivateChatLastId() uint64 { func (p *Player) IncrPrivateChatLastId() uint64 {
p.privateChatLastId++ p.privateChatLastId++
return p.privateChatLastId return p.privateChatLastId
} }
*/

4
server/imserver_new/player/playermgr.go
View File

@ -129,6 +129,7 @@ func (this *PlayerMgr) CMLoginResult(hdr *f5.MsgHdr, msg *cs.CMLogin, rsp f5.Htt
// Add to online user // Add to online user
this.addPlayer(&player) this.addPlayer(&player)
this.addSocketHash(hdr.GetSocket(), &player) this.addSocketHash(hdr.GetSocket(), &player)
/*
// Add player profile // Add player profile
playerProfile := &PlayerProfile{ playerProfile := &PlayerProfile{
AccountId: accountId, AccountId: accountId,
@ -159,6 +160,7 @@ func (this *PlayerMgr) CMLoginResult(hdr *f5.MsgHdr, msg *cs.CMLogin, rsp f5.Htt
rspMsg.ServerInfo = serverInfo rspMsg.ServerInfo = serverInfo
rspMsg.AccountId = &resObj.Info.AccountID rspMsg.AccountId = &resObj.Info.AccountID
GetWspListener().SendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) GetWspListener().SendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg)
*/
} }
func (this *PlayerMgr) reportServerState(masterIp string, masterPort int32) { func (this *PlayerMgr) reportServerState(masterIp string, masterPort int32) {
@ -237,6 +239,7 @@ func (this *PlayerMgr) CMReconnect(hdr *f5.MsgHdr, msg *cs.CMReconnect) {
} }
// GetRemotePlayerInfo // GetRemotePlayerInfo
/*
func (this *PlayerMgr) GetRemotePlayerInfo(player *Player, cb func(errCode int32, errMsg string, p *PlayerProfile)) { func (this *PlayerMgr) GetRemotePlayerInfo(player *Player, cb func(errCode int32, errMsg string, p *PlayerProfile)) {
params := map[string]string{ params := map[string]string{
"c": "User", "c": "User",
@ -297,3 +300,4 @@ func (this *PlayerMgr) GetRemotePlayerInfo(player *Player, cb func(errCode int32
cb(resObj.ErrCode, resObj.ErrMsg, playerProfile) cb(resObj.ErrCode, resObj.ErrMsg, playerProfile)
}) })
} }
*/