1

server/mailserver/player/player.go

@@ -5,15 +5,9 @@ import (
 	"main/common"
 )
 
-type ReadMail struct {
-	mailId     int64
-	readTime   int32
-	expireTime int32
-}
-
-type DeletedMail struct {
-	mailId     int64
-	deleteTime int32
+type mail struct {
+	mailId int64
+	state int32
 	expireTime int32
 }
 
@@ -23,13 +17,11 @@ type player struct {
 	sessionId string
 	registerTime int32
 	loaded bool
-	readMailHash map[int64]*ReadMail
-	deletedMailHash map[int64]*DeletedMail
+	mailHash map[int64]*mail
 }
 
 func (this *player) init() {
-	this.readMailHash = make(map[int64]*ReadMail)
-	this.deletedMailHash = make(map[int64]*DeletedMail)
+	this.mailHash = make(map[int64]*mail)
 }
 
 func (this *player) Lock() {

third_party/q5

@@ -1 +1 @@
-Subproject commit 70d3baf515740ef2be305e59054f07e3e3606758
+Subproject commit fc08e4f8c51900b8eec8f67e29ccd321c1f1a758