Merge branch 'develop' into sdk

src/server/game/mail_mgr.go

@@ -32,6 +32,8 @@ type ServerMail struct {
 	ContentEn      string
 	TitlePtBr      string
 	ContentPtBr    string
+	TitleEsLatam   string
+	ContentEsLatam string
 	Items          []*item.Item
 	Start_time     int64
 	Register_time  int64
@@ -62,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 {
@@ -84,6 +87,8 @@ func (r *MailMgr) LoadMail(msg *msg.Msg) (interface{}, error) {
 			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,

src/server/game/message_handler.go

@@ -544,10 +544,12 @@ func SyncMailMsg(p *Player) {
 			Content:        v.Content,
 			TitleEn:        v.TitleEn,
 			ContentEn:      v.ContentEn,
-			Items:       v.Items,
-			Type:        v.Mail_type,
 			TitlePtBr:      v.TitlePtBr,
 			ContentPtBr:    v.ContentPtBr,
+			TitleEsLatam:   v.TitleEsLatam,
+			ContentEsLatam: v.ContentEsLatam,
+			Items:          v.Items,
+			Type:           v.Mail_type,
 		})
 	}
 	p.PushClientRes(MailMod.BackData())

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()
+}