.gitlab-ci.yml

@@ -29,6 +29,8 @@ build-job:
           go build -v
           cd ..
       done < shell/programs.txt
+  only:
+    - develop
 
 deploy-job:
   stage: deploy
@@ -63,4 +65,7 @@ deploy-job:
     - cd $GOPATH/src/$DeployPath
     - git add .
     - git commit -m "auto commit pipelineId\:$CI_PIPELINE_ID"
-    - git push origin develop
+    - git push origin develop
+  only:
+    - develop
+

worldsrv/action_server.go

@@ -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 {
 		logger.Logger.Trace("receive SSPacketID_PACKET_GW_SCENESTART GWSceneStart:", pack)
 		if msg, ok := pack.(*serverproto.GWSceneStart); ok {
-			scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId()), true)
+			scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId()))
 			if scene != nil {
 				scene.starting = msg.GetStart()
 				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 {
 		logger.Logger.Trace("receive SSPacketID_PACKET_GW_SCENESTATE GWSceneState:", pack)
 		if msg, ok := pack.(*serverproto.GWSceneState); ok {
-			scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId()), true)
+			scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId()))
 			if scene != nil {
 				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 {
 		if msg, ok := pack.(*serverproto.GWPlayerForceLeave); ok {
 			logger.Logger.Warn("receive GWPlayerForceLeave:", msg)
-			scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId()), true)
+			scene := SceneMgrSingleton.GetScene(int(msg.GetRoomId()))
 			if scene != nil {
 				p := PlayerMgrSington.GetPlayerBySnId(msg.GetPlayerId())
 				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 {
 		logger.Logger.Trace("receive GWPlayerBet:", pack)
 		if msg, ok := pack.(*serverproto.GWPlayerData); ok {
-			scene := SceneMgrSingleton.GetScene(int(msg.GetSceneId()), true)
+			scene := SceneMgrSingleton.GetScene(int(msg.GetSceneId()))
 			if scene == nil {
 				return nil
 			}

worldsrv/coinscenemgr.go

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

worldsrv/hundredscenemgr.go

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

worldsrv/scenemgr.go

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