diff --git a/gamesrv/thirteen/scene.go b/gamesrv/thirteen/scene.go index e08204b..77b3318 100644 --- a/gamesrv/thirteen/scene.go +++ b/gamesrv/thirteen/scene.go @@ -185,11 +185,14 @@ func (this *SceneEx) ThirteenWaterCreateRoomInfoPacket(s *base.Scene, p *base.Pl LeaveDeduct: this.GetDBGameFree().GetLeaveDeduct(), LeaveCombat: this.GetDBGameFree().GetLeaveCombat(), Params: common.CopySliceInt64ToInt32(s.Params), - TimeOuts: this.GetDBGameFree().GetOtherIntParams(), - } - if len(pack.TimeOuts) > rule.TimeoutOp { - pack.TimeOuts[rule.TimeoutOp] = int64(this.GetBaiPai().Seconds()) } + + pack.TimeOuts = make([]int64, 4) + pack.TimeOuts[rule.TimeoutStart] = int64(rule.GetTimeout(this.GetDBGameFree().GetOtherIntParams(), rule.TimeoutStart).Seconds()) + pack.TimeOuts[rule.TimeoutSendCards] = int64(rule.GetTimeout(this.GetDBGameFree().GetOtherIntParams(), rule.TimeoutSendCards).Seconds()) + pack.TimeOuts[rule.TimeoutOp] = int64(rule.GetTimeout(this.GetDBGameFree().GetOtherIntParams(), rule.TimeoutOp).Seconds()) + pack.TimeOuts[rule.TimeoutBill] = int64(rule.GetTimeout(this.GetDBGameFree().GetOtherIntParams(), rule.TimeoutBill).Seconds()) + // 玩家信息 for _, playerEx := range this.players { pd := &thirteen.ThirteenPlayerData{