diff --git a/Assets/Scenes/Mountain.unity b/Assets/Scenes/Mountain.unity index b1031c3..07876c9 100644 --- a/Assets/Scenes/Mountain.unity +++ b/Assets/Scenes/Mountain.unity @@ -2163,7 +2163,7 @@ MonoBehaviour: m_EditorClassIdentifier: Player: {fileID: 0} _playerPrefab: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3} - _spawnLocation: {fileID: 2126766553} + _spawnLocation: {fileID: 2091088279} --- !u!4 &1349856017 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Temple.unity b/Assets/Scenes/Temple.unity index a972d98..b2aa5b4 100644 --- a/Assets/Scenes/Temple.unity +++ b/Assets/Scenes/Temple.unity @@ -635,6 +635,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _spawnPoint: {fileID: 555652473} + camerasToActivate: + - {fileID: 1937304112} + - {fileID: 1398872941} --- !u!54 &277285390 Rigidbody: m_ObjectHideFlags: 0 @@ -1216,6 +1219,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _spawnPoint: {fileID: 1892337347} + camerasToActivate: + - {fileID: 1093988513} + - {fileID: 764480567} --- !u!64 &347813201 MeshCollider: m_ObjectHideFlags: 0 @@ -1575,6 +1581,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _spawnPoint: {fileID: 344075218} + camerasToActivate: + - {fileID: 624656345} + - {fileID: 637313013} --- !u!64 &433733227 MeshCollider: m_ObjectHideFlags: 0 @@ -2094,6 +2103,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _spawnPoint: {fileID: 897072366} + camerasToActivate: + - {fileID: 912230739} + - {fileID: 1439277850} --- !u!1 &555652472 GameObject: m_ObjectHideFlags: 0 @@ -5493,6 +5505,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _spawnPoint: {fileID: 1256977019} + camerasToActivate: [] --- !u!64 &1208419146 MeshCollider: m_ObjectHideFlags: 0 @@ -7167,7 +7180,6 @@ GameObject: - component: {fileID: 1510650685} - component: {fileID: 1510650684} - component: {fileID: 1510650688} - - component: {fileID: 1510650689} m_Layer: 0 m_Name: Temple A Zone m_TagString: Untagged @@ -7281,18 +7293,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: backgroundMusic: {fileID: 8300000, guid: 3b5765e9830162448a81b1ba84c5dd91, type: 3} ---- !u!114 &1510650689 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1510650682} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1527842954 GameObject: m_ObjectHideFlags: 0 @@ -7405,6 +7405,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _spawnPoint: {fileID: 545401561} + camerasToActivate: + - {fileID: 1398872941} + - {fileID: 1937304112} --- !u!54 &1539073953 Rigidbody: m_ObjectHideFlags: 0 @@ -10417,6 +10420,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _spawnPoint: {fileID: 2135955434} + camerasToActivate: + - {fileID: 103420262} + - {fileID: 1391445806} --- !u!54 &2084146570 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Camera/ActivateCamera.cs b/Assets/Scripts/Camera/ActivateCamera.cs deleted file mode 100644 index 4dd6765..0000000 --- a/Assets/Scripts/Camera/ActivateCamera.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections; -using UnityEngine; - -namespace Scampz.GameJam.Assets.Scripts -{ - public class ActivateCamera : MonoBehaviour - { - [SerializeField] - private Camera[] cameras; - - private void OnTriggerEnter(Collider collider) - { - if (collider.CompareTag("Player")) - StartCoroutine(ActivateCameras()); - } - - private IEnumerator ActivateCameras() - { - yield return null; - } - } -} diff --git a/Assets/Scripts/Camera/ActivateCamera.cs.meta b/Assets/Scripts/Camera/ActivateCamera.cs.meta deleted file mode 100644 index 9fc90d8..0000000 --- a/Assets/Scripts/Camera/ActivateCamera.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8d750c023dab0b040a63e345c8b2830d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/GameManager/GameManager.cs b/Assets/Scripts/GameManager/GameManager.cs index 9265ac4..1f1aeb5 100644 --- a/Assets/Scripts/GameManager/GameManager.cs +++ b/Assets/Scripts/GameManager/GameManager.cs @@ -30,9 +30,10 @@ namespace Scampz.GameJam private IEnumerator LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode) { _levelChanger.FadeAnimation(); - yield return new WaitForSecondsRealtime(3f); - + yield return null; var loadSceneOperation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode); + yield return new WaitForSeconds(3f); + loadSceneOperation.allowSceneActivation = false; while (!loadSceneOperation.isDone) {