From bb1ee41ac0de72c09b31506c7242189a10cd44d7 Mon Sep 17 00:00:00 2001
From: fatiao <515948292@qq.com>
Date: Mon, 15 Dec 2025 14:37:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E8=BE=B9=E7=95=8C?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/roserver/fruit/model/live_room.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/roserver/fruit/model/live_room.go b/server/roserver/fruit/model/live_room.go
index 812205e..ec78aeb 100644
--- a/server/roserver/fruit/model/live_room.go
+++ b/server/roserver/fruit/model/live_room.go
@@ -315,7 +315,7 @@ func (self *LiveRoom) LIVEROOM_STAGE_IDLE_Enter() {
 }
 
 func (self *LiveRoom) LIVEROOM_STAGE_IDLE_Update(deltaMS uint32) {
-	if self.stageTick > self.CalcTimelineSec(self.idleTimeline) {
+	if self.stageTick >= self.CalcTimelineSec(self.idleTimeline) {
 		if self.giftPoint >= serverproto.LiveRoomCfgLoader[int32(self.roomType)].MaxGiftPoint {
 			self.ChangeStage(LIVEROOM_STAGE_READY)
 		} else {
@@ -341,7 +341,7 @@ func (self *LiveRoom) LIVEROOM_STAGE_READY_Enter() {
 }
 
 func (self *LiveRoom) LIVEROOM_STAGE_READY_Update(deltaMS uint32) {
-	if self.stageTick > self.CalcTimelineSec(self.readyTimeline) {
+	if self.stageTick >= self.CalcTimelineSec(self.readyTimeline) {
 		if len(self.readyUidList) > 0 {
 			self.ChangeStage(LIVEROOM_STAGE_SHOW)
 		} else {
@@ -367,7 +367,7 @@ func (self *LiveRoom) LIVEROOM_STAGE_SHOW_Enter() {
 }
 
 func (self *LiveRoom) LIVEROOM_STAGE_SHOW_Update(deltaMS uint32) {
-	if self.stageTick > self.CalcTimelineSec(self.showTimeline) {
+	if self.stageTick >= self.CalcTimelineSec(self.showTimeline) {
 		self.ChangeStage(LIVEROOM_STAGE_RESULT)
 		return
 	}
@@ -408,7 +408,7 @@ func (self *LiveRoom) LIVEROOM_STAGE_RESULT_Enter() {
 }
 
 func (self *LiveRoom) LIVEROOM_STAGE_RESULT_Update(deltaMS uint32) {
-	if self.stageTick > self.CalcTimelineSec(self.resultTimeline) {
+	if self.stageTick >= self.CalcTimelineSec(self.resultTimeline) {
 		self.ChangeStage(LIVEROOM_STAGE_IDLE)
 		return
 	}
@@ -547,7 +547,7 @@ func (self *LiveRoom) StageTimerSec() uint32 {
 }
 
 func (self *LiveRoom) StageSec() uint32 {
-	return uint32(self.stageTick)
+	return self.GetStageTimerSec(self.stage) - uint32(self.stageTick)
 }
 
 func (self *LiveRoom) HasPlayer(uid uint64) bool {