Compare commits

..

No commits in common. "a98d7ac0b4a42106f9a1b9dd9b8d87e1c7ea2c81" and "e0d414e6af3d79f9b713b2f75e1acd70ae32299a" have entirely different histories.

2 changed files with 3 additions and 7 deletions

View File

@ -163,7 +163,7 @@ func (this *TienLenSceneData) CanStart() bool {
}
if this.IsCustom() {
return (this.IsAllReady() || this.GetNumOfGames() > 0) && this.GetPlayerCnt() >= this.GetPlayerNum()
return this.IsAllReady() && this.GetPlayerCnt() >= this.GetPlayerNum()
}
// 房间人数>=2开始,并且有真人或者是预创建房间,并且有房主

View File

@ -603,10 +603,6 @@ func (this *SceneBaseStateTienLen) OnTick(s *base.Scene) {
s.RandRobotCnt()
s.SetTimerRandomRobot(s.GetRobotTime())
}
// 房卡房长时间没人解散房间
if s.IsCustom() && s.GetRealPlayerCnt() == 0 && this.GetTimeout(s) > 5 {
s.Destroy(true)
}
}
// 发送玩家操作情况
@ -723,7 +719,7 @@ func (this *SceneWaitPlayerStateTienLen) CanChangeTo(s base.SceneState) bool {
// 当前状态能否换桌
func (this *SceneWaitPlayerStateTienLen) CanChangeCoinScene(s *base.Scene, p *base.Player) bool {
if s.IsMatchScene() || (s.IsCustom() && s.GetNumOfGames() > 0) {
if s.IsMatchScene() {
return false
}
return true
@ -814,7 +810,7 @@ func (this *SceneWaitStartStateTienLen) CanChangeTo(s base.SceneState) bool {
// 当前状态能否换桌
func (this *SceneWaitStartStateTienLen) CanChangeCoinScene(s *base.Scene, p *base.Player) bool {
if s.IsMatchScene() || (s.IsCustom() && s.GetNumOfGames() > 0) {
if s.IsMatchScene() {
return false
}
return true