From 538b94401b3bd07c6f9f4d2f91d2fdf1dc88c1d8 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 20 Mar 2024 19:56:19 +0800 Subject: [PATCH] 1 --- server/imserver_new/common/types.go | 1 + server/imserver_new/player/player.go | 5 +++-- server/matchserver/team/team.go | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/imserver_new/common/types.go b/server/imserver_new/common/types.go index 8d46c494..a232261c 100644 --- a/server/imserver_new/common/types.go +++ b/server/imserver_new/common/types.go @@ -94,6 +94,7 @@ type GuildMember interface { type GuildMgr interface { GetGuildByAccountId(string) Guild GetGuildIdByAccountId(string) int64 + RandomGuilds() []*Guild } type CacheMgr interface { diff --git a/server/imserver_new/player/player.go b/server/imserver_new/player/player.go index 99f1e97e..2cd7a4b4 100644 --- a/server/imserver_new/player/player.go +++ b/server/imserver_new/player/player.go @@ -411,10 +411,11 @@ func (p *Player) CMGetTopGuildsByTotalStars(hdr *f5.MsgHdr, msg *cs.CMGetTopGuil guildsNum := int(msg.GetGuildsNum()) var allMFGuilds []*cs.MFGuild - for _, g := range guildMgr.guilds { + /* + for _, g := range GetGuildMgr().guilds { guild := p.FillMFGuild(g) allMFGuilds = append(allMFGuilds, guild) - } + }*/ sort.Slice(allMFGuilds, func(i, j int) bool { return allMFGuilds[i].GetTotalStars() > allMFGuilds[j].GetTotalStars() diff --git a/server/matchserver/team/team.go b/server/matchserver/team/team.go index 78f636d6..326db209 100644 --- a/server/matchserver/team/team.go +++ b/server/matchserver/team/team.go @@ -172,6 +172,7 @@ func (this *team) StartGame() { if !this.IsLock() && this.CanStartGame(this.owner) { if this.IsMobaMode() { this.state = constant.TEAM_STATE_MATCHING + this.stateNotifyMsg.State = proto.Int32(this.state) _matchMgr.addMatch(this) this.SendStateNotify() } else {