Merge branch 'refactoring' into ref/chaehwan/design-pattern

2024FALL-SWPP · Dec 21, 2024 · 083b1cf · 083b1cf
2 parents a5357d4 + eb9e459
commit 083b1cf
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 21 deletions.
diff --git a/302/Assets/Course Library/Anomalies/Anomaly26/fire/Fire.unitypackage.meta b/302/Assets/Course Library/Anomalies/Anomaly26/fire/Fire.unitypackage.meta
diff --git a/302/Assets/Course Library/Anomalies/Anomaly26/fireEx/fireEx.unitypackage.meta b/302/Assets/Course Library/Anomalies/Anomaly26/fireEx/fireEx.unitypackage.meta
diff --git a/302/Assets/Scripts/SpecificAnomalyManager/Anomaly28Controller.cs b/302/Assets/Scripts/SpecificAnomalyManager/Anomaly28Controller.cs
@@ -37,9 +37,6 @@ public override bool StartAnomaly()
         // Start the gradual swaying with delay
         StartCoroutine(DelayedStartSwaying());
 
-        // Stage always clears after experiencing the anomaly
-        GameManager.Instance.SetStageClear();
-
         // Find the player object and its Rigidbody
         player = GameObject.Find("Player");
         if (player != null)
@@ -143,7 +140,7 @@ private IEnumerator SwayClassroom()
             yield return null; // Wait for the next frame
         }
 
-        ResetAnomaly();
+        GameManager.Instance.SetStageClear(); // ResetAnomaly 간접 호출
     }
 
     private IEnumerator GradualReset()

diff --git a/302/Assets/Scripts/SpecificAnomalyManager/Anomaly30Controller.cs b/302/Assets/Scripts/SpecificAnomalyManager/Anomaly30Controller.cs
@@ -7,7 +7,6 @@ public class Anomaly30Controller : AbstractAnomalyObject
     public override string Name { get; } = "Anomaly30Controller";
     public GameObject[] windows;
     private GameObject player;
-    private GameManager gameManager;
     private Camera mainCamera;
     public VideoClip stormVideoClip;
     public AudioClip stormAudioClip;
@@ -24,7 +23,6 @@ public override bool StartAnomaly()
     {
         bool res = base.StartAnomaly();
 
-        gameManager = GameObject.Find("GameManager").GetComponent<GameManager>();
         player = GameObject.Find("Player");
         mainCamera = Camera.main;
 
@@ -49,6 +47,8 @@ public override bool StartAnomaly()
         // 20초 후 창문 열기 중지
         StartCoroutine(EndWindowsOpeningAfterTime(20f));
 
+        GameManager.Instance.SetStageClear();
+
         return res;
     }
 
@@ -58,7 +58,6 @@ public override bool ResetAnomaly()
 
         isAnomalyStopped = true;
         StopAnomaly();
-        gameManager.SetStageClear();
 
         thunderstorm.DestroyThunderstormScreen(); // 비디오 화면 제거
         CloseAllWindows();