diff --git a/worldsrv/rankmatch.go b/worldsrv/rankmatch.go index e0633f8..d968da3 100644 --- a/worldsrv/rankmatch.go +++ b/worldsrv/rankmatch.go @@ -769,24 +769,25 @@ func (r *RankMatchMgr) RankAward() { logger.Logger.Errorf("RankMatchMgr OnDayTimer FindPlayerPermitList player is nil %v", list.List[k].SnId) continue } - var items []int64 - for _, award := range rankAward { - if award.RankLevelId == rankId { - for _, itemInfo := range award.Item { - items = append(items, int64(itemInfo.ItemId)) - items = append(items, itemInfo.ItemNum) - } - break - } - } - if len(items) == 0 { - break - } // 发邮件 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 { + for _, itemInfo := range award.Item { + items = append(items, int64(itemInfo.ItemId)) + items = append(items, itemInfo.ItemNum) + } + break + } + } + if len(items) == 0 { + return nil + } 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,24 +842,25 @@ func (r *RankMatchMgr) RankAward() { logger.Logger.Errorf("RankMatchMgr OnDayTimer FindWinCoinListTienlen player is nil %v", ret.List[k].SnId) continue } - var items []int64 - for _, award := range rankAward { - if award.RankLevelId == rankId { - for _, itemInfo := range award.Item { - items = append(items, int64(itemInfo.ItemId)) - items = append(items, itemInfo.ItemNum) - } - break - } - } - if len(items) == 0 { - break - } // 发邮件 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 == id { + for _, itemInfo := range award.Item { + items = append(items, int64(itemInfo.ItemId)) + items = append(items, itemInfo.ItemNum) + } + break + } + } + if len(items) == 0 { + return nil + } 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 items []int64 - for _, award := range rankAward[rankId].Award { - items = append(items, int64(award.ItemId)) - items = append(items, award.ItemNum) - } - if len(items) == 0 { - break - } // 发邮件 var newMsg *model.Message - title := i18n.Tr("languages", "NianLuckTitle") - content := i18n.Tr("languages", "NianLuckAward", []int{int(rankId), int(rankId), int(rankId), int(rankId)}) - 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{} { + 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") + 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) 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 items []int64 - for _, award := range rankAward[rankId].Award { - items = append(items, int64(award.ItemId)) - items = append(items, award.ItemNum) - } - if len(items) == 0 { - break - } // 发邮件 var newMsg *model.Message - title := i18n.Tr("languages", "NianDamageTitle") - content := i18n.Tr("languages", "NianDamageAward", []int{int(rankId), int(rankId), int(rankId), int(rankId)}) - 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{} { + 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") + 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) err := model.InsertMessage(platform, newMsg) if err != nil { logger.Logger.Errorf("发送邮件失败 snid:%v err:%v", player.SnId, err)