From 44cf7fb7b2fc9ea8c76cee0034f0d3863a24ecf5 Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Sat, 23 Nov 2024 16:06:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=81=E4=B8=89=E5=BC=A0=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gamesrv/thirteen/scene.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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{