diff --git a/gamesrv/avengers/scenepolicy_avengers.go b/gamesrv/avengers/scenepolicy_avengers.go index eccf5c8..b73f65c 100644 --- a/gamesrv/avengers/scenepolicy_avengers.go +++ b/gamesrv/avengers/scenepolicy_avengers.go @@ -345,7 +345,7 @@ func (this *SceneStateAvengersStart) OnPlayerOp(s *base.Scene, p *base.Player, o } if sceneEx.CheckNeedDestroy() && playerEx.freeTimes <= 0 { //离开有统计 - sceneEx.PlayerLeave(playerEx.Player, common.PlayerLeaveReason_OnDestroy, true) + sceneEx.SceneDestroy(true) return false } switch opcode { @@ -991,7 +991,7 @@ func AvengersCheckAndSaveLog(sceneEx *AvengersSceneData, playerEx *AvengersPlaye playerEx.smallGameWinCoin = 0 if sceneEx.CheckNeedDestroy() && playerEx.freeTimes <= 0 { - sceneEx.PlayerLeave(playerEx.Player, common.PlayerLeaveReason_OnDestroy, true) + sceneEx.SceneDestroy(true) } } diff --git a/gamesrv/caishen/scenepolicy_caishen.go b/gamesrv/caishen/scenepolicy_caishen.go index 5c7a8c3..cf4ba08 100644 --- a/gamesrv/caishen/scenepolicy_caishen.go +++ b/gamesrv/caishen/scenepolicy_caishen.go @@ -351,7 +351,7 @@ func (this *SceneStateCaiShenStart) OnPlayerOp(s *base.Scene, p *base.Player, op } if sceneEx.CheckNeedDestroy() && playerEx.freeTimes <= 0 { //离开有统计 - sceneEx.PlayerLeave(playerEx.Player, common.PlayerLeaveReason_OnDestroy, true) + sceneEx.SceneDestroy(true) return false } switch opcode { @@ -1080,7 +1080,7 @@ func CaiShenCheckAndSaveLog(sceneEx *CaiShenSceneData, playerEx *CaiShenPlayerDa playerEx.smallGameWinCoin = 0 if sceneEx.CheckNeedDestroy() && playerEx.freeTimes <= 0 { - sceneEx.PlayerLeave(playerEx.Player, common.PlayerLeaveReason_OnDestroy, true) + sceneEx.SceneDestroy(true) } } diff --git a/gamesrv/easterisland/scenepolicy_easterisland.go b/gamesrv/easterisland/scenepolicy_easterisland.go index 5c211b7..2474ad4 100644 --- a/gamesrv/easterisland/scenepolicy_easterisland.go +++ b/gamesrv/easterisland/scenepolicy_easterisland.go @@ -346,7 +346,7 @@ func (this *SceneStateEasterIslandStart) OnPlayerOp(s *base.Scene, p *base.Playe } if sceneEx.CheckNeedDestroy() && playerEx.freeTimes <= 0 { //离开有统计 - sceneEx.PlayerLeave(playerEx.Player, common.PlayerLeaveReason_OnDestroy, true) + sceneEx.SceneDestroy(true) return false } switch opcode { @@ -949,7 +949,7 @@ func EasterIslandCheckAndSaveLog(sceneEx *EasterIslandSceneData, playerEx *Easte playerEx.smallGameWinCoin = 0 if sceneEx.CheckNeedDestroy() && playerEx.freeTimes <= 0 { - sceneEx.PlayerLeave(playerEx.Player, common.PlayerLeaveReason_OnDestroy, true) + sceneEx.SceneDestroy(true) } } diff --git a/gamesrv/fortunedragon/scenepolicy_fortunedragon.go b/gamesrv/fortunedragon/scenepolicy_fortunedragon.go index d21a993..747886c 100644 --- a/gamesrv/fortunedragon/scenepolicy_fortunedragon.go +++ b/gamesrv/fortunedragon/scenepolicy_fortunedragon.go @@ -559,7 +559,7 @@ func FortuneDragonAndSaveLog(sceneEx *FortuneDragonSceneData, playerEx *FortuneD playerEx.winCoin = 0 if sceneEx.CheckNeedDestroy() && data.Results[0].FreeNum <= 0 { - sceneEx.PlayerLeave(playerEx.Player, common.PlayerLeaveReason_OnDestroy, true) + sceneEx.SceneDestroy(true) } } func init() { diff --git a/gamesrv/fortuneox/scenepolicy_fortuneox.go b/gamesrv/fortuneox/scenepolicy_fortuneox.go index 35f4165..cfcfc74 100644 --- a/gamesrv/fortuneox/scenepolicy_fortuneox.go +++ b/gamesrv/fortuneox/scenepolicy_fortuneox.go @@ -561,7 +561,7 @@ func FortuneOxAndSaveLog(sceneEx *FortuneOxSceneData, playerEx *FortuneOxPlayerD playerEx.winCoin = 0 if sceneEx.CheckNeedDestroy() && data.Results[0].FreeNum <= 0 { - sceneEx.PlayerLeave(playerEx.Player, common.PlayerLeaveReason_OnDestroy, true) + sceneEx.SceneDestroy(true) } } func init() { diff --git a/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go b/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go index 4664408..60ed868 100644 --- a/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go +++ b/gamesrv/fortunerabbit/scenepolicy_fortunerabbit.go @@ -558,7 +558,7 @@ func FortuneRabbitAndSaveLog(sceneEx *FortuneRabbitSceneData, playerEx *FortuneR playerEx.winCoin = 0 if sceneEx.CheckNeedDestroy() && data.Results[0].FreeNum <= 0 { - sceneEx.PlayerLeave(playerEx.Player, common.PlayerLeaveReason_OnDestroy, true) + sceneEx.SceneDestroy(true) } } func init() { diff --git a/gamesrv/fruits/scenepolicy_fruits.go b/gamesrv/fruits/scenepolicy_fruits.go index f728625..816d476 100644 --- a/gamesrv/fruits/scenepolicy_fruits.go +++ b/gamesrv/fruits/scenepolicy_fruits.go @@ -308,17 +308,7 @@ func (this *SceneBaseStateFruits) OnTick(s *base.Scene) { // } //} if sceneEx.CheckNeedDestroy() { - for _, player := range sceneEx.players { - if !player.IsRob { - if player.freeTimes == 0 && player.maryFreeTimes == 0 { - //离开有统计 - sceneEx.PlayerLeave(player.Player, common.PlayerLeaveReason_OnDestroy, true) - } - } - } - if s.GetRealPlayerCnt() == 0 { - sceneEx.SceneDestroy(true) - } + sceneEx.SceneDestroy(true) } } //if sceneEx, ok := s.GetExtraData().(*FruitsSceneData); ok { diff --git a/gamesrv/iceage/scenepolicy_iceage.go b/gamesrv/iceage/scenepolicy_iceage.go index 5313337..be0ebff 100644 --- a/gamesrv/iceage/scenepolicy_iceage.go +++ b/gamesrv/iceage/scenepolicy_iceage.go @@ -999,7 +999,7 @@ func IceAgeCheckAndSaveLog(sceneEx *IceAgeSceneData, playerEx *IceAgePlayerData) playerEx.smallGameWinCoin = 0 if sceneEx.CheckNeedDestroy() && playerEx.freeTimes <= 0 { - sceneEx.PlayerLeave(playerEx.Player, common.PlayerLeaveReason_OnDestroy, true) + sceneEx.SceneDestroy(true) } } diff --git a/gamesrv/richblessed/scenepolicy_richblessed.go b/gamesrv/richblessed/scenepolicy_richblessed.go index c914417..b5135d6 100644 --- a/gamesrv/richblessed/scenepolicy_richblessed.go +++ b/gamesrv/richblessed/scenepolicy_richblessed.go @@ -311,14 +311,7 @@ func (this *SceneBaseStateRichBlessed) OnTick(s *base.Scene) { // } //} if sceneEx.CheckNeedDestroy() { - for _, player := range sceneEx.players { - if !player.IsRob { - sceneEx.PlayerLeave(player.Player, common.PlayerLeaveReason_OnDestroy, true) - } - } - if s.GetRealPlayerCnt() == 0 { - sceneEx.SceneDestroy(true) - } + sceneEx.SceneDestroy(true) } } //if sceneEx, ok := s.GetExtraData().(*RichBlessedSceneData); ok { diff --git a/gamesrv/tamquoc/scenepolicy_tamquoc.go b/gamesrv/tamquoc/scenepolicy_tamquoc.go index 9d1aac5..a3495d7 100644 --- a/gamesrv/tamquoc/scenepolicy_tamquoc.go +++ b/gamesrv/tamquoc/scenepolicy_tamquoc.go @@ -326,7 +326,7 @@ func (this *SceneStateTamQuocStart) OnPlayerOp(s *base.Scene, p *base.Player, op } if sceneEx.CheckNeedDestroy() && playerEx.freeTimes <= 0 { //离开有统计 - sceneEx.PlayerLeave(playerEx.Player, common.PlayerLeaveReason_OnDestroy, true) + sceneEx.SceneDestroy(true) return false } switch opcode { @@ -835,7 +835,7 @@ func TamQuocCheckAndSaveLog(sceneEx *TamQuocSceneData, playerEx *TamQuocPlayerDa playerEx.smallGameWinCoin = 0 if sceneEx.CheckNeedDestroy() && playerEx.freeTimes <= 0 { - sceneEx.PlayerLeave(playerEx.Player, common.PlayerLeaveReason_OnDestroy, true) + sceneEx.SceneDestroy(true) } }