From d2c6d702e8d80f163a22e542e83cec60ab02306a Mon Sep 17 00:00:00 2001
From: by <123456@qq.com>
Date: Thu, 17 Oct 2024 13:59:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=9A=8F=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=91=E7=89=8C=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gamesrv/tienlen/scenedata_tienlen.go   |  7 ++++---
 gamesrv/tienlen/scenepolicy_tienlen.go | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gamesrv/tienlen/scenedata_tienlen.go b/gamesrv/tienlen/scenedata_tienlen.go
index 9509c64..eba73e2 100644
--- a/gamesrv/tienlen/scenedata_tienlen.go
+++ b/gamesrv/tienlen/scenedata_tienlen.go
@@ -409,9 +409,10 @@ func (this *TienLenSceneData) BroadcastOpPos() {
 		if B < 0 {
 			isWin = false
 		}
-		if this.WGCreateScene.GetCloseCtrl() {
-			isWin = true
-		}
+		isWin = true
+		/*		if this.WGCreateScene.GetCloseCtrl() {
+				isWin = true
+			}*/
 		isTienLenYule := this.IsTienLenYule()
 		pack := &tienlen.SCTienLenAIData{
 			BombNum:           0, //炸弹数量
diff --git a/gamesrv/tienlen/scenepolicy_tienlen.go b/gamesrv/tienlen/scenepolicy_tienlen.go
index 3af9000..693ce85 100644
--- a/gamesrv/tienlen/scenepolicy_tienlen.go
+++ b/gamesrv/tienlen/scenepolicy_tienlen.go
@@ -995,15 +995,16 @@ func (this *SceneHandCardStateTienLen) OnEnter(s *base.Scene) {
 				sceneEx.SendHandCardOdds()
 			} else {
 				// 关闭调控发牌
-				if sceneEx.WGCreateScene.GetCloseCtrl() {
-					sceneEx.SendHandCard_Match(true)
-				} else {
-					if sceneEx.IsMatchScene() || sceneEx.IsCustom() {
-						sceneEx.SendHandCard_Match(false)
-					} else {
-						sceneEx.SendHandCardOdds()
-					}
-				}
+				sceneEx.SendHandCard_Match(true)
+				/*				if sceneEx.WGCreateScene.GetCloseCtrl() {
+									sceneEx.SendHandCard_Match(true)
+								} else {
+									if sceneEx.IsMatchScene() || sceneEx.IsCustom() {
+										sceneEx.SendHandCard_Match(false)
+									} else {
+										sceneEx.SendHandCardOdds()
+									}
+								}*/
 			}
 		}
 

From 79636e86196bb7d6a487cabec2a05435b8435dde Mon Sep 17 00:00:00 2001
From: by <123456@qq.com>
Date: Thu, 17 Oct 2024 14:18:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gamesrv/tienlen/scenedata_tienlen.go   |  7 +++----
 gamesrv/tienlen/scenepolicy_tienlen.go | 20 +++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/gamesrv/tienlen/scenedata_tienlen.go b/gamesrv/tienlen/scenedata_tienlen.go
index eba73e2..9509c64 100644
--- a/gamesrv/tienlen/scenedata_tienlen.go
+++ b/gamesrv/tienlen/scenedata_tienlen.go
@@ -409,10 +409,9 @@ func (this *TienLenSceneData) BroadcastOpPos() {
 		if B < 0 {
 			isWin = false
 		}
-		isWin = true
-		/*		if this.WGCreateScene.GetCloseCtrl() {
-				isWin = true
-			}*/
+		if this.WGCreateScene.GetCloseCtrl() {
+			isWin = true
+		}
 		isTienLenYule := this.IsTienLenYule()
 		pack := &tienlen.SCTienLenAIData{
 			BombNum:           0, //炸弹数量
diff --git a/gamesrv/tienlen/scenepolicy_tienlen.go b/gamesrv/tienlen/scenepolicy_tienlen.go
index 693ce85..142d2dc 100644
--- a/gamesrv/tienlen/scenepolicy_tienlen.go
+++ b/gamesrv/tienlen/scenepolicy_tienlen.go
@@ -994,17 +994,15 @@ func (this *SceneHandCardStateTienLen) OnEnter(s *base.Scene) {
 			if len(sceneEx.testPokers) > 1 {
 				sceneEx.SendHandCardOdds()
 			} else {
-				// 关闭调控发牌
-				sceneEx.SendHandCard_Match(true)
-				/*				if sceneEx.WGCreateScene.GetCloseCtrl() {
-									sceneEx.SendHandCard_Match(true)
-								} else {
-									if sceneEx.IsMatchScene() || sceneEx.IsCustom() {
-										sceneEx.SendHandCard_Match(false)
-									} else {
-										sceneEx.SendHandCardOdds()
-									}
-								}*/
+				if sceneEx.WGCreateScene.GetCloseCtrl() {
+					sceneEx.SendHandCard_Match(true)
+				} else {
+					if sceneEx.IsMatchScene() || sceneEx.IsCustom() {
+						sceneEx.SendHandCard_Match(false)
+					} else {
+						sceneEx.SendHandCardOdds()
+					}
+				}
 			}
 		}