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

Compare commits

base: tl_server_2:62f27c4723b4da7fd28336f3519d51852538cb7a
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
..
compare: tl_server_2:ac0daa39a4cb13d66979bf62a47c55b5a7616c3e
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

No commits in common. "62f27c4723b4da7fd28336f3519d51852538cb7a" and "ac0daa39a4cb13d66979bf62a47c55b5a7616c3e" have entirely different histories.
62f27c4723 ... ac0daa39a4

1 changed files with 52 additions and 56 deletions
Show Stats Expand all files Collapse all files

50
worldsrv/rankmatch.go
View File

@ -769,10 +769,6 @@ func (r *RankMatchMgr) RankAward() {
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 == rankId {
@ -784,10 +780,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(rankId), int(rankId), int(rankId), int(rankId)})
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)
@ -842,13 +841,9 @@ func (r *RankMatchMgr) RankAward() {
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 == rankId {
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 +852,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(rankId), int(rankId), int(rankId), int(rankId)})
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)
@ -1000,22 +998,21 @@ func (r *RankMatchMgr) NianRankAward() {
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 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[id].Award { for _, award := range rankAward[rankId].Award {
items = append(items, int64(award.ItemId)) items = append(items, int64(award.ItemId))
items = append(items, award.ItemNum) items = append(items, award.ItemNum)
} }
if len(items) == 0 { if len(items) == 0 {
return nil break
} }
// 发邮件
var newMsg *model.Message
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(rankId), int(rankId), int(rankId), int(rankId)})
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)
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
err := model.InsertMessage(platform, newMsg) err := model.InsertMessage(platform, newMsg)
if err != nil { if err != nil {
logger.Logger.Errorf("发送邮件失败 snid:%v err:%v", player.SnId, err) logger.Logger.Errorf("发送邮件失败 snid:%v err:%v", player.SnId, err)
@ -1087,22 +1084,21 @@ func (r *RankMatchMgr) NianRankAward() {
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 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[id].Award { for _, award := range rankAward[rankId].Award {
items = append(items, int64(award.ItemId)) items = append(items, int64(award.ItemId))
items = append(items, award.ItemNum) items = append(items, award.ItemNum)
} }
if len(items) == 0 { if len(items) == 0 {
return nil break
} }
// 发邮件
var newMsg *model.Message
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(rankId), int(rankId), int(rankId), int(rankId)})
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)
task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
err := model.InsertMessage(platform, newMsg) err := model.InsertMessage(platform, newMsg)
if err != nil { if err != nil {
logger.Logger.Errorf("发送邮件失败 snid:%v err:%v", player.SnId, err) logger.Logger.Errorf("发送邮件失败 snid:%v err:%v", player.SnId, err)