tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

百人场房间删除

This commit is contained in:
sk 2024-10-14 16:13:33 +08:00
parent 368a6e29a5
commit db8506f8b7
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -15,7 +15,7 @@ build-job:
script: script:
# 拷贝到GOPATH # 拷贝到GOPATH
- echo '拷贝到GOPATH' - echo '拷贝到GOPATH'
- cp -rfvp ./* $GOPATH/src/$ProjectPath - cp -rfp ./* $GOPATH/src/$ProjectPath
# 进入项目目录 # 进入项目目录
- cd $GOPATH/src/$ProjectPath - cd $GOPATH/src/$ProjectPath
# 编译 # 编译

8
worldsrv/action_server.go
View File

@ -236,7 +236,7 @@ func init() {
netlib.RegisterHandler(int(serverproto.SSPacketID_PACKET_GW_SCENESTART), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error { netlib.RegisterHandler(int(serverproto.SSPacketID_PACKET_GW_SCENESTART), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
logger.Logger.Trace("receive SSPacketID_PACKET_GW_SCENESTART GWSceneStart:", pack) logger.Logger.Trace("receive SSPacketID_PACKET_GW_SCENESTART GWSceneStart:", pack)
if msg, ok := pack.(*serverproto.GWSceneStart); ok { if msg, ok := pack.(*serverproto.GWSceneStart); ok {
scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId())) scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId()), true)
if scene != nil { if scene != nil {
scene.starting = msg.GetStart() scene.starting = msg.GetStart()
scene.currRound = msg.GetCurrRound() scene.currRound = msg.GetCurrRound()
@ -264,7 +264,7 @@ func init() {
netlib.RegisterHandler(int(serverproto.SSPacketID_PACKET_GW_SCENESTATE), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error { netlib.RegisterHandler(int(serverproto.SSPacketID_PACKET_GW_SCENESTATE), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
logger.Logger.Trace("receive SSPacketID_PACKET_GW_SCENESTATE GWSceneState:", pack) logger.Logger.Trace("receive SSPacketID_PACKET_GW_SCENESTATE GWSceneState:", pack)
if msg, ok := pack.(*serverproto.GWSceneState); ok { if msg, ok := pack.(*serverproto.GWSceneState); ok {
scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId())) scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId()), true)
if scene != nil { if scene != nil {
scene.sp.OnSceneState(scene, int(msg.GetRoomState())) scene.sp.OnSceneState(scene, int(msg.GetRoomState()))
} }
@ -339,7 +339,7 @@ func init() {
netlib.RegisterHandler(int(serverproto.SSPacketID_PACKET_GW_PLAYERFORCELEAVE), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error { netlib.RegisterHandler(int(serverproto.SSPacketID_PACKET_GW_PLAYERFORCELEAVE), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
if msg, ok := pack.(*serverproto.GWPlayerForceLeave); ok { if msg, ok := pack.(*serverproto.GWPlayerForceLeave); ok {
logger.Logger.Warn("receive GWPlayerForceLeave:", msg) logger.Logger.Warn("receive GWPlayerForceLeave:", msg)
scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId())) scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId()), true)
if scene != nil { if scene != nil {
p := PlayerMgrSington.GetPlayerBySnId(msg.GetPlayerId()) p := PlayerMgrSington.GetPlayerBySnId(msg.GetPlayerId())
if p != nil { if p != nil {
@ -384,7 +384,7 @@ func init() {
netlib.RegisterHandler(int(serverproto.SSPacketID_PACKET_GW_PLAYERDATA), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error { netlib.RegisterHandler(int(serverproto.SSPacketID_PACKET_GW_PLAYERDATA), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
logger.Logger.Trace("receive GWPlayerBet:", pack) logger.Logger.Trace("receive GWPlayerBet:", pack)
if msg, ok := pack.(*serverproto.GWPlayerData); ok { if msg, ok := pack.(*serverproto.GWPlayerData); ok {
scene := SceneMgrSingleton.GetScene(int(msg.GetSceneId())) scene := SceneMgrSingleton.GetScene(int(msg.GetSceneId()), true)
if scene == nil { if scene == nil {
return nil return nil
} }

2
worldsrv/coinscenemgr.go
View File

@ -175,7 +175,7 @@ func (m *CoinSceneMgr) PlayerLeave(p *Player, reason int) bool {
// 游戏服解散房间消息触发 // 游戏服解散房间消息触发
// sceneId 房间id // sceneId 房间id
func (m *CoinSceneMgr) OnDestroyScene(sceneId int) { func (m *CoinSceneMgr) OnDestroyScene(sceneId int) {
if s := SceneMgrSingleton.GetScene(sceneId); s != nil && s.csp != nil { if s := SceneMgrSingleton.GetScene(sceneId, true); s != nil && s.csp != nil {
s.csp.onDestroyScene(sceneId) s.csp.onDestroyScene(sceneId)
} }
} }

4
worldsrv/hundredscenemgr.go
View File

@ -111,7 +111,7 @@ func (this *HundredSceneMgr) PlayerTryLeave(p *Player) gamehallproto.OpResultCod
// OnDestroyScene 房间销毁 // OnDestroyScene 房间销毁
func (this *HundredSceneMgr) OnDestroyScene(sceneId int) { func (this *HundredSceneMgr) OnDestroyScene(sceneId int) {
s := SceneMgrSingleton.GetScene(sceneId) s := SceneMgrSingleton.GetScene(sceneId, true)
if s == nil { if s == nil {
return return
} }
@ -416,7 +416,7 @@ func (this *HundredSceneMgr) OnPlatformDestroyByGameFreeId(p *Platform, gameFree
} }
func init() { func init() {
module.RegisteModule(HundredSceneMgrSingleton, time.Second*5, 0) module.RegisteModule(HundredSceneMgrSingleton, time.Hour, 0)
PlatformMgrSingleton.RegisterObserver(HundredSceneMgrSingleton) PlatformMgrSingleton.RegisterObserver(HundredSceneMgrSingleton)
PlatformGameGroupMgrSington.RegisteObserver(HundredSceneMgrSingleton) PlatformGameGroupMgrSington.RegisteObserver(HundredSceneMgrSingleton)
} }

2
worldsrv/scenemgr.go
View File

@ -94,7 +94,7 @@ func (m *SceneMgr) GenPassword() string {
} }
func (m *SceneMgr) GetPlatformBySceneId(sceneId int) string { func (m *SceneMgr) GetPlatformBySceneId(sceneId int) string {
s := m.GetScene(sceneId) s := m.GetScene(sceneId, true)
if s != nil && s.platform != nil { if s != nil && s.platform != nil {
return s.platform.IdStr return s.platform.IdStr
} }