From 497efd6e2d1493c9f6ae7d308c269d2cc62b9355 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Wed, 14 Jan 2026 10:09:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=9B=9E=E6=94=B6=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/activity_func.go | 27 +++++++++++++++++++++------
 src/server/test/config_test.go   |  2 +-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go
index 78937420..28360eeb 100644
--- a/src/server/game/activity_func.go
+++ b/src/server/game/activity_func.go
@@ -1,12 +1,11 @@
 package game
 
 import (
+	"fmt"
 	activityCfg "server/conf/activity"
 	catnipCfg "server/conf/catnip"
 	guesscolorCfg "server/conf/guess_color"
-	itemCfg "server/conf/item"
 	languageCfg "server/conf/language"
-	mailCfg "server/conf/mail"
 	miningCfg "server/conf/mining"
 	passCfg "server/conf/pass"
 	raceCfg "server/conf/race"
@@ -92,12 +91,28 @@ func (p *Player) ActivityLogin() {
 // 发送活动邮件
 func (p *Player) SendActivityMail(ItemId, ItemNum, ActivityId int, RewardItems []*item.Item) {
 	MailMod := p.PlayMod.getMailMod()
-	ItemName, ItemNameEn := itemCfg.GetItemName(ItemId)
-	ActivityTitle, ActivityTitleEn := activityCfg.GetActivityTitle(ActivityId)
-	mt, mc, mt_en, mc_en := mailCfg.GetRecallMail(ActivityTitle, ActivityTitleEn, ItemName, ItemNameEn)
+	activity_title_key, mail_title_key, mail_content_key := activityCfg.GetActivityRecycleMail(ActivityId)
+	activity_title_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, activity_title_key)
+	activity_title_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, activity_title_key)
+	activity_title_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, activity_title_key)
+	mt_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mail_title_key)
+	mc_zh := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, mail_content_key)
+	mt_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, mail_title_key)
+	mc_en := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, mail_content_key)
+	mt_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, activity_title_key)
+	mc_pt := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, mail_content_key)
 	Items := []*item.Item{item.NewItem(ItemId, ItemNum)}
 	Items = append(Items, RewardItems...)
-	MailMod.Send(mt, "", mc, mt_en, "", mc_en, Items, mail.MAIL_TYPE_NORMAL)
+	MailMod.SendMail(&mail.MailStruct{
+		Title:       fmt.Sprintf(mt_zh, activity_title_zh),
+		Content:     fmt.Sprintf(mc_zh, activity_title_zh),
+		TitleEn:     fmt.Sprintf(mt_en, activity_title_en),
+		ContentEn:   fmt.Sprintf(mc_en, activity_title_en),
+		TitlePtBr:   fmt.Sprintf(mt_pt, activity_title_pt),
+		ContentPtBr: fmt.Sprintf(mc_pt, activity_title_pt),
+		Items:       Items,
+		Type:        mail.MAIL_TYPE_NORMAL,
+	})
 }
 
 // 活动模块 零点更新
diff --git a/src/server/test/config_test.go b/src/server/test/config_test.go
index 6b03f3e5..d789ebd0 100644
--- a/src/server/test/config_test.go
+++ b/src/server/test/config_test.go
@@ -15,7 +15,7 @@ func Test(t *testing.T) {
 }
 
 func TestGetActivityRecycleMail(t *testing.T) {
-	title, mailTitle, mailContent := activityCfg.GetActivityRecycleMail(1)
+	title, mailTitle, mailContent := activityCfg.GetActivityRecycleMail(7)
 	fmt.Println("title:", title)
 	fmt.Println("mailTitle:", mailTitle)
 	fmt.Println("mailContent:", mailContent)