diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index 0fb7d31..3b1ac07 100644 --- a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -339,7 +339,7 @@ MonoBehaviour: sourceBankPath: Assets/Audio/GodzinaAudio/Build SourceBankPathUnformatted: BankRefreshCooldown: 5 - ShowBankRefreshWindow: 1 + ShowBankRefreshWindow: 0 AutomaticEventLoading: 1 BankLoadType: 0 AutomaticSampleLoading: 0 diff --git a/Assets/Scenes/EndScreen.unity b/Assets/Scenes/EndScreen.unity index 37e2006..c3069a8 100644 --- a/Assets/Scenes/EndScreen.unity +++ b/Assets/Scenes/EndScreen.unity @@ -1315,7 +1315,6 @@ GameObject: - component: {fileID: 698900220} - component: {fileID: 698900219} - component: {fileID: 698900218} - - component: {fileID: 698900221} m_Layer: 5 m_Name: Pause m_TagString: Untagged @@ -1382,36 +1381,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &698900221 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 698900217} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9a6610d2e704f1648819acc8d7460285, type: 3} - m_Name: - m_EditorClassIdentifier: - CollisionTag: - EventReference: - Guid: - Data1: -1297441258 - Data2: 1220895440 - Data3: -487120736 - Data4: -464290932 - Path: snapshot:/Pause - Event: - PlayEvent: 11 - StopEvent: 12 - AllowFadeout: 1 - TriggerOnce: 0 - Preload: 0 - Params: [] - OverrideAttenuation: 0 - OverrideMinDistance: 0 - OverrideMaxDistance: 0 --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -2403,7 +2372,6 @@ GameObject: - component: {fileID: 923988430} - component: {fileID: 923988429} - component: {fileID: 923988428} - - component: {fileID: 923988433} - component: {fileID: 923988434} - component: {fileID: 923988435} m_Layer: 5 @@ -2498,20 +2466,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &923988433 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 923988427} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1d5df0812bf15a4f6b79f667e4849289, type: 3} - m_Name: - m_EditorClassIdentifier: - pauseMenu: {fileID: 698900217} - canPause: 0 --- !u!114 &923988434 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 62ddd15..061dbb3 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -1096,7 +1096,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} + m_FirstSelected: {fileID: 1962453540} m_sendNavigationEvents: 1 m_DragThreshold: 10 --- !u!4 &225296031 @@ -1805,7 +1805,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -50.185852, y: 49.47107} + m_AnchoredPosition: {x: -50.18579, y: 49.47107} m_SizeDelta: {x: 200, y: 30} m_Pivot: {x: 1, y: 0} --- !u!114 &602418734 @@ -1971,7 +1971,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.073335715, g: 0.09034781, b: 0.1509434, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -2212,7 +2212,6 @@ GameObject: - component: {fileID: 698900220} - component: {fileID: 698900219} - component: {fileID: 698900218} - - component: {fileID: 698900221} m_Layer: 5 m_Name: Pause m_TagString: Untagged @@ -2282,36 +2281,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &698900221 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 698900217} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9a6610d2e704f1648819acc8d7460285, type: 3} - m_Name: - m_EditorClassIdentifier: - CollisionTag: - EventReference: - Guid: - Data1: -1297441258 - Data2: 1220895440 - Data3: -487120736 - Data4: -464290932 - Path: snapshot:/Pause - Event: - PlayEvent: 11 - StopEvent: 12 - AllowFadeout: 1 - TriggerOnce: 0 - Preload: 0 - Params: [] - OverrideAttenuation: 0 - OverrideMinDistance: 0 - OverrideMaxDistance: 0 --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -3028,7 +2997,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.073335715, g: 0.09034781, b: 0.1509434, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -3305,7 +3274,6 @@ GameObject: - component: {fileID: 923988430} - component: {fileID: 923988429} - component: {fileID: 923988428} - - component: {fileID: 923988433} - component: {fileID: 923988434} - component: {fileID: 923988435} m_Layer: 5 @@ -3400,20 +3368,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &923988433 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 923988427} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1d5df0812bf15a4f6b79f667e4849289, type: 3} - m_Name: - m_EditorClassIdentifier: - pauseMenu: {fileID: 698900217} - canPause: 0 --- !u!114 &923988434 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Managers/SceneHandler.cs b/Assets/Scripts/Managers/SceneHandler.cs index 5e45211..028f376 100644 --- a/Assets/Scripts/Managers/SceneHandler.cs +++ b/Assets/Scripts/Managers/SceneHandler.cs @@ -21,12 +21,14 @@ void Start() startFadePanel.SetActive(true); Invoke("hideScene", fadeTime); Time.timeScale = 1; + if(FindObjectOfType() != null) pauseManager = FindObjectOfType(); } void hideScene() { startFadePanel.SetActive(false); + if(pauseManager != null) pauseManager.canPause = true; }