diff --git a/Assets/Games/Platformer/PlatformerCameraMovement.cs b/Assets/Games/Platformer/PlatformerCameraMovement.cs index 71741b9..af9dadf 100644 --- a/Assets/Games/Platformer/PlatformerCameraMovement.cs +++ b/Assets/Games/Platformer/PlatformerCameraMovement.cs @@ -17,7 +17,7 @@ public class PlatformerCameraMovement : MonoBehaviour private void Update() { - if (players.Count == 0) return; + if (PlayerManager.Instance.players.Count == 0) return; Vector3 playerAverage = Vector3.zero; foreach (GameObject player in players) diff --git a/Assets/PlayerManager.cs b/Assets/PlayerManager.cs index 81c1eb2..a4f22eb 100644 --- a/Assets/PlayerManager.cs +++ b/Assets/PlayerManager.cs @@ -1,12 +1,21 @@ +using System.Collections.Generic; using UnityEngine; using UnityEngine.InputSystem; public class PlayerManager : MonoBehaviour { + public static PlayerManager Instance; + + public List players; [SerializeField] private Vector2 spawnPosition; private PlatformerCameraMovement playerCamera; + private void Awake() + { + Init(); + } + private void Start() { GetComponent().onPlayerJoined += OnPlayerJoined; @@ -18,14 +27,26 @@ public class PlayerManager : MonoBehaviour private void OnPlayerJoined(PlayerInput playerInput) { playerInput.transform.position = spawnPosition; - playerCamera.players.Add(playerInput.gameObject); + players.Add(playerInput.gameObject); print("Player joined"); } private void OnPlayerLeft(PlayerInput playerInput) { Destroy(playerInput.gameObject); - playerCamera.players.Remove(playerInput.gameObject); + players.Remove(playerInput.gameObject); print("Player left"); } + + private void Init() + { + if (Instance == null) + { + Instance = this; + } + else + { + print("A PlayerManager already exists."); + } + } } diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index d1c9097..d5ce6c0 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.32f1 -m_EditorVersionWithRevision: 6000.0.32f1 (b2e806cf271c) +m_EditorVersion: 6000.0.33f1 +m_EditorVersionWithRevision: 6000.0.33f1 (433b0a79340b)