From 4e8da1047fb5523b6230e170451be88274d650b0 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 12 Feb 2026 14:17:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mail_mgr.go | 60 ++++++++++++++++-------------- src/server/game/message_handler.go | 18 +++++---- 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/src/server/game/mail_mgr.go b/src/server/game/mail_mgr.go index 9351876d..d2c62bb1 100644 --- a/src/server/game/mail_mgr.go +++ b/src/server/game/mail_mgr.go @@ -25,20 +25,22 @@ type MailData struct { } type ServerMail struct { - Id int - Title string - Content string - TitleEn string - ContentEn string - TitlePtBr string - ContentPtBr string - Items []*item.Item - Start_time int64 - Register_time int64 - End_time int64 - Send_type int - Mail_type int - To_uids []int + Id int + Title string + Content string + TitleEn string + ContentEn string + TitlePtBr string + ContentPtBr string + TitleEsLatam string + ContentEsLatam string + Items []*item.Item + Start_time int64 + Register_time int64 + End_time int64 + Send_type int + Mail_type int + To_uids []int } func (m *MailMgr) Init() { @@ -77,20 +79,22 @@ func (r *MailMgr) LoadMail(msg *msg.Msg) (interface{}, error) { var items []interface{} json.Unmarshal([]byte(v.Items), &items) r.list[v.Id] = &ServerMail{ - Id: v.Id, - Title: v.Title, - Content: v.Content, - TitleEn: v.TitleEn, - ContentEn: v.ContentEn, - TitlePtBr: v.TitlePtBr, - ContentPtBr: v.ContentPtBr, - Items: item.ParseItem(items), - Start_time: v.Start_time, - Register_time: v.Register_time, - End_time: v.End_time, - Mail_type: v.Mail_type, - Send_type: v.Send_type, - To_uids: Uids, + Id: v.Id, + Title: v.Title, + Content: v.Content, + TitleEn: v.TitleEn, + ContentEn: v.ContentEn, + TitlePtBr: v.TitlePtBr, + ContentPtBr: v.ContentPtBr, + TitleEsLatam: v.TitleEsLatam, + ContentEsLatam: v.ContentEsLatam, + Items: item.ParseItem(items), + Start_time: v.Start_time, + Register_time: v.Register_time, + End_time: v.End_time, + Mail_type: v.Mail_type, + Send_type: v.Send_type, + To_uids: Uids, } } return nil, nil diff --git a/src/server/game/message_handler.go b/src/server/game/message_handler.go index f50c8c69..44135208 100644 --- a/src/server/game/message_handler.go +++ b/src/server/game/message_handler.go @@ -540,14 +540,16 @@ func SyncMailMsg(p *Player) { } MailMod.ServerMail = append(MailMod.ServerMail, v.Id) MailMod.SendMail(&mail.MailStruct{ - Title: v.Title, - Content: v.Content, - TitleEn: v.TitleEn, - ContentEn: v.ContentEn, - Items: v.Items, - Type: v.Mail_type, - TitlePtBr: v.TitlePtBr, - ContentPtBr: v.ContentPtBr, + Title: v.Title, + Content: v.Content, + TitleEn: v.TitleEn, + ContentEn: v.ContentEn, + TitlePtBr: v.TitlePtBr, + ContentPtBr: v.ContentPtBr, + TitleEsLatam: v.TitleEsLatam, + ContentEsLatam: v.ContentEsLatam, + Items: v.Items, + Type: v.Mail_type, }) } p.PushClientRes(MailMod.BackData()) From 52a24f337608e6828cd0470c2073393c60caafe3 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Thu, 12 Feb 2026 14:52:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mail_mgr.go | 1 + src/server/game/mod_factory.go | 5 +++++ src/server/test/fix_test.go | 6 ++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/server/game/mail_mgr.go b/src/server/game/mail_mgr.go index d2c62bb1..b233ce23 100644 --- a/src/server/game/mail_mgr.go +++ b/src/server/game/mail_mgr.go @@ -64,6 +64,7 @@ func (m *MailMgr) AddMail(msg *msg.Msg) (interface{}, error) { func (r *MailMgr) LoadMail(msg *msg.Msg) (interface{}, error) { // 从数据库加载邮件 + log.Debug("reload server mail") data := make([]*db.SqlServerMailStruct, 0) err := db.GetServerMailData(&data) if err != nil { diff --git a/src/server/game/mod_factory.go b/src/server/game/mod_factory.go index 2a22b68d..03644be5 100644 --- a/src/server/game/mod_factory.go +++ b/src/server/game/mod_factory.go @@ -8,6 +8,7 @@ import ( "server/game/mod/decorate" "server/game/mod/endless" limitedTimeEvent "server/game/mod/limited_time_event" + "server/game/mod/mail" "server/game/mod/playroom" ) @@ -42,3 +43,7 @@ func (p *Player) GetBaseMod() *base.Base { func (p *Player) GetChargeMod() *charge.ChargeMod { return p.PlayMod.getChargeMod() } + +func (p *Player) GetMailMod() *mail.MailMod { + return p.PlayMod.getMailMod() +} diff --git a/src/server/test/fix_test.go b/src/server/test/fix_test.go index fe3769fa..4fc8ffb9 100644 --- a/src/server/test/fix_test.go +++ b/src/server/test/fix_test.go @@ -82,10 +82,8 @@ func TestFixUserData(t *testing.T) { func TestRandInt(t *testing.T) { p1 := new(game.Player) p1.InitPlayer("3625212") - BaseMod := p1.GetBaseMod() - ChargeMod := p1.GetChargeMod() - EndlessMod := p1.GetEndlessMod() - EndlessMod.ZeroUpdate(ChargeMod.GetMaxCharge(), BaseMod.GetLevel()) + MailMod := p1.GetMailMod() + MailMod.BackData() } func TestEndless(t *testing.T) {