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-08 15:09:34 +08:00
parent a92a04a81d 62f27c4723
commit 1d52b88bdd
1 changed files with 56 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
worldsrv/rankmatch.go
View File

@ -769,6 +769,10 @@ func (r *RankMatchMgr) RankAward() {
logger.Logger.Errorf("RankMatchMgr OnDayTimer FindPlayerPermitList player is nil %v", list.List[k].SnId)
continue
}
// 发邮件
var newMsg *model.Message
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
id := rankId
var items []int64
for _, award := range rankAward {
if award.RankLevelId == rankId {
@ -780,13 +784,10 @@ func (r *RankMatchMgr) RankAward() {
}
}
if len(items) == 0 {
break
return nil
}
// 发邮件
var newMsg *model.Message
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
title := i18n.Tr("languages", "PermitAwardTitle")
content := i18n.Tr("languages", "PermitAward", []int{int(rankId), int(rankId), int(rankId), int(rankId)})
content := i18n.Tr("languages", "PermitAward", []int{int(id), int(id), int(id), int(id)})
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)
err := model.InsertMessage(platform, newMsg)
@ -841,9 +842,13 @@ func (r *RankMatchMgr) RankAward() {
logger.Logger.Errorf("RankMatchMgr OnDayTimer FindWinCoinListTienlen player is nil %v", ret.List[k].SnId)
continue
}
// 发邮件
var newMsg *model.Message
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
id := rankId
var items []int64
for _, award := range rankAward {
if award.RankLevelId == rankId {
if award.RankLevelId == id {
for _, itemInfo := range award.Item {
items = append(items, int64(itemInfo.ItemId))
items = append(items, itemInfo.ItemNum)
@ -852,13 +857,10 @@ func (r *RankMatchMgr) RankAward() {
}
}
if len(items) == 0 {
break
return nil
}
// 发邮件
var newMsg *model.Message
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
title := i18n.Tr("languages", "PermitAwardTitle")
content := i18n.Tr("languages", "PermitAward", []int{int(rankId), int(rankId), int(rankId), int(rankId)})
content := i18n.Tr("languages", "PermitAward", []int{int(id), int(id), int(id), int(id)})
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)
err := model.InsertMessage(platform, newMsg)
@ -998,21 +1000,22 @@ func (r *RankMatchMgr) NianRankAward() {
logger.Logger.Errorf("RankMatchMgr OnDayTimer FindLuckNianRankList player is nil %v", list.List[k].SnId)
continue
}
// 发邮件
var newMsg *model.Message
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
id := rankId
var items []int64
for _, award := range rankAward[rankId].Award {
for _, award := range rankAward[id].Award {
items = append(items, int64(award.ItemId))
items = append(items, award.ItemNum)
}
if len(items) == 0 {
break
return nil
}
// 发邮件
var newMsg *model.Message
title := i18n.Tr("languages", "NianLuckTitle")
content := i18n.Tr("languages", "NianLuckAward", []int{int(rankId), int(rankId), int(rankId), int(rankId)})
content := i18n.Tr("languages", "NianLuckAward", []int{int(id), int(id), int(id), int(id)})
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)
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
err := model.InsertMessage(platform, newMsg)
if err != nil {
logger.Logger.Errorf("发送邮件失败 snid:%v err:%v", player.SnId, err)
@ -1084,21 +1087,22 @@ func (r *RankMatchMgr) NianRankAward() {
logger.Logger.Errorf("RankMatchMgr OnDayTimer FindLuckNianRankList player is nil %v", list.List[k].SnId)
continue
}
// 发邮件
var newMsg *model.Message
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
id := rankId
var items []int64
for _, award := range rankAward[rankId].Award {
for _, award := range rankAward[id].Award {
items = append(items, int64(award.ItemId))
items = append(items, award.ItemNum)
}
if len(items) == 0 {
break
return nil
}
// 发邮件
var newMsg *model.Message
title := i18n.Tr("languages", "NianDamageTitle")
content := i18n.Tr("languages", "NianDamageAward", []int{int(rankId), int(rankId), int(rankId), int(rankId)})
content := i18n.Tr("languages", "NianDamageAward", []int{int(id), int(id), int(id), int(id)})
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)
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
err := model.InsertMessage(platform, newMsg)
if err != nil {
logger.Logger.Errorf("发送邮件失败 snid:%v err:%v", player.SnId, err)