1

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 {

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()

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 {