diff --git a/src/server/cluster/cluster_type.go b/src/server/cluster/cluster_type.go index 02b39ebd..69beefdf 100644 --- a/src/server/cluster/cluster_type.go +++ b/src/server/cluster/cluster_type.go @@ -1,15 +1,5 @@ package mergeCluster -import ( - "encoding/gob" - "server/game/mod/msg" -) - -func init() { - gob.Register(&msg.Msg{}) - gob.Register(&ClusterJoinData{}) -} - type ClusterJoinData struct { ServerId int Country int diff --git a/src/server/game/external.go b/src/server/game/external.go index 0d6d0289..4742cbba 100644 --- a/src/server/game/external.go +++ b/src/server/game/external.go @@ -35,6 +35,7 @@ func RegisterHandlerRPC(param []interface{}) { } func init() { + register() db.InitDB() db.InitRedis() // db.TestGetAllKey() diff --git a/src/server/game/friend_mgr.go b/src/server/game/friend_mgr.go index 2a388208..6dbf8a10 100644 --- a/src/server/game/friend_mgr.go +++ b/src/server/game/friend_mgr.go @@ -1,13 +1,9 @@ package game import ( - "encoding/gob" "fmt" mergeCluster "server/cluster" "server/conf" - "server/game/mod/card" - "server/game/mod/friend" - "server/game/mod/item" "server/game/mod/msg" GoUtil "server/game_util" "server/pkg/github.com/name5566/leaf/log" @@ -24,10 +20,6 @@ type FirendData struct { } func (f *FriendMgr) Init() { - gob.Register(card.CardInfo{}) - gob.Register(item.Item{}) - gob.Register([]*item.Item{}) // 注册 []*item.Item 类型 - gob.Register(friend.ReplyInfo{}) f.key = FRIEND_MGR_KEY f.data = &FirendData{ List: make(map[int][]*msg.Msg), diff --git a/src/server/game/game_type.go b/src/server/game/game_type.go index da8d73f2..876acd39 100644 --- a/src/server/game/game_type.go +++ b/src/server/game/game_type.go @@ -2,6 +2,8 @@ package game import ( "encoding/gob" + mergeCluster "server/cluster" + "server/game/mod/activity" "server/game/mod/card" "server/game/mod/friend" "server/game/mod/item" @@ -115,12 +117,17 @@ type CatnipLock struct { End int } -func init() { +func register() { + gob.Register(card.CardInfo{}) + gob.Register(item.Item{}) + gob.Register(friend.ReplyInfo{}) + gob.Register(&msg.Msg{}) + gob.Register(&mergeCluster.ClusterJoinData{}) gob.Register(&limitedTimeEvent.MoneyCat{}) gob.Register(&limitedTimeEvent.LuckyCat{}) + gob.Register(&limitedTimeEvent.PaybackDay{}) gob.Register(&msg.HandbookMsg{}) gob.Register(&limitedTimeEvent.CatTrick{}) - gob.Register(&limitedTimeEvent.PaybackDay{}) gob.Register(&VarOpration{}) gob.Register(&VarUserData{}) gob.Register(&ActivityInfo{}) @@ -136,4 +143,9 @@ func init() { gob.Register(friend.ReplyInfo{}) gob.Register(GameResult{}) gob.Register(map[string]interface{}{}) + gob.Register(&MessageData{}) + gob.Register(&MessageList{}) + gob.Register(&activity.Gift{}) + gob.Register(&VarGoldCard{}) + gob.Register(&VarExpireData{}) } diff --git a/src/server/game/message_mgr.go b/src/server/game/message_mgr.go index 800ac5eb..b495b53c 100644 --- a/src/server/game/message_mgr.go +++ b/src/server/game/message_mgr.go @@ -2,18 +2,12 @@ package game import ( "context" - "encoding/gob" "fmt" "runtime/debug" mergeCluster "server/cluster" "server/conf" - "server/game/mod/card" - "server/game/mod/friend" - "server/game/mod/item" - limitedTimeEvent "server/game/mod/limited_time_event" "server/game/mod/msg" GoUtil "server/game_util" - proto "server/msg" "server/pkg/github.com/name5566/leaf/log" "sync" "time" @@ -92,28 +86,7 @@ func (m *MessageMgr) MessageMgrInit() { MessageList: make(map[int64]*MessageList), PlayerList: make(map[int64]int), } - // 注册所有可能在消息中使用的类型 - gob.Register(&limitedTimeEvent.MoneyCat{}) - gob.Register(&limitedTimeEvent.LuckyCat{}) - gob.Register(&msg.HandbookMsg{}) - gob.Register(&limitedTimeEvent.CatTrick{}) - gob.Register(&VarOpration{}) - gob.Register(&VarUserData{}) - gob.Register(&ActivityInfo{}) - gob.Register(&ChargeExtra{}) - gob.Register(CatnipMsg{}) - gob.Register(&CatnipLock{}) - gob.Register(CRank{}) - gob.Register(&proto.ResChampshipRank{}) - gob.Register(&proto.ResChampshipPreRank{}) - gob.Register(card.CardInfo{}) - gob.Register(item.Item{}) - gob.Register([]*item.Item{}) // 注册 []*item.Item 类型 - gob.Register(friend.ReplyInfo{}) - gob.Register(msg.VarData{}) - gob.Register(GameResult{}) - gob.Register(&MessageData{}) - gob.Register(&MessageList{}) + // 注册处理函数 m.init() m.handler = make(map[int]MessageHandlerFunc) diff --git a/src/server/game/mod/activity/activity.go b/src/server/game/mod/activity/activity.go index cc3868ab..b001afe7 100644 --- a/src/server/game/mod/activity/activity.go +++ b/src/server/game/mod/activity/activity.go @@ -1,7 +1,6 @@ package activity import ( - "encoding/gob" "fmt" activityCfg "server/conf/activity" "server/game/mod/item" @@ -43,10 +42,6 @@ type Gift struct { RewardTime int64 } -func init() { - gob.Register(&Gift{}) -} - func (a *Activity) InitData() { if a.Var == nil { a.Var = make(map[int]interface{}, 8) diff --git a/src/server/game/var_mgr.go b/src/server/game/var_mgr.go index 89b91914..79c7e25f 100644 --- a/src/server/game/var_mgr.go +++ b/src/server/game/var_mgr.go @@ -1,7 +1,6 @@ package game import ( - "encoding/gob" "fmt" "server/game/mod/card" "server/game/mod/msg" @@ -37,9 +36,6 @@ const ( ) func (f *VarMgr) Init() { - gob.Register(&VarGoldCard{}) - gob.Register(&VarExpireData{}) - gob.Register(map[string]interface{}{}) f.key = VAR_MGR_KEY f.data = &VarData{ NewVar: map[string]*VarExpireData{},