From fcd8d1aa7a670f5cd2b856bcba3cc041ce1f0f52 Mon Sep 17 00:00:00 2001 From: yauwailam Date: Sat, 15 Feb 2025 22:07:50 +0800 Subject: [PATCH] made rain sound on day 2 and day fade if day 2 no leave house --- Game/Assets/Scenes/Day2.unity | 197 ++++++++++++++++++++++- Game/Assets/Scenes/Town.unity | 5 +- Game/Assets/Scripts/GoToSchool.cs | 9 +- Game/Assets/Scripts/LeaveHouseTrigger.cs | 43 ++++- 4 files changed, 247 insertions(+), 7 deletions(-) diff --git a/Game/Assets/Scenes/Day2.unity b/Game/Assets/Scenes/Day2.unity index 016ae2d..759db02 100644 --- a/Game/Assets/Scenes/Day2.unity +++ b/Game/Assets/Scenes/Day2.unity @@ -237295,6 +237295,94 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1113047103} m_CullTransparentMesh: 1 +--- !u!1 &1113907443 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1113907444} + - component: {fileID: 1113907447} + - component: {fileID: 1113907446} + - component: {fileID: 1113907445} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1113907444 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113907443} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1609619685} + 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: -32.682312, y: 55.911926} + m_SizeDelta: {x: 1627.7029, y: 1226.5745} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &1113907445 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113907443} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &1113907446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113907443} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1113907447 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113907443} + m_CullTransparentMesh: 1 --- !u!43 &1114216815 Mesh: m_ObjectHideFlags: 0 @@ -276514,10 +276602,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: nextSceneName: Town - day3: + day3: Day3 confirmationPanel: {fileID: 347656170} warningText: {fileID: 1839460625} warningPanel: {fileID: 1776114648} + nextdayPanel: {fileID: 1609619681} + fadeCanvasGroup: {fileID: 1113907445} + fadeDuration: 1 + displayDuration: 5 --- !u!43 &1312761996 Mesh: m_ObjectHideFlags: 0 @@ -337786,6 +337878,108 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &1609619681 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1609619685} + - component: {fileID: 1609619684} + - component: {fileID: 1609619683} + - component: {fileID: 1609619682} + m_Layer: 5 + m_Name: Next day + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1609619682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609619681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1609619683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609619681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1609619684 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609619681} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1609619685 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609619681} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1113907444} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!43 &1610330924 Mesh: m_ObjectHideFlags: 0 @@ -446071,3 +446265,4 @@ SceneRoots: - {fileID: 22449398} - {fileID: 916477375} - {fileID: 260885043} + - {fileID: 1609619685} diff --git a/Game/Assets/Scenes/Town.unity b/Game/Assets/Scenes/Town.unity index 458f669..6815941 100644 --- a/Game/Assets/Scenes/Town.unity +++ b/Game/Assets/Scenes/Town.unity @@ -137145,7 +137145,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!82 &684358111 AudioSource: m_ObjectHideFlags: 0 @@ -137157,7 +137157,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 7f3e3748816e4f243ad0627a9d36e365, type: 3} - m_PlayOnAwake: 1 + m_PlayOnAwake: 0 m_Volume: 0.601 m_Pitch: 1 Loop: 1 @@ -266549,6 +266549,7 @@ MonoBehaviour: particleEffects: - {fileID: 1180594040} - {fileID: 803565964} + rainAudioSource: {fileID: 684358111} storyPanelUI: {fileID: 1431178180} storyText: {fileID: 1809346053} parkPondTrigger: {fileID: 1801320667} diff --git a/Game/Assets/Scripts/GoToSchool.cs b/Game/Assets/Scripts/GoToSchool.cs index 6b0afcf..d7a75a3 100644 --- a/Game/Assets/Scripts/GoToSchool.cs +++ b/Game/Assets/Scripts/GoToSchool.cs @@ -22,6 +22,8 @@ public class GoToSchool : MonoBehaviour public AudioLoop audioLoop; public ParticleSystem[] particleEffects; + + public AudioSource rainAudioSource; // Defines UI references [Header("UI References")] public GameObject storyPanelUI; @@ -79,7 +81,12 @@ public class GoToSchool : MonoBehaviour effect.gameObject.SetActive(true); // Ensure the GameObject is active effect.Play(); // Play each particle system } - + + if (rainAudioSource != null) + { + rainAudioSource.volume = 0.8f; + rainAudioSource.Play(); + } // PostProcessingManager.Instance.TriggerEffect("Panic"); break; } diff --git a/Game/Assets/Scripts/LeaveHouseTrigger.cs b/Game/Assets/Scripts/LeaveHouseTrigger.cs index 1dc6aa5..cce7398 100644 --- a/Game/Assets/Scripts/LeaveHouseTrigger.cs +++ b/Game/Assets/Scripts/LeaveHouseTrigger.cs @@ -11,18 +11,25 @@ using UnityEngine.SceneManagement; public class LeaveHouseTrigger : MonoBehaviour { - // Name of the next scene + public string nextSceneName; public string day3; public GameObject confirmationPanel; public TMP_Text warningText; public GameObject warningPanel; + public GameObject nextdayPanel; + + public CanvasGroup fadeCanvasGroup; + public float fadeDuration = 1f; + public float displayDuration = 5f; + // Start is called before the first frame update private void Start() { confirmationPanel.SetActive(false); warningText.text = ""; + nextdayPanel.SetActive(false); } private void OnTriggerEnter(Collider other) @@ -78,11 +85,41 @@ public class LeaveHouseTrigger : MonoBehaviour { if (GameManager.Instance.CurrentDay == 2) { + nextdayPanel.SetActive(true); + StartCoroutine(FadeInAndLoadScene()); GameManager.Instance.IncrementDay(); - SceneManager.LoadScene(day3); + } confirmationPanel.SetActive(false); - warningPanel.SetActive(true); + + } + + private IEnumerator FadeInAndLoadScene() + { + yield return StartCoroutine(Fade(0f, 1f, fadeDuration)); + yield return new WaitForSeconds(displayDuration); + + SceneManager.LoadScene(day3); + + yield return new WaitForSeconds(1f); // Small delay to ensure scene transition + } + private IEnumerator Fade(float startAlpha, float endAlpha, float duration) + { + var elapsed = 0f; + fadeCanvasGroup.alpha = startAlpha; + + + while (elapsed < duration) + { + elapsed += Time.deltaTime; + var t = elapsed / duration; + + fadeCanvasGroup.alpha = Mathf.Lerp(startAlpha, endAlpha, t); + + yield return null; + } + + fadeCanvasGroup.alpha = endAlpha; } } \ No newline at end of file