model/config.go

@@ -522,17 +522,3 @@ func (cm *ConfigMgr) GetLotteryConfig(plt string, id int64) *webapi.LotteryInfo
 	}
 	return nil
 }
-
-func (cm *ConfigMgr) CustomIsOn(plt string, configId int32) bool {
-	cfg := cm.GetConfig(plt).RoomConfig[configId]
-	if cfg == nil || cfg.GetOn() != common.On {
-		return false
-	}
-
-	cfgT := cm.GetConfig(plt).RoomType[cfg.GetRoomType()]
-	if cfgT == nil || cfgT.GetOn() != common.On {
-		return false
-	}
-
-	return true
-}

worldsrv/action_game.go

@@ -1399,7 +1399,8 @@ func CSGetPrivateRoomListHandler(s *netlib.Session, packetId int, data interface
 	})
 	for _, v := range scenes {
 		// 隐藏关闭的房间
-		if !PlatformMgrSingleton.CustomIsOn(p.Platform, v.CustomParam.GetRoomConfigId()) {
+		cfg := PlatformMgrSingleton.GetConfig(p.Platform).RoomConfig[v.CustomParam.GetRoomConfigId()]
+		if cfg == nil || cfg.GetOn() != common.On {
 			continue
 		}
 

worldsrv/customroommgr.go

@@ -128,7 +128,8 @@ func (c *CustomRoomMgr) GetRoomList(plt string) []*gamehall.PrivateRoomInfo {
 		if v == nil || v.PrivateRoomInfo == nil {
 			continue
 		}
-		if !PlatformMgrSingleton.CustomIsOn(plt, v.RoomConfigId) {
+		cfg := PlatformMgrSingleton.GetConfig(plt).RoomConfig[v.RoomConfigId]
+		if cfg == nil || cfg.GetOn() != common.On {
 			continue
 		}
 		ret = append(ret, v.PrivateRoomInfo)

worldsrv/scenemgr.go

@@ -399,9 +399,6 @@ func (m *SceneMgr) FindCustomInviteRoom(p *Player) *Scene {
 		if len(v.Channel) > 0 && !slices.Contains(v.Channel, p.AppChannel) {
 			continue
 		}
-		if !PlatformMgrSingleton.CustomIsOn(p.Platform, v.CustomParam.GetRoomConfigId()) {
-			continue
-		}
 		ret = append(ret, v)
 	}