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 2025-01-09 09:43:32 +08:00
parent d67df0a3cd 2820f26132
commit fb56a50a3b
1 changed files with 63 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
worldsrv/rankmatch.go
View File

@ -765,17 +765,14 @@ func (r *RankMatchMgr) RankAward() {
} }
rankId := int32(1) rankId := int32(1)
for k, player := range players { for k, player := range players {
localRankId := rankId
if player == nil { if player == nil {
logger.Logger.Errorf("RankMatchMgr OnDayTimer FindPlayerPermitList player is nil %v", list.List[k].SnId) logger.Logger.Errorf("RankMatchMgr OnDayTimer FindPlayerPermitList player is nil %v", list.List[k].SnId)
continue continue
} }
// 发邮件
var newMsg *model.Message
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
id := rankId
var items []int64 var items []int64
for _, award := range rankAward { for _, award := range rankAward {
if award.RankLevelId == rankId { if award.RankLevelId == localRankId {
for _, itemInfo := range award.Item { for _, itemInfo := range award.Item {
items = append(items, int64(itemInfo.ItemId)) items = append(items, int64(itemInfo.ItemId))
items = append(items, itemInfo.ItemNum) items = append(items, itemInfo.ItemNum)
@ -784,10 +781,13 @@ func (r *RankMatchMgr) RankAward() {
} }
} }
if len(items) == 0 { if len(items) == 0 {
return nil break
} }
// 发邮件
var newMsg *model.Message
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
title := i18n.Tr("languages", "PermitAwardTitle") title := i18n.Tr("languages", "PermitAwardTitle")
content := i18n.Tr("languages", "PermitAward", []int{int(id), int(id), int(id), int(id)}) content := i18n.Tr("languages", "PermitAward", []int{int(localRankId), int(localRankId), int(localRankId), int(localRankId)})
newMsg = model.NewMessage("", 0, "", player.SnId, model.MSGTYPE_RANK_REWARD, newMsg = model.NewMessage("", 0, "", player.SnId, model.MSGTYPE_RANK_REWARD,
title, content, 0, 0, model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", items, platform, model.HallTienlen, nil) title, content, 0, 0, model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", items, platform, model.HallTienlen, nil)
err := model.InsertMessage(platform, newMsg) err := model.InsertMessage(platform, newMsg)
@ -838,17 +838,14 @@ func (r *RankMatchMgr) RankAward() {
} }
rankId := int32(1) rankId := int32(1)
for k, player := range players { for k, player := range players {
localRankId := rankId
if player == nil { if player == nil {
logger.Logger.Errorf("RankMatchMgr OnDayTimer FindWinCoinListTienlen player is nil %v", ret.List[k].SnId) logger.Logger.Errorf("RankMatchMgr OnDayTimer FindWinCoinListTienlen player is nil %v", ret.List[k].SnId)
continue continue
} }
// 发邮件
var newMsg *model.Message
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
id := rankId
var items []int64 var items []int64
for _, award := range rankAward { for _, award := range rankAward {
if award.RankLevelId == id { if award.RankLevelId == localRankId {
for _, itemInfo := range award.Item { for _, itemInfo := range award.Item {
items = append(items, int64(itemInfo.ItemId)) items = append(items, int64(itemInfo.ItemId))
items = append(items, itemInfo.ItemNum) items = append(items, itemInfo.ItemNum)
@ -857,10 +854,13 @@ func (r *RankMatchMgr) RankAward() {
} }
} }
if len(items) == 0 { if len(items) == 0 {
return nil break
} }
// 发邮件
var newMsg *model.Message
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
title := i18n.Tr("languages", "PermitAwardTitle") title := i18n.Tr("languages", "PermitAwardTitle")
content := i18n.Tr("languages", "PermitAward", []int{int(id), int(id), int(id), int(id)}) content := i18n.Tr("languages", "PermitAward", []int{int(localRankId), int(localRankId), int(localRankId), int(localRankId)})
newMsg = model.NewMessage("", 0, "", player.SnId, model.MSGTYPE_RANK_REWARD, newMsg = model.NewMessage("", 0, "", player.SnId, model.MSGTYPE_RANK_REWARD,
title, content, 0, 0, model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", items, platform, model.HallTienlen, nil) title, content, 0, 0, model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", items, platform, model.HallTienlen, nil)
err := model.InsertMessage(platform, newMsg) err := model.InsertMessage(platform, newMsg)
@ -996,24 +996,28 @@ func (r *RankMatchMgr) NianRankAward() {
} }
rankId := int32(1) rankId := int32(1)
for k, player := range players { for k, player := range players {
localRankId := rankId
if player == nil { if player == nil {
logger.Logger.Errorf("RankMatchMgr OnDayTimer FindLuckNianRankList player is nil %v", list.List[k].SnId) logger.Logger.Errorf("RankMatchMgr OnDayTimer FindLuckNianRankList player is nil %v", list.List[k].SnId)
continue continue
} }
var items []int64
for _, award := range rankAward {
if award.RankId == localRankId {
for _, itemInfo := range award.Award {
items = append(items, int64(itemInfo.ItemId))
items = append(items, itemInfo.ItemNum)
}
}
}
if len(items) == 0 {
break
}
// 发邮件 // 发邮件
var newMsg *model.Message var newMsg *model.Message
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} { task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
id := rankId
var items []int64
for _, award := range rankAward[id].Award {
items = append(items, int64(award.ItemId))
items = append(items, award.ItemNum)
}
if len(items) == 0 {
return nil
}
title := i18n.Tr("languages", "NianLuckTitle") title := i18n.Tr("languages", "NianLuckTitle")
content := i18n.Tr("languages", "NianLuckAward", []int{int(id), int(id), int(id), int(id)}) content := i18n.Tr("languages", "NianLuckAward", []int{int(localRankId), int(localRankId), int(localRankId), int(localRankId)})
newMsg = model.NewMessage("", 0, "", player.SnId, model.MSGTYPE_RANK_REWARD, newMsg = model.NewMessage("", 0, "", player.SnId, model.MSGTYPE_RANK_REWARD,
title, content, 0, 0, model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", items, platform, model.HallTienlen, nil) title, content, 0, 0, model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", items, platform, model.HallTienlen, nil)
err := model.InsertMessage(platform, newMsg) err := model.InsertMessage(platform, newMsg)
@ -1030,16 +1034,15 @@ func (r *RankMatchMgr) NianRankAward() {
})).Start() })).Start()
//记录log //记录log
rankData := &model.NianPlayerRankData{ rankData := &model.NianPlayerRankData{
RankId: rankId, RankId: localRankId,
Snid: player.SnId, Snid: player.SnId,
Score: list.List[rankId-1].Luck, Score: list.List[localRankId-1].Luck,
} }
log.RankData = append(log.RankData, rankData) log.RankData = append(log.RankData, rankData)
rankId += 1 rankId += 1
logger.Logger.Infof("年兽幸运榜发奖 snid:%v rankData:%v", player.SnId, rankData) logger.Logger.Infof("发奖 snid:%v rankId:%v", player.SnId, localRankId)
} }
mq.Write(log) mq.Write(log)
logger.Logger.Infof("年兽幸运榜发奖 log:%v", log)
//清除幸运榜数值 //清除幸运榜数值
err := model.ClearNianRank(&model.FindNianListArgs{ err := model.ClearNianRank(&model.FindNianListArgs{
Platform: platform, Platform: platform,
@ -1083,24 +1086,28 @@ func (r *RankMatchMgr) NianRankAward() {
} }
rankId := int32(1) rankId := int32(1)
for k, player := range players { for k, player := range players {
localRankId := rankId // 将 rankId 复制到局部变量
if player == nil { if player == nil {
logger.Logger.Errorf("RankMatchMgr OnDayTimer FindLuckNianRankList player is nil %v", list.List[k].SnId) logger.Logger.Errorf("RankMatchMgr OnDayTimer FindLuckNianRankList player is nil %v", list.List[k].SnId)
continue continue
} }
var items []int64
for _, award := range rankAward {
if award.RankId == localRankId {
for _, itemInfo := range award.Award {
items = append(items, int64(itemInfo.ItemId))
items = append(items, itemInfo.ItemNum)
}
}
}
if len(items) == 0 {
break
}
// 发邮件 // 发邮件
var newMsg *model.Message var newMsg *model.Message
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} { task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
id := rankId
var items []int64
for _, award := range rankAward[id].Award {
items = append(items, int64(award.ItemId))
items = append(items, award.ItemNum)
}
if len(items) == 0 {
return nil
}
title := i18n.Tr("languages", "NianDamageTitle") title := i18n.Tr("languages", "NianDamageTitle")
content := i18n.Tr("languages", "NianDamageAward", []int{int(id), int(id), int(id), int(id)}) content := i18n.Tr("languages", "NianDamageAward", []int{int(localRankId), int(localRankId), int(localRankId), int(localRankId)})
newMsg = model.NewMessage("", 0, "", player.SnId, model.MSGTYPE_RANK_REWARD, newMsg = model.NewMessage("", 0, "", player.SnId, model.MSGTYPE_RANK_REWARD,
title, content, 0, 0, model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", items, platform, model.HallTienlen, nil) title, content, 0, 0, model.MSGSTATE_UNREAD, time.Now().Unix(), 0, "", items, platform, model.HallTienlen, nil)
err := model.InsertMessage(platform, newMsg) err := model.InsertMessage(platform, newMsg)
@ -1116,15 +1123,14 @@ func (r *RankMatchMgr) NianRankAward() {
} }
})).Start() })).Start()
rankData := &model.NianPlayerRankData{ rankData := &model.NianPlayerRankData{
RankId: rankId, RankId: localRankId,
Snid: player.SnId, Snid: player.SnId,
Score: list.List[rankId-1].Damage, Score: list.List[localRankId-1].Damage,
} }
log.RankData = append(log.RankData, rankData) log.RankData = append(log.RankData, rankData)
rankId += 1 rankId += 1
} }
mq.Write(log) mq.Write(log)
logger.Logger.Infof("年兽伤害榜发奖 log:%v", log)
//删除数据库数据 //删除数据库数据
err := model.DelNianRank(&model.FindNianListArgs{ err := model.DelNianRank(&model.FindNianListArgs{
Platform: platform, Platform: platform,