From 9d8dd28efddea3ed9b8b17bfd5c7b9e836a24ef0 Mon Sep 17 00:00:00 2001 From: AlexanderT Date: Fri, 10 Oct 2025 10:07:08 +0200 Subject: [PATCH] Added sound and cinematics managers to boot settings --- .../Runtime/CustomBootSettings_Runtime.asset | 2 ++ .../Prefabs/Managers/CinematicsManager.prefab | 33 +++++++++++++++++++ .../Managers/CinematicsManager.prefab.meta | 7 ++++ Assets/Prefabs/Managers/SoundManager.prefab | 33 +++++++++++++++++++ .../Prefabs/Managers/SoundManager.prefab.meta | 7 ++++ Assets/Scripts/Cinematics.meta | 8 +++++ .../Scripts/Cinematics/CinematicsManager.cs | 16 +++++++++ .../Cinematics/CinematicsManager.cs.meta | 2 ++ .../Quarry/AnneLise/TakePhotoState.cs | 2 +- 9 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 Assets/Prefabs/Managers/CinematicsManager.prefab create mode 100644 Assets/Prefabs/Managers/CinematicsManager.prefab.meta create mode 100644 Assets/Prefabs/Managers/SoundManager.prefab create mode 100644 Assets/Prefabs/Managers/SoundManager.prefab.meta create mode 100644 Assets/Scripts/Cinematics.meta create mode 100644 Assets/Scripts/Cinematics/CinematicsManager.cs create mode 100644 Assets/Scripts/Cinematics/CinematicsManager.cs.meta diff --git a/Assets/Data/Bootstrap/Runtime/CustomBootSettings_Runtime.asset b/Assets/Data/Bootstrap/Runtime/CustomBootSettings_Runtime.asset index 93de3834..3130718a 100644 --- a/Assets/Data/Bootstrap/Runtime/CustomBootSettings_Runtime.asset +++ b/Assets/Data/Bootstrap/Runtime/CustomBootSettings_Runtime.asset @@ -20,3 +20,5 @@ MonoBehaviour: - {fileID: 7644433920135100480, guid: 12d242e44fe80ab44af852254b7cab0f, type: 3} - {fileID: 1794231825201849485, guid: 6fb0d7fc6faad154b8c3e3cb7abb7c15, type: 3} - {fileID: 6399527186463168339, guid: ac41583865245bc4bb3de6c15929b9fc, type: 3} + - {fileID: 2755712733105741372, guid: 70e6fca1164d9a140b271f4261f1f023, type: 3} + - {fileID: 5034240524438268576, guid: adbb9bfd5489f3f4995966535ca5f24b, type: 3} diff --git a/Assets/Prefabs/Managers/CinematicsManager.prefab b/Assets/Prefabs/Managers/CinematicsManager.prefab new file mode 100644 index 00000000..2a4e4c0d --- /dev/null +++ b/Assets/Prefabs/Managers/CinematicsManager.prefab @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2755712733105741372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5006436358316225511} + m_Layer: 0 + m_Name: CinematicsManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5006436358316225511 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2755712733105741372} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -43.31334, y: 8.42863, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Managers/CinematicsManager.prefab.meta b/Assets/Prefabs/Managers/CinematicsManager.prefab.meta new file mode 100644 index 00000000..590248e6 --- /dev/null +++ b/Assets/Prefabs/Managers/CinematicsManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 70e6fca1164d9a140b271f4261f1f023 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Managers/SoundManager.prefab b/Assets/Prefabs/Managers/SoundManager.prefab new file mode 100644 index 00000000..ac97601d --- /dev/null +++ b/Assets/Prefabs/Managers/SoundManager.prefab @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5034240524438268576 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 536416456044738252} + m_Layer: 0 + m_Name: SoundManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &536416456044738252 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5034240524438268576} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -43.31334, y: 8.42863, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Managers/SoundManager.prefab.meta b/Assets/Prefabs/Managers/SoundManager.prefab.meta new file mode 100644 index 00000000..e3960bcc --- /dev/null +++ b/Assets/Prefabs/Managers/SoundManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: adbb9bfd5489f3f4995966535ca5f24b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Cinematics.meta b/Assets/Scripts/Cinematics.meta new file mode 100644 index 00000000..ef95991b --- /dev/null +++ b/Assets/Scripts/Cinematics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd3ff810975d29648abc89dc8361e5b3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Cinematics/CinematicsManager.cs b/Assets/Scripts/Cinematics/CinematicsManager.cs new file mode 100644 index 00000000..427f3af5 --- /dev/null +++ b/Assets/Scripts/Cinematics/CinematicsManager.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class CinematicsManager : MonoBehaviour +{ + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Cinematics/CinematicsManager.cs.meta b/Assets/Scripts/Cinematics/CinematicsManager.cs.meta new file mode 100644 index 00000000..19d18a55 --- /dev/null +++ b/Assets/Scripts/Cinematics/CinematicsManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4e3cd69fd77a22640aa40e691d8d6c26 \ No newline at end of file diff --git a/Assets/Scripts/StateMachines/Quarry/AnneLise/TakePhotoState.cs b/Assets/Scripts/StateMachines/Quarry/AnneLise/TakePhotoState.cs index 520c1919..96b20268 100644 --- a/Assets/Scripts/StateMachines/Quarry/AnneLise/TakePhotoState.cs +++ b/Assets/Scripts/StateMachines/Quarry/AnneLise/TakePhotoState.cs @@ -34,7 +34,7 @@ public class TakePhotoState : State playerTouchController.OnArrivedAtTarget += PlayerHasArrived; newPlayerPosition = new Vector3(playerTargetObject.transform.position.x, playerTargetObject.transform.position.y, playerTargetObject.transform.position.z); - //playerTouchController.InterruptMoveTo(); + playerTouchController.InterruptMoveTo(); playerTouchController.MoveToAndNotify(newPlayerPosition); InputManager.Instance.SetInputMode(InputMode.InputDisabled); }