Browse Source

fold bugfix

master
tangmingyou 4 years ago
parent
commit
2702982977
  1. 2
      Makefile
  2. 26
      internal/game/actions.go

2
Makefile

@ -16,7 +16,7 @@ clean:
rm -rf target/
run:
nohup target/texas -conf=target/data/config.toml -region=sh -zone=sh001 -deploy.env=dev -weight=10 2>&1 > target/data/texas.log &
nohup target/texas -conf=target/data/config.toml 2>&1 > target/data/texas.log &
stop:
pkill -f target/texas

26
internal/game/actions.go

@ -123,20 +123,20 @@ func Fold4Limited(player *Player, betChip int32) proto.Message {
player.SetStatus(7)
betNotice.Line2 = "弃牌"
// 剩余玩家数为1则结束
leftPlayers := collect.Filter(player.GameTable.Players, func(i int, p *Player) bool {
return p != nil && p.Status != 7
})
if len(leftPlayers) == 1 {
err := table.RoundOver()
if err != nil {
return &api.ResFail{Code: 500, Msg: err.Error()}
}
player.GameTable.NoticeAllPlayer(betNotice)
// 剩余玩家数为1则结束, 在 service 中判断
//leftPlayers := collect.Filter(player.GameTable.Players, func(i int, p *Player) bool {
// return p != nil && p.Status != 7
//})
//if len(leftPlayers) == 1 {
// err := table.RoundOver()
// if err != nil {
// return &api.ResFail{Code: 500, Msg: err.Error()}
// }
// // player.GameTable.NoticeAllPlayer(betNotice)
// return &api.ResSuccess{}
//}
// player.GameTable.NoticeAllPlayer(betNotice)
return &api.ResSuccess{}
}
player.GameTable.NoticeAllPlayer(betNotice)
return nil
}
func Check4Limited(player *Player, betChip int32) proto.Message {

Loading…
Cancel
Save