From d494205ede8f164fa5a12bdcba873a7e31c6b23c Mon Sep 17 00:00:00 2001
From: by <123456@qq.com>
Date: Wed, 8 Jan 2025 11:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=85=BD=E6=8E=92=E8=A1=8C=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worldsrv/rankmatch.go | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/worldsrv/rankmatch.go b/worldsrv/rankmatch.go
index 7357426..e0633f8 100644
--- a/worldsrv/rankmatch.go
+++ b/worldsrv/rankmatch.go
@@ -1008,11 +1008,11 @@ func (r *RankMatchMgr) NianRankAward() {
 						}
 						// 发邮件
 						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{} {
-							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)
 							err := model.InsertMessage(platform, newMsg)
 							if err != nil {
 								logger.Logger.Errorf("发送邮件失败 snid:%v err:%v", player.SnId, err)
@@ -1033,8 +1033,10 @@ func (r *RankMatchMgr) NianRankAward() {
 						}
 						log.RankData = append(log.RankData, rankData)
 						rankId += 1
+						logger.Logger.Infof("年兽幸运榜发奖 snid:%v rankData:%v", player.SnId, rankData)
 					}
 					mq.Write(log)
+					logger.Logger.Infof("年兽幸运榜发奖 log:%v", log)
 					//清除幸运榜数值
 					err := model.ClearNianRank(&model.FindNianListArgs{
 						Platform: platform,
@@ -1092,11 +1094,11 @@ func (r *RankMatchMgr) NianRankAward() {
 						}
 						// 发邮件
 						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{} {
-							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)
 							err := model.InsertMessage(platform, newMsg)
 							if err != nil {
 								logger.Logger.Errorf("发送邮件失败 snid:%v err:%v", player.SnId, err)
@@ -1118,6 +1120,7 @@ func (r *RankMatchMgr) NianRankAward() {
 						rankId += 1
 					}
 					mq.Write(log)
+					logger.Logger.Infof("年兽伤害榜发奖 log:%v", log)
 					//删除数据库数据
 					err := model.DelNianRank(&model.FindNianListArgs{
 						Platform: platform,