pet_home/pet_home_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sdk' into online

Browse Source
This commit is contained in:
hahwu 2026-02-12 18:30:47 +08:00
commit 492557fd9c
3 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/server/game/mail_mgr.go
View File

@ -25,20 +25,22 @@ type MailData struct {
} }
type ServerMail struct { type ServerMail struct {
Id int Id int
Title string Title string
Content string Content string
TitleEn string TitleEn string
ContentEn string ContentEn string
TitlePtBr string TitlePtBr string
ContentPtBr string ContentPtBr string
Items []*item.Item TitleEsLatam string
Start_time int64 ContentEsLatam string
Register_time int64 Items []*item.Item
End_time int64 Start_time int64
Send_type int Register_time int64
Mail_type int End_time int64
To_uids []int Send_type int
Mail_type int
To_uids []int
} }
func (m *MailMgr) Init() { func (m *MailMgr) Init() {
@ -62,6 +64,7 @@ func (m *MailMgr) AddMail(msg *msg.Msg) (interface{}, error) {
func (r *MailMgr) LoadMail(msg *msg.Msg) (interface{}, error) { func (r *MailMgr) LoadMail(msg *msg.Msg) (interface{}, error) {
// 从数据库加载邮件 // 从数据库加载邮件
log.Debug("reload server mail")
data := make([]*db.SqlServerMailStruct, 0) data := make([]*db.SqlServerMailStruct, 0)
err := db.GetServerMailData(&data) err := db.GetServerMailData(&data)
if err != nil { if err != nil {
@ -77,20 +80,22 @@ func (r *MailMgr) LoadMail(msg *msg.Msg) (interface{}, error) {
var items []interface{} var items []interface{}
json.Unmarshal([]byte(v.Items), &items) json.Unmarshal([]byte(v.Items), &items)
r.list[v.Id] = &ServerMail{ r.list[v.Id] = &ServerMail{
Id: v.Id, Id: v.Id,
Title: v.Title, Title: v.Title,
Content: v.Content, Content: v.Content,
TitleEn: v.TitleEn, TitleEn: v.TitleEn,
ContentEn: v.ContentEn, ContentEn: v.ContentEn,
TitlePtBr: v.TitlePtBr, TitlePtBr: v.TitlePtBr,
ContentPtBr: v.ContentPtBr, ContentPtBr: v.ContentPtBr,
Items: item.ParseItem(items), TitleEsLatam: v.TitleEsLatam,
Start_time: v.Start_time, ContentEsLatam: v.ContentEsLatam,
Register_time: v.Register_time, Items: item.ParseItem(items),
End_time: v.End_time, Start_time: v.Start_time,
Mail_type: v.Mail_type, Register_time: v.Register_time,
Send_type: v.Send_type, End_time: v.End_time,
To_uids: Uids, Mail_type: v.Mail_type,
Send_type: v.Send_type,
To_uids: Uids,
} }
} }
return nil, nil return nil, nil

18
src/server/game/message_handler.go
View File

@ -540,14 +540,16 @@ func SyncMailMsg(p *Player) {
} }
MailMod.ServerMail = append(MailMod.ServerMail, v.Id) MailMod.ServerMail = append(MailMod.ServerMail, v.Id)
MailMod.SendMail(&mail.MailStruct{ MailMod.SendMail(&mail.MailStruct{
Title: v.Title, Title: v.Title,
Content: v.Content, Content: v.Content,
TitleEn: v.TitleEn, TitleEn: v.TitleEn,
ContentEn: v.ContentEn, ContentEn: v.ContentEn,
Items: v.Items, TitlePtBr: v.TitlePtBr,
Type: v.Mail_type, ContentPtBr: v.ContentPtBr,
TitlePtBr: v.TitlePtBr, TitleEsLatam: v.TitleEsLatam,
ContentPtBr: v.ContentPtBr, ContentEsLatam: v.ContentEsLatam,
Items: v.Items,
Type: v.Mail_type,
}) })
} }
p.PushClientRes(MailMod.BackData()) p.PushClientRes(MailMod.BackData())

5
src/server/game/mod_factory.go
View File

@ -8,6 +8,7 @@ import (
"server/game/mod/decorate" "server/game/mod/decorate"
"server/game/mod/endless" "server/game/mod/endless"
limitedTimeEvent "server/game/mod/limited_time_event" limitedTimeEvent "server/game/mod/limited_time_event"
"server/game/mod/mail"
"server/game/mod/playroom" "server/game/mod/playroom"
) )
@ -42,3 +43,7 @@ func (p *Player) GetBaseMod() *base.Base {
func (p *Player) GetChargeMod() *charge.ChargeMod { func (p *Player) GetChargeMod() *charge.ChargeMod {
return p.PlayMod.getChargeMod() return p.PlayMod.getChargeMod()
} }
func (p *Player) GetMailMod() *mail.MailMod {
return p.PlayMod.getMailMod()
}