diff --git a/Assets/Prefab/Player/ThirdPersonSetup.prefab b/Assets/Prefab/Player/ThirdPersonSetup.prefab index 6627e1261d818893d9420cc2a51772d09da4328f..53623dcaf83bcc54202f8e9e91d0ba8cc208612b 100644 --- a/Assets/Prefab/Player/ThirdPersonSetup.prefab +++ b/Assets/Prefab/Player/ThirdPersonSetup.prefab @@ -553,7 +553,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -350, y: -115} + m_AnchoredPosition: {x: -350, y: -140} m_SizeDelta: {x: 160, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &236181210259729810 diff --git a/Assets/Scenes/Ending.unity b/Assets/Scenes/Ending.unity index 31d33f93bf3bc6064bd13c7a9f72ea6f09f10062..aa7a282a169e28f8191c3597b1c564166b80d47a 100644 --- a/Assets/Scenes/Ending.unity +++ b/Assets/Scenes/Ending.unity @@ -172,7 +172,7 @@ VideoPlayer: m_TargetMaterialRenderer: {fileID: 0} m_TargetMaterialProperty: <noninit> m_RenderMode: 0 - m_AspectRatio: 2 + m_AspectRatio: 5 m_DataSource: 0 m_TimeUpdateMode: 2 m_PlaybackSpeed: 1 @@ -318,7 +318,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -175} + m_AnchoredPosition: {x: 0, y: -225} m_SizeDelta: {x: 400, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &806381733 @@ -655,10 +655,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 94360a2bed8faf008e52b6096a285d05dd1de59f..75c54e051778fad087ffd7cbdc7fd6bf72ccbd78 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.026566118, g: 0.29867774, b: 0.49624193, a: 1} + m_IndirectSpecularColor: {r: 0.026700953, g: 0.29866886, b: 0.49627915, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -8869,6 +8869,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ef6dfba1fdd2faa408369f815fd33d47, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 1681192217} cutsceneCanvas: {fileID: 74940502} cutsceneName: {fileID: 551725695} cutsceneDialogue: {fileID: 777936430} diff --git a/Assets/Scenes/Opening.unity b/Assets/Scenes/Opening.unity index 0b59f6fc664d9e6e17f295a33d57e6b2bceda476..033a80c20f5dcd970aceffa88315cc8eef52d371 100644 --- a/Assets/Scenes/Opening.unity +++ b/Assets/Scenes/Opening.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571328, b: 0.3069217, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -171,10 +171,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -260,7 +260,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -175} + m_AnchoredPosition: {x: 0, y: -225} m_SizeDelta: {x: 400, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &502815651 @@ -701,7 +701,7 @@ VideoPlayer: m_TargetMaterialRenderer: {fileID: 0} m_TargetMaterialProperty: <noninit> m_RenderMode: 0 - m_AspectRatio: 2 + m_AspectRatio: 5 m_DataSource: 0 m_TimeUpdateMode: 2 m_PlaybackSpeed: 1 diff --git a/Assets/Scripts/Managers/CutsceneManager.cs b/Assets/Scripts/Managers/CutsceneManager.cs index 9ff4f06c071aed8c180ee5f60b48b33dfd323421..aba1a90e3d9409e4eaee055e07316a78c3c9d869 100644 --- a/Assets/Scripts/Managers/CutsceneManager.cs +++ b/Assets/Scripts/Managers/CutsceneManager.cs @@ -6,6 +6,7 @@ using UnityEngine.UI; public class CutsceneManager : MonoBehaviour { + public GameObject healthBar; public GameObject cutsceneCanvas; public TextMeshProUGUI cutsceneName; public TextMeshProUGUI cutsceneDialogue; @@ -42,6 +43,7 @@ public class CutsceneManager : MonoBehaviour public void PlayClimax() { + healthBar.SetActive(false); cutsceneCanvas.SetActive(true); StartCoroutine(DisplayDialogues(climax, 5.0f)); } @@ -55,5 +57,6 @@ public class CutsceneManager : MonoBehaviour yield return new WaitForSeconds(autoProceedDelay); } cutsceneCanvas.SetActive(false); + healthBar.SetActive(true); } }