Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

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

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()
 				}
 			}
 		}