Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
This commit is contained in:
commit
c226024401
|
@ -117,6 +117,8 @@ func NewScene(args *CreateSceneParam) *Scene {
|
||||||
KeyGameDif: args.GetDBGameFree().GetGameDif(),
|
KeyGameDif: args.GetDBGameFree().GetGameDif(),
|
||||||
}
|
}
|
||||||
s.CycleID, _ = model.AutoIncGameLogId()
|
s.CycleID, _ = model.AutoIncGameLogId()
|
||||||
|
s.rrVer = ReplayRecorderVer[gameId]
|
||||||
|
s.RecordReplayStart()
|
||||||
s.init()
|
s.init()
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
|
|
|
@ -2765,7 +2765,10 @@ func (this *SceneBilledStateTienLen) OnLeave(s *base.Scene) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
player_data.Clear()
|
player_data.Clear()
|
||||||
if sceneEx.IsMatchScene() {
|
if sceneEx.IsCustom() {
|
||||||
|
player_data.UnmarkFlag(base.PlayerState_WaitNext)
|
||||||
|
}
|
||||||
|
if sceneEx.IsMatchScene() || sceneEx.IsCustom() {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if !player_data.IsOnLine() {
|
if !player_data.IsOnLine() {
|
||||||
|
|
Loading…
Reference in New Issue