gamesrv/tienlen/scenedata_tienlen.go

@@ -409,9 +409,6 @@ func (this *TienLenSceneData) BroadcastOpPos() {
 		if B < 0 {
 			isWin = false
 		}
-		if this.WGCreateScene.GetCloseCtrl() {
-			isWin = true
-		}
 		isTienLenYule := this.IsTienLenYule()
 		pack := &tienlen.SCTienLenAIData{
 			BombNum:           0, //炸弹数量
@@ -557,12 +554,10 @@ func (this *TienLenSceneData) GetFreeGameSceneType() int32 {
 	return this.GetSceneType()
 }
 
-// SendHandCard_Match 发牌
 // 比赛场发牌
 // 纯真人，随机发牌
 // 有机器人和真人，真人拿好牌
-// mustRandom 必须随机发牌
+func (this *TienLenSceneData) SendHandCard_Match() {
-func (this *TienLenSceneData) SendHandCard_Match(mustRandom bool) {
 	this.poker.Shuffle()
 	buf := this.poker.GetPokerBuf()
 	cardss := map[int][]int32{}
@@ -584,7 +579,7 @@ func (this *TienLenSceneData) SendHandCard_Match(mustRandom bool) {
 			}
 		}
 	}
-	if !mustRandom && len(realPlayers) > 0 && len(robotPlayers) > 0 {
+	if len(realPlayers) > 0 && len(robotPlayers) > 0 {
 		type gradeInfo struct {
 			id    int
 			grade int

gamesrv/tienlen/scenepolicy_tienlen.go

@@ -991,18 +991,14 @@ func (this *SceneHandCardStateTienLen) OnEnter(s *base.Scene) {
 		if rule.TestOpen {
 			sceneEx.SendHandCardTest()
 		} else {
+
 			if len(sceneEx.testPokers) > 1 {
 				sceneEx.SendHandCardOdds()
 			} else {
-				// 关闭调控发牌
+				if sceneEx.IsMatchScene() || sceneEx.IsCustom() {
-				if sceneEx.WGCreateScene.GetCloseCtrl() {
+					sceneEx.SendHandCard_Match()
-					sceneEx.SendHandCard_Match(true)
 				} else {
-					if sceneEx.IsMatchScene() || sceneEx.IsCustom() {
+					sceneEx.SendHandCardOdds()
-						sceneEx.SendHandCard_Match(false)
-					} else {
-						sceneEx.SendHandCardOdds()
-					}
 				}
 			}
 		}

protocol/player/player.proto

@@ -236,8 +236,8 @@ enum PlayerPacketID {
   PACKET_SCClawdollItemLog = 2845;//返回娃娃卡道具记录
   PACKET_CSDollConfig = 2846;	//获取娃娃机配置信息
   PACKET_SCDollConfig = 2847;	//返回娃娃机配置信息
-  PACKET_CSPopUpWindowConfig = 2848;  //获取弹窗配置
+  PACKET_CSPopUpWindowConfig = 2848;	//获取弹窗配置
-  PACKET_SCPopUpWindowConfig = 2849;  //返回弹窗配置
+  PACKET_SCPopUpWindowConfig = 2849;	//返回弹窗配置
 }
 
 // 账变记录
@@ -1417,12 +1417,12 @@ message CSPopUpWindowConfig{
 //返回活动弹窗配置
 //PACKET_SCPopUpWindowConfig
 message SCPopUpWindowConfig{
-  repeated PopUpWindowInfo Info = 1;
+	repeated PopUpWindowInfo Info =1;
 }
 message PopUpWindowInfo{
-  int32 Id = 1;
+	int32 Id = 1;
-  string Name = 2;
+	string Name = 2;
-  string Key = 3;
+	string Key = 3;
-  int32 OpenStatus = 4;//1-开启 0-关闭
+	int32 OpenStatus = 4;//1-开启 0-关闭
-  int32 Weight = 5;//弹窗权重
+	int32 Weight = 5;//弹窗权重
 }

protocol/server/server.proto

@@ -205,7 +205,6 @@ message WGCreateScene {
   MatchParam Match = 16; // 比赛场参数
   repeated int32 ChessRank = 26; // 象棋段位配置
   repeated int64 Params = 27; // 游戏参数,GameRule中定义,不要有其他用途，含义不明确
-  bool CloseCtrl = 28; // 是否关闭开启控制
 }
 
 //PACKET_WG_DESTROYSCENE

protocol/webapi/common.proto

@@ -109,7 +109,6 @@ message GameFree {
   int32 GroupId = 1;                  // 组ID
   bool Status = 2;                    // 开关
   server.DB_GameFree DbGameFree = 3;  // excel导出结构
-  bool CloseCtrl = 4;                // 是否关闭调控开关
 }
 
 // 平台级别游戏配置
@@ -993,13 +992,13 @@ message ClientUpgrade{
 
 //etcd /game/PopUpWindowConfig
 message PopUpWindowConfig{
-  string Platform = 1; // 平台
+	string Platform = 1; // 平台
-  repeated PopUpWindowInfo Info = 2;
+	repeated PopUpWindowInfo Info =2;
 }
 message PopUpWindowInfo{
-  int32 Id = 1;
+	int32 Id = 1;
-  string Name = 2;
+	string Name = 2;
-  string Key = 3;
+	string Key = 3;
-  int32 OpenStatus = 4;//1-开启 2-关闭
+	int32 OpenStatus = 4;//1-开启 2-关闭
-  int32 Weight = 5;//弹窗权重
+	int32 Weight = 5;//弹窗权重
 }

worldsrv/gamesess.go

@@ -163,7 +163,6 @@ func (this *GameSession) AddScene(args *AddSceneParam) {
 		Custom:       args.S.CustomParam,
 		Match:        args.S.MatchParam,
 		Params:       args.S.params,
-		CloseCtrl:    args.S.CloseCtrl,
 	}
 	if args.S.CustomParam.GetRoomConfigId() != 0 {
 		cfg := PlatformMgrSingleton.GetConfig(args.S.platform.IdStr).RoomConfig[args.S.CustomParam.GetRoomConfigId()]

worldsrv/platform.go

@@ -127,7 +127,6 @@ func (cfg *GameList) GetGameConfig(gameFreeId int32) *webapiproto.GameFree {
 func CompareGameFreeConfigChanged(oldCfg, newCfg *webapiproto.GameFree) bool {
 	if oldCfg.Status != newCfg.Status ||
 		oldCfg.GroupId != newCfg.GroupId ||
-		oldCfg.GetCloseCtrl() != newCfg.GetCloseCtrl() ||
 		oldCfg.DbGameFree.GetBot() != newCfg.DbGameFree.GetBot() ||
 		oldCfg.DbGameFree.GetBaseScore() != newCfg.DbGameFree.GetBaseScore() ||
 		oldCfg.DbGameFree.GetLimitCoin() != newCfg.DbGameFree.GetLimitCoin() ||

worldsrv/scene.go

@@ -65,10 +65,8 @@ type Scene struct {
 	*serverproto.CustomParam                               // 房卡场参数
 	*serverproto.MatchParam                                // 比赛场参数
 	*webapiproto.RoomConfigSystem                          // 系统竞技馆房间
-	CloseCtrl bool                                         // 调控开关
+	csp                           *CoinScenePool           // 所在场景池
-
+	hp                            *HundredSceneMgr         // 百人场房间池
-	csp *CoinScenePool   // 所在场景池
-	hp  *HundredSceneMgr // 百人场房间池
 }
 
 // NewScene 创建房间
@@ -148,10 +146,6 @@ func NewScene(args *CreateSceneParam) *Scene {
 	if s.RoomConfigSystem == nil {
 		s.RoomConfigSystem = new(webapiproto.RoomConfigSystem)
 	}
-	gf := PlatformMgrSingleton.GetGameFree(args.Platform.IdStr, args.GameFreeId)
-	if gf != nil {
-		s.CloseCtrl = gf.GetCloseCtrl()
-	}
 	return s
 }