tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

This commit is contained in:
sk 2024-07-04 11:12:23 +08:00
parent 938aa9d1dd b28218b753
commit 9379613ae8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
worldsrv/tournament.go
View File

@ -1158,7 +1158,7 @@ func (this *Tournament) sendPromotionInfo(mc *PlayerMatchContext, sortId int64,
if this.MatchAwardNum[mc.p.Platform] == nil { if this.MatchAwardNum[mc.p.Platform] == nil {
this.MatchAwardNum[mc.p.Platform] = make(map[int32]int32) this.MatchAwardNum[mc.p.Platform] = make(map[int32]int32)
} }
this.MatchAwardNum[mc.p.Platform][mc.tm.gmd.GameFreeId] += 1 this.MatchAwardNum[mc.p.Platform][mc.tm.gmd.Id] += 1
} }
} }
} }
@ -1394,7 +1394,7 @@ func (this *Tournament) GetSCTMInfosPack(platform, channelName string) *tourname
if matchInfo != nil { if matchInfo != nil {
for id, info := range matchInfo { for id, info := range matchInfo {
if info.MatchSwitch == 1 && !this.IsOutTime(info) && common.InMatchChannel(info.OnChannelName, channelName) { if info.MatchSwitch == 1 && !this.IsOutTime(info) && common.InMatchChannel(info.OnChannelName, channelName) {
awardNum := this.GetMatchAwardNum(platform, info.GameFreeId) awardNum := this.GetMatchAwardNum(platform, info.Id)
tMInfo := &tournament.TMInfo{ tMInfo := &tournament.TMInfo{
Id: proto.Int32(id), Id: proto.Int32(id),
GameFreeId: info.GameFreeId, GameFreeId: info.GameFreeId,
@ -1714,15 +1714,15 @@ func (this *Tournament) OnHourTimer() {
} }
} }
func (this *Tournament) GetMatchAwardNum(platform string, gameFreeId int32) int32 { func (this *Tournament) GetMatchAwardNum(platform string, id int32) int32 {
var num int32 var num int32
if this.MatchAwardNum != nil && this.MatchAwardNum[platform] != nil { if this.MatchAwardNum != nil && this.MatchAwardNum[platform] != nil {
num = this.MatchAwardNum[platform][gameFreeId] num = this.MatchAwardNum[platform][id]
} }
matchInfo := this.GetAllMatchInfo(platform) matchInfo := this.GetAllMatchInfo(platform)
if matchInfo != nil { if matchInfo != nil {
for _, info := range matchInfo { for _, info := range matchInfo {
if info.GameFreeId == gameFreeId { if info.Id == id {
if info.AwardNum == -1 { if info.AwardNum == -1 {
return -1 return -1
} else { } else {