diff --git a/server/matchserver/common/types.go b/server/matchserver/common/types.go index 1722a559..9f5a9dcc 100644 --- a/server/matchserver/common/types.go +++ b/server/matchserver/common/types.go @@ -120,6 +120,9 @@ type PlayerMgr interface { GetPlayerBySocket(f5.WspCliConn) Player } +type MatchMgr interface { +} + type WspListener interface { ProcessSSMMsg(*ss.SsNetMsgHandler, *f5.MsgHdr) SendProxyMsg(net.Conn, uint16, proto.Message) diff --git a/server/matchserver/constant/constant.go b/server/matchserver/constant/constant.go index 66600e71..7d5565d1 100644 --- a/server/matchserver/constant/constant.go +++ b/server/matchserver/constant/constant.go @@ -38,5 +38,6 @@ const ( HTTP_LISTENER_MODULE_IDX PLAYER_MGR_MODULE_IDX TEAM_MGR_MODULE_IDX + MATCH_MGR_MODULE_IDX MAX_MODULE_IDX ) diff --git a/server/matchserver/global/global.go b/server/matchserver/global/global.go index 98f061c4..f88e1fa9 100644 --- a/server/matchserver/global/global.go +++ b/server/matchserver/global/global.go @@ -13,12 +13,14 @@ var initOrders = []int32 { constant.HTTP_LISTENER_MODULE_IDX, constant.PLAYER_MGR_MODULE_IDX, constant.TEAM_MGR_MODULE_IDX, + constant.MATCH_MGR_MODULE_IDX, constant.WSPLISTENER_MODULE_IDX, } var app common.App var playerMgr common.PlayerMgr var teamMgr common.TeamMgr +var matchMgr common.MatchMgr var wspListener common.WspListener func GetPlayerMgr() common.PlayerMgr { @@ -65,6 +67,10 @@ func RegModule(idx int32, m q5.Module) { { teamMgr = m.(common.TeamMgr) } + case constant.MATCH_MGR_MODULE_IDX: + { + matchMgr = m.(common.MatchMgr) + } default: { panic("unknow module") diff --git a/server/matchserver/team/export.go b/server/matchserver/team/export.go index 770e6a59..eea9173d 100644 --- a/server/matchserver/team/export.go +++ b/server/matchserver/team/export.go @@ -6,7 +6,9 @@ import ( ) var _teamMgr = new(teamMgr) +var _matchMgr = new(matchMgr) func init() { global.RegModule(constant.TEAM_MGR_MODULE_IDX, _teamMgr) + global.RegModule(constant.MATCH_MGR_MODULE_IDX, _matchMgr) } diff --git a/server/matchserver/team/matchmgr.go b/server/matchserver/team/matchmgr.go new file mode 100644 index 00000000..7d967a39 --- /dev/null +++ b/server/matchserver/team/matchmgr.go @@ -0,0 +1,25 @@ +package team + +import ( + /* + "q5" + "f5" + "cs" + "main/common" + "mt"*/ +) + +type matchMgr struct { + teamUuidHash map[string]*team +} + +func (this *matchMgr) Init() { + this.teamUuidHash = make(map[string]*team) +} + +func (this *matchMgr) UnInit() { +} + +func (this *matchMgr) addMatchingTeam(team *team) { + +} diff --git a/server/matchserver/team/team.go b/server/matchserver/team/team.go index f42ca294..b656c957 100644 --- a/server/matchserver/team/team.go +++ b/server/matchserver/team/team.go @@ -135,7 +135,7 @@ func (this *team) StartGame() { if !this.IsLock() && this.CanStartGame(this.owner) { if this.IsMobaMode() { this.state = constant.TEAM_STATE_MATCHING - _teamMgr.addMatchingTeam(this) + _matchMgr.addMatchingTeam(this) this.SendStateNotify() } else { this.state = constant.TEAM_STATE_STARTED diff --git a/server/matchserver/team/teammgr.go b/server/matchserver/team/teammgr.go index 3cb9df70..b06f6570 100644 --- a/server/matchserver/team/teammgr.go +++ b/server/matchserver/team/teammgr.go @@ -12,7 +12,6 @@ type teamMgr struct { cs.MsgHandlerImpl curIdx int64 teamUuidHash map[string]*team - matchingHash map[string]*team } func (this *teamMgr) Init() { @@ -66,7 +65,3 @@ func (this *teamMgr) OnEnterNewUser(hum common.Player) { func (this *teamMgr) removeTeam(teamUuid string) { delete(this.teamUuidHash, teamUuid) } - -func (this *teamMgr) addMatchingTeam(team *team) { - -}