mark/wirm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

why no work CRI

Browse source
This commit is contained in:
yauwailam 2025-02-14 13:48:11 +08:00
parent 6a98965eb5
commit 85a7096197
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Game/Assets/Scenes/Town.unity
View file

@ -338151,7 +338151,7 @@ BoxCollider:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
m_LayerOverridePriority: 0 m_LayerOverridePriority: 0
m_IsTrigger: 0 m_IsTrigger: 1
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 3 serializedVersion: 3
@ -338165,13 +338165,13 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1801320666} m_GameObject: {fileID: 1801320666}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0.36041337, z: -0, w: 0.9327927} m_LocalRotation: {x: -0, y: -0.36623102, z: -0, w: 0.930524}
m_LocalPosition: {x: 15.56, y: 21.52, z: 1095.91} m_LocalPosition: {x: 15.56, y: 21.52, z: 1095.91}
m_LocalScale: {x: 3.4323885, y: 3.094469, z: 8.355327} m_LocalScale: {x: 3.4323885, y: 3.094469, z: 8.355327}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -42.251, z: 0} m_LocalEulerAnglesHint: {x: 0, y: -42.967, z: 0}
--- !u!43 &1801863514 --- !u!43 &1801863514
Mesh: Mesh:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

4
Game/Assets/Scripts/GoToSchool.cs
View file

@ -95,7 +95,7 @@ public class GoToSchool : MonoBehaviour
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
Debug.Log("Triggered by: " + other.gameObject.name);
if (gameManager.currentDay == 2) if (gameManager.currentDay == 2)
{ {
if (!atPond && other == parkPondTrigger) // Player arrives at pond first if (!atPond && other == parkPondTrigger) // Player arrives at pond first
@ -103,7 +103,7 @@ public class GoToSchool : MonoBehaviour
atPond = true; atPond = true;
StartCoroutine(StayAtPond()); StartCoroutine(StayAtPond());
} }
else if (atPond && !hasTriggered && other == schoolTrigger) // Player can go to school after pond else if (atPond && other == schoolTrigger) // Player can go to school after pond
{ {
hasTriggered = true; hasTriggered = true;
StartCoroutine(FadeInAndLoadScene()); StartCoroutine(FadeInAndLoadScene());

13
Game/Assets/Scripts/LeaveHouseTrigger.cs
View file

@ -42,14 +42,15 @@ public class LeaveHouseTrigger : MonoBehaviour
if (gameManager.currentDay == 1) if (gameManager.currentDay == 1)
{ {
warningText.text = "Should I leave the house? I might not have completed everything..."; warningText.text = "Should I leave the house? I might not have completed everything...";
StartCoroutine(HideWarningPanelAfterDelay(7f)); // can change how long you want the text to show for
} }
if (gameManager.currentDay == 2) else if (gameManager.currentDay == 2)
{ {
warningText.text = "Do I even want to go to school..."; warningText.text = "Do I even want to go to school...";
StartCoroutine(HideWarningPanelAfterDelay(7f)); // can change how long you want the text to show for
} }
StartCoroutine(HideWarningPanelAfterDelay(7f)); // can change how long you want the text to show for
} }
IEnumerator HideWarningPanelAfterDelay(float delay) IEnumerator HideWarningPanelAfterDelay(float delay)
@ -69,13 +70,13 @@ public class LeaveHouseTrigger : MonoBehaviour
public void CancelLeave() public void CancelLeave()
{ {
confirmationPanel.SetActive(false);
warningPanel.SetActive(true);
if (gameManager.currentDay == 2) if (gameManager.currentDay == 2)
{ {
gameManager.IncrementDay(); gameManager.IncrementDay();
SceneManager.LoadScene(Day3); SceneManager.LoadScene(Day3);
} }
confirmationPanel.SetActive(false);
warningPanel.SetActive(true);
} }
} }