From 9196e235d88e57fa14df557f33889ecb16422633 Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Thu, 17 Oct 2024 17:33:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=89=8C=E8=B0=83=E6=8E=A7=E8=BF=98?= =?UTF-8?q?=E5=8E=9F=20=E4=BD=BF=E7=94=A8=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E5=8F=91=E7=89=8C=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamesrv/tienlen/scenedata_tienlen.go | 5 ++--- gamesrv/tienlen/scenepolicy_tienlen.go | 10 +++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/gamesrv/tienlen/scenedata_tienlen.go b/gamesrv/tienlen/scenedata_tienlen.go index 9509c64..dd941de 100644 --- a/gamesrv/tienlen/scenedata_tienlen.go +++ b/gamesrv/tienlen/scenedata_tienlen.go @@ -561,8 +561,7 @@ func (this *TienLenSceneData) GetFreeGameSceneType() int32 { // 比赛场发牌 // 纯真人,随机发牌 // 有机器人和真人,真人拿好牌 -// mustRandom 必须随机发牌 -func (this *TienLenSceneData) SendHandCard_Match(mustRandom bool) { +func (this *TienLenSceneData) SendHandCard_Match() { this.poker.Shuffle() buf := this.poker.GetPokerBuf() cardss := map[int][]int32{} @@ -584,7 +583,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 diff --git a/gamesrv/tienlen/scenepolicy_tienlen.go b/gamesrv/tienlen/scenepolicy_tienlen.go index 142d2dc..973af23 100644 --- a/gamesrv/tienlen/scenepolicy_tienlen.go +++ b/gamesrv/tienlen/scenepolicy_tienlen.go @@ -994,14 +994,10 @@ func (this *SceneHandCardStateTienLen) OnEnter(s *base.Scene) { if len(sceneEx.testPokers) > 1 { sceneEx.SendHandCardOdds() } else { - if sceneEx.WGCreateScene.GetCloseCtrl() { - sceneEx.SendHandCard_Match(true) + if sceneEx.IsMatchScene() || sceneEx.IsCustom() { + sceneEx.SendHandCard_Match() } else { - if sceneEx.IsMatchScene() || sceneEx.IsCustom() { - sceneEx.SendHandCard_Match(false) - } else { - sceneEx.SendHandCardOdds() - } + sceneEx.SendHandCardOdds() } } }