From c846553d7b681f8847cb49a9837a0a239e90fc74 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 7 Sep 2023 17:08:54 +0800
Subject: [PATCH] 1

---
 server/hallserver/common/types.go  | 1 -
 server/hallserver/global/global.go | 6 +++++-
 server/hallserver/player/export.go | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/hallserver/common/types.go b/server/hallserver/common/types.go
index 6549776d..7e26456c 100644
--- a/server/hallserver/common/types.go
+++ b/server/hallserver/common/types.go
@@ -26,7 +26,6 @@ type PlayerMgr interface {
 }
 
 type WspListener interface {
-	ss.MsgHandler
 	ProcessSSMMsg(*ss.SsNetMsgHandler, *f5.MsgHdr)
 	SendProxyMsg(net.Conn, uint16, proto.Message);
 }
diff --git a/server/hallserver/global/global.go b/server/hallserver/global/global.go
index 1dbefe66..6f215706 100644
--- a/server/hallserver/global/global.go
+++ b/server/hallserver/global/global.go
@@ -2,17 +2,18 @@ package global
 
 import (
 	"q5"
+	"fmt"
 	"main/constant"
 	"main/common"
 )
 
 var modules [constant.MAX_MODULE_IDX]q5.Module
 var initOrders = []int32 {
+	constant.HANDLER_MGR_MODULE_IDX,
 	constant.HTTP_LISTENER_MODULE_IDX,
 	constant.PLAYER_MGR_MODULE_IDX,
 	constant.ROOMMGR_MODULE_IDX,
 	constant.WSPLISTENER_MODULE_IDX,
-	constant.HTTP_LISTENER_MODULE_IDX,
 }
 
 var app common.App
@@ -37,6 +38,7 @@ func GetApp() common.App {
 }
 
 func RegModule(idx int32, m q5.Module) {
+	fmt.Printf("RegModule module %d\n", idx)
 	modules[idx] = m
 	switch (idx) {
 	case constant.APP_MODULE_IDX:
@@ -72,12 +74,14 @@ func RegModule(idx int32, m q5.Module) {
 
 func InitModules() {
 	for _, val := range(initOrders) {
+		fmt.Printf("init module %d\n", val)
 		modules[val].Init()
 	}
 }
 
 func UnInitModules() {
 	for _, val := range(initOrders) {
+		fmt.Printf("unInit module %d", val)
 		modules[val].UnInit()
 	}
 }
diff --git a/server/hallserver/player/export.go b/server/hallserver/player/export.go
index 08d81ac9..5dd96525 100644
--- a/server/hallserver/player/export.go
+++ b/server/hallserver/player/export.go
@@ -8,5 +8,5 @@ import (
 var _playerMgr = new(playerMgr)
 
 func init() {
-	global.RegModule(constant.PLAYER_MGR_HANDLER_ID, _playerMgr)
+	global.RegModule(constant.PLAYER_MGR_MODULE_IDX, _playerMgr)
 }