Merge pull request #192 from 2024FALL-SWPP/ref/dongho/changeAMName

change name
2024FALL-SWPP · Dec 13, 2024 · 0c2c775 · 0c2c775
2 parents 98ba833 + 744cb16
commit 0c2c775
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 14 deletions.
diff --git a/302/Assets/.DS_Store b/302/Assets/.DS_Store
diff --git a/302/Assets/Scripts/.DS_Store b/302/Assets/Scripts/.DS_Store
diff --git a/302/Assets/Scripts/Fire.cs b/302/Assets/Scripts/Fire.cs
@@ -4,14 +4,14 @@ public class Fire : MonoBehaviour
 {
    [SerializeField] private float extinguishTime = 2f;
 
-   private Anomaly26Manager anomalyManager;
+   private Anomaly26Controller anomalyManager;
    private float currentExtinguishTime = 0f;
    private bool isBeingExtinguished = false;
 
    private void Start()
    {
 
-       anomalyManager = FindObjectOfType<Anomaly26Manager>();
+       anomalyManager = FindObjectOfType<Anomaly26Controller>();
        if (anomalyManager)
        {
        }

diff --git a/302/Assets/Scripts/SideGirl.cs b/302/Assets/Scripts/SideGirl.cs
@@ -8,13 +8,13 @@ public class SideGirl : InteractableObject
 
    private MeshRenderer meshRenderer;
    private bool hasInteracted = false; 
-   private Anomaly5Manager anomalyManager;
+   private Anomaly05Controller anomalyManager;
 
    private void Awake()
    {
        meshRenderer = GetComponent<MeshRenderer>();
        // Anomaly5Manager 찾기
-       anomalyManager = FindObjectOfType<Anomaly5Manager>();
+       anomalyManager = FindObjectOfType<Anomaly05Controller>();
    }
 
    public override void OnInteract()

diff --git a/302/Assets/Scripts/SpecificAnomalyManager/.DS_Store b/302/Assets/Scripts/SpecificAnomalyManager/.DS_Store
diff --git a/...cificAnomalyManager/Anomaly4Controller.cs → ...ificAnomalyManager/Anomaly04Controller.cs b/...cificAnomalyManager/Anomaly4Controller.cs → ...ificAnomalyManager/Anomaly04Controller.cs
@@ -2,14 +2,27 @@
 using System.Collections.Generic;
 using System.Collections;
 
-public class Anomaly4Controller : MonoBehaviour
+public class Anomaly04Controller : AbstractAnomalyComposite
 {
+    public override string Name { get; } = "Anomaly04Controller";
     private GameObject mainLaptop;
     private List<GameObject> laptopList = new List<GameObject>();
 
     void OnEnable()
     {
+        StartAnomaly();
+    }
+
+    public override bool StartAnomaly() {
+        bool res = base.StartAnomaly();
         StartCoroutine(InitializeSequence());
+        return res;
+    }
+
+    public override bool ResetAnomaly() {
+        bool res = base.ResetAnomaly();
+        StartCoroutine(ScreenChangeSequence());
+        return res;
     }
 
     private IEnumerator InitializeSequence()
@@ -94,12 +107,11 @@ private IEnumerator InitializeSequence()
         }
 
         // 5단계: 화면 변경 시퀀스 시작
-        StartCoroutine(ScreenChangeSequence());
+        ResetAnomaly();
     }
 
     private IEnumerator ScreenChangeSequence()
     {
-        // 기존 ScreenChangeSequence 코드는 그대로 유지
         yield return new WaitForSeconds(5f);
         Debug.Log("First screen change after 5 seconds");
 

diff --git a/...AnomalyManager/Anomaly4Controller.cs.meta → ...nomalyManager/Anomaly04Controller.cs.meta b/...AnomalyManager/Anomaly4Controller.cs.meta → ...nomalyManager/Anomaly04Controller.cs.meta
diff --git a/...SpecificAnomalyManager/Anomaly5Manager.cs → ...ificAnomalyManager/Anomaly05Controller.cs b/...SpecificAnomalyManager/Anomaly5Manager.cs → ...ificAnomalyManager/Anomaly05Controller.cs
@@ -2,16 +2,18 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Anomaly5Manager : MonoBehaviour
+public class Anomaly05Controller : AbstractAnomalyComposite
 {
+    public override string Name { get; } = "Anomaly05Controller";
     [SerializeField] private float moveDistance = 5f;
     [SerializeField] private Vector3 spawnPosition;
     [SerializeField] private GameObject sideGirlPrefab;
     [SerializeField] private AudioSource audioSource;
     private GameObject sideGirl;
 
-    void Start() 
+    protected override bool Awake_() 
     {
+        bool res = base.Awake_();
         sideGirl = GameObject.FindGameObjectWithTag("sideGirl");
         if(sideGirl != null) 
         {
@@ -26,6 +28,7 @@ void Start()
         }
 
         StartCoroutine(PlayMusicAfterDelay());
+        return res;
     }
 
     IEnumerator PlayMusicAfterDelay() 

diff --git a/...ficAnomalyManager/Anomaly5Manager.cs.meta → ...nomalyManager/Anomaly05Controller.cs.meta b/...ficAnomalyManager/Anomaly5Manager.cs.meta → ...nomalyManager/Anomaly05Controller.cs.meta
diff --git a/...SpecificAnomalyManager/Anomaly7Manager.cs → ...ificAnomalyManager/Anomaly07Controller.cs b/...SpecificAnomalyManager/Anomaly7Manager.cs → ...ificAnomalyManager/Anomaly07Controller.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-public class Anomaly7Manager : MonoBehaviour
+public class Anomaly07Controller : MonoBehaviour
 {
     [Header("Russian Roulette Settings")]
     [SerializeField] private GameObject gunPrefab;

diff --git a/...ficAnomalyManager/Anomaly7Manager.cs.meta → ...nomalyManager/Anomaly07Controller.cs.meta b/...ficAnomalyManager/Anomaly7Manager.cs.meta → ...nomalyManager/Anomaly07Controller.cs.meta
diff --git a/...SpecificAnomalyManager/Anomaly9Manager.cs → ...ificAnomalyManager/Anomaly09Controller.cs b/...SpecificAnomalyManager/Anomaly9Manager.cs → ...ificAnomalyManager/Anomaly09Controller.cs
@@ -2,7 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-public class Anomaly9Manager : MonoBehaviour 
+public class Anomaly09Controller : MonoBehaviour 
 {
     [Header("Anomaly Settings")]
     public float anomalyDelay = 15f;

diff --git a/...ficAnomalyManager/Anomaly9Manager.cs.meta → ...nomalyManager/Anomaly09Controller.cs.meta b/...ficAnomalyManager/Anomaly9Manager.cs.meta → ...nomalyManager/Anomaly09Controller.cs.meta
diff --git a/...pecificAnomalyManager/Anomaly14Manager.cs → ...ificAnomalyManager/Anomaly14Controller.cs b/...pecificAnomalyManager/Anomaly14Manager.cs → ...ificAnomalyManager/Anomaly14Controller.cs
@@ -4,7 +4,7 @@
 
 using UnityEngine;
 
-public class Anomaly14Manager : MonoBehaviour
+public class Anomaly14Controller : MonoBehaviour
 {
     public GameObject SweaterSitGirlPrefab;
     public GameObject DifferentPrefab; // 다른 종류의 프리팹

diff --git a/...icAnomalyManager/Anomaly14Manager.cs.meta → ...nomalyManager/Anomaly14Controller.cs.meta b/...icAnomalyManager/Anomaly14Manager.cs.meta → ...nomalyManager/Anomaly14Controller.cs.meta
diff --git a/...pecificAnomalyManager/Anomaly25Manager.cs → ...ificAnomalyManager/Anomaly25Controller.cs b/...pecificAnomalyManager/Anomaly25Manager.cs → ...ificAnomalyManager/Anomaly25Controller.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Anomaly25Manager : MonoBehaviour
+public class Anomaly25Controller : MonoBehaviour
 {
    public AudioSource audioSource; // Inspector에서 할당
 

diff --git a/...icAnomalyManager/Anomaly25Manager.cs.meta → ...nomalyManager/Anomaly25Controller.cs.meta b/...icAnomalyManager/Anomaly25Manager.cs.meta → ...nomalyManager/Anomaly25Controller.cs.meta
diff --git a/...pecificAnomalyManager/Anomaly26Manager.cs → ...ificAnomalyManager/Anomaly26Controller.cs b/...pecificAnomalyManager/Anomaly26Manager.cs → ...ificAnomalyManager/Anomaly26Controller.cs
@@ -2,7 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-public class Anomaly26Manager : MonoBehaviour
+public class Anomaly26Controller : MonoBehaviour
 {
    [Header("Fire Settings")]
    [SerializeField] private GameObject firePrefab;

diff --git a/...icAnomalyManager/Anomaly26Manager.cs.meta → ...nomalyManager/Anomaly26Controller.cs.meta b/...icAnomalyManager/Anomaly26Manager.cs.meta → ...nomalyManager/Anomaly26Controller.cs.meta