From f3a764e2dcb7b4164eb16ddb38ad0634fbaf2ba4 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 12 Feb 2026 10:33:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=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 | 37 ++++++++++++++++++++------------ src/server/game/trigger_func.go | 28 +++++++++++++----------- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/server/game/activity_func.go b/src/server/game/activity_func.go index bfe66951..938d12ea 100644 --- a/src/server/game/activity_func.go +++ b/src/server/game/activity_func.go @@ -64,12 +64,16 @@ func (p *Player) ActivityLogin() { // 清空猫草大作战数据无需发邮件 MailMod := p.PlayMod.getMailMod() MailMod.SendMail(&mail.MailStruct{ - Title: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, "backend_gardenend_mail_title"), - TitleEn: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, "backend_gardenend_mail_title"), - Content: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, "backend_gardenend_mail_content"), - ContentEn: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, "backend_gardenend_mail_content"), - Items: CatnipUnReward, - Type: mail.MAIL_TYPE_NORMAL, + Title: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, "backend_gardenend_mail_title"), + TitleEn: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, "backend_gardenend_mail_title"), + Content: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_CN, "backend_gardenend_mail_content"), + ContentEn: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, "backend_gardenend_mail_content"), + TitlePtBr: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, "backend_gardenend_mail_title"), + ContentPtBr: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, "backend_gardenend_mail_content"), + TitleEsLatam: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, "backend_gardenend_mail_title"), + ContentEsLatam: languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, "backend_gardenend_mail_content"), + Items: CatnipUnReward, + Type: mail.MAIL_TYPE_NORMAL, }) } @@ -95,23 +99,28 @@ func (p *Player) SendActivityMail(ItemId, ItemNum, ActivityId int, RewardItems [ 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) + activity_title_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, 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) + mt_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, activity_title_key) + mc_es := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, mail_content_key) Items := []*item.Item{item.NewItem(ItemId, ItemNum)} Items = append(Items, RewardItems...) 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, + 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), + TitleEsLatam: fmt.Sprintf(mt_es, activity_title_es), + ContentEsLatam: fmt.Sprintf(mc_es, activity_title_es), + Items: Items, + Type: mail.MAIL_TYPE_NORMAL, }) } diff --git a/src/server/game/trigger_func.go b/src/server/game/trigger_func.go index 374340ae..cf99935e 100644 --- a/src/server/game/trigger_func.go +++ b/src/server/game/trigger_func.go @@ -52,19 +52,23 @@ func (player *Player) MailTrigger(Tr *quest.Trigger) bool { ContentEn := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, v.Content) TitlePtBr := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, v.Title) ContentPtBr := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_PTBR, v.Content) - + TitleEsLatam := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, v.Title) + ContentEsLatam := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_ES_LATAM, v.Content) MailMod.SendMail(&mail.MailStruct{ - Title: Title, - SubTitle: "", - Content: Content, - TitleEn: TitleEn, - SubTitleEn: "", - ContentEn: ContentEn, - TitlePtBr: TitlePtBr, - SubTitlePtBr: "", - ContentPtBr: ContentPtBr, - Items: v.Items, - Type: v.Type, + Title: Title, + SubTitle: "", + Content: Content, + TitleEn: TitleEn, + SubTitleEn: "", + ContentEn: ContentEn, + TitlePtBr: TitlePtBr, + SubTitlePtBr: "", + ContentPtBr: ContentPtBr, + TitleEsLatam: TitleEsLatam, + SubTitleEsLatam: "", + ContentEsLatam: ContentEsLatam, + Items: v.Items, + Type: v.Type, }) MailMod.AddTriggerMail(v.Id) tr = true