From 7b9bf73b1a910dbfa1af2348dc69fb0cbb576007 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Fri, 30 May 2025 18:58:13 +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/conf/mail/mailCfg.go | 2 ++
 src/server/game/Trigger.go      | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/server/conf/mail/mailCfg.go b/src/server/conf/mail/mailCfg.go
index c2e3294a..73a11f6c 100644
--- a/src/server/conf/mail/mailCfg.go
+++ b/src/server/conf/mail/mailCfg.go
@@ -28,6 +28,7 @@ type TriggerMail struct {
 	SubTitleEn     string
 	EnglistContent string
 	Items          []*item.Item
+	Type           int
 	Trigger        []string
 }
 
@@ -66,6 +67,7 @@ func GetTriggerMail() []*TriggerMail {
 			EnglistTitle:   gamedata.GetStringValue(v, "EnglistTitle"),
 			EnglistContent: gamedata.GetStringValue(v, "EnglistContent"),
 			Items:          gamedata.GetItemList(v, "Items"),
+			Type:           gamedata.GetIntValue(v, "Type"),
 			Trigger:        strings.Split(T, "|"),
 		}
 		ret = append(ret, data)
diff --git a/src/server/game/Trigger.go b/src/server/game/Trigger.go
index 24d4682f..57cdc93d 100644
--- a/src/server/game/Trigger.go
+++ b/src/server/game/Trigger.go
@@ -13,7 +13,6 @@ import (
 	"server/db"
 	"server/game/mod/chess"
 	"server/game/mod/item"
-	"server/game/mod/mail"
 	"server/game/mod/order"
 	"server/game/mod/quest"
 	"server/msg"
@@ -51,7 +50,7 @@ func (player *Player) MailTrigger(Tr *quest.Trigger) bool {
 			Content := languageCfg.GetLanguage(BaseMod.Lang, v.Content)
 			TitleEn := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, v.Title)
 			ContentEn := languageCfg.GetLanguage(msg.LANG_TYPE_LANG_EN, v.Content)
-			MailMod.Send(Title, "", Content, TitleEn, "", ContentEn, v.Items, mail.MAIL_TYPE_NORMAL)
+			MailMod.Send(Title, "", Content, TitleEn, "", ContentEn, v.Items, v.Type)
 			MailMod.AddTriggerMail(v.Id)
 			tr = true
 		}