tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
sk 2024-10-18 10:27:32 +08:00
parent 7591d58829 9196e235d8
commit 7bb11cd169
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gamesrv/tienlen/scenedata_tienlen.go
View File

@ -561,8 +561,7 @@ func (this *TienLenSceneData) GetFreeGameSceneType() int32 {
// 比赛场发牌 // 比赛场发牌
// 纯真人，随机发牌 // 纯真人，随机发牌
// 有机器人和真人，真人拿好牌 // 有机器人和真人，真人拿好牌
// mustRandom 必须随机发牌 func (this *TienLenSceneData) SendHandCard_Match() {
func (this *TienLenSceneData) SendHandCard_Match(mustRandom bool) {
this.poker.Shuffle() this.poker.Shuffle()
buf := this.poker.GetPokerBuf() buf := this.poker.GetPokerBuf()
cardss := map[int][]int32{} 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 { type gradeInfo struct {
id int id int
grade int grade int

6
gamesrv/tienlen/scenepolicy_tienlen.go
View File

@ -993,18 +993,14 @@ func (this *SceneHandCardStateTienLen) OnEnter(s *base.Scene) {
} else { } else {
if len(sceneEx.testPokers) > 1 { if len(sceneEx.testPokers) > 1 {
sceneEx.SendHandCardOdds() sceneEx.SendHandCardOdds()
} else {
if sceneEx.WGCreateScene.GetCloseCtrl() {
sceneEx.SendHandCard_Match(true)
} else { } else {
if sceneEx.IsMatchScene() || sceneEx.IsCustom() { if sceneEx.IsMatchScene() || sceneEx.IsCustom() {
sceneEx.SendHandCard_Match(false) sceneEx.SendHandCard_Match()
} else { } else {
sceneEx.SendHandCardOdds() sceneEx.SendHandCardOdds()
} }
} }
} }
}
for _, seat := range sceneEx.seats { for _, seat := range sceneEx.seats {
if seat != nil { if seat != nil {