定时器边界问题

This commit is contained in:
fatiao 2025-12-15 14:37:39 +08:00
parent c23e16a0d9
commit bb1ee41ac0

View File

@ -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 {