Cleanup branch work
This commit is contained in:
committed by
Michal Pikulski
parent
f88bd0e2c9
commit
3e835ed3b8
@@ -129,15 +129,13 @@ namespace Minigames.DivingForPictures
|
||||
protected override void OnSceneReady()
|
||||
{
|
||||
InitializeGame();
|
||||
CinematicsManager.Instance.OnCinematicStopped += EndGame;
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
// Subscribe to player damage events (this doesn't depend on initialization)
|
||||
PlayerCollisionBehavior.OnDamageTaken += OnPlayerDamageTaken;
|
||||
|
||||
// Validate rope references (this doesn't depend on initialization)
|
||||
// Subscribe to scene-specific events
|
||||
CinematicsManager.Instance.OnCinematicStopped += EndGame;
|
||||
PlayerCollisionBehavior.OnDamageTaken += OnPlayerDamageTaken;
|
||||
OnMonsterSpawned += DoMonsterSpawned;
|
||||
|
||||
// Validate rope references
|
||||
ValidateRopeReferences();
|
||||
|
||||
viewfinderManager = CameraViewfinderManager.Instance;
|
||||
@@ -158,8 +156,6 @@ namespace Minigames.DivingForPictures
|
||||
RegisterExemptFromPhotoSequencePausing(viewfinderPausable);
|
||||
}
|
||||
}
|
||||
|
||||
OnMonsterSpawned += DoMonsterSpawned;
|
||||
}
|
||||
|
||||
protected override void OnDestroy()
|
||||
@@ -168,7 +164,12 @@ namespace Minigames.DivingForPictures
|
||||
|
||||
// Unsubscribe from events when the manager is destroyed
|
||||
PlayerCollisionBehavior.OnDamageTaken -= OnPlayerDamageTaken;
|
||||
OnMonsterSpawned -= DoMonsterSpawned;
|
||||
|
||||
if (CinematicsManager.Instance != null)
|
||||
{
|
||||
CinematicsManager.Instance.OnCinematicStopped -= EndGame;
|
||||
}
|
||||
|
||||
// Unregister all pausable components
|
||||
_pausableComponents.Clear();
|
||||
|
||||
Reference in New Issue
Block a user