Merge pull request #110 from 2024FALL-SWPP/dongho/build

fix for build
2024FALL-SWPP · Nov 22, 2024 · 8eeb3c6 · 8eeb3c6
2 parents d10d320 + 0e80c63
commit 8eeb3c6
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 1,437 deletions.
diff --git a/302/Assets/Scenes/DefaultGameScene.unity b/302/Assets/Scenes/DefaultGameScene.unity
@@ -42822,7 +42822,7 @@ MonoBehaviour:
   - {fileID: 5650449145146738954, guid: 11a50fb479ce40a4698c9b8f9816f567, type: 3}
   - {fileID: 3233071982878084982, guid: 5156428cd2b781d4dabf6a30befa7685, type: 3}
   - {fileID: 5605359256125054964, guid: 48c8f10abe45bef4098efae902701f34, type: 3}
-  checkSpecificAnomaly: 1
+  checkSpecificAnomaly: 0
   SpecificAnomalyNum: 21
   currentAnomalyInstance: {fileID: 8678062959089499939, guid: 6aadfcd777444a24180cf51012c6e89c, type: 3}
 --- !u!4 &1964216256
@@ -44861,6 +44861,22 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 776868654}
     m_Modifications:
+    - target: {fileID: 3702516718297403109, guid: 2ad42fc20dee64e4ca84470ffa3fb42e, type: 3}
+      propertyPath: m_Size.x
+      value: 0.014028949
+      objectReference: {fileID: 0}
+    - target: {fileID: 3702516718297403109, guid: 2ad42fc20dee64e4ca84470ffa3fb42e, type: 3}
+      propertyPath: m_Center.x
+      value: 0.005311755
+      objectReference: {fileID: 0}
+    - target: {fileID: 3702516718297403109, guid: 2ad42fc20dee64e4ca84470ffa3fb42e, type: 3}
+      propertyPath: m_Center.y
+      value: -0.00002318687
+      objectReference: {fileID: 0}
+    - target: {fileID: 3702516718297403109, guid: 2ad42fc20dee64e4ca84470ffa3fb42e, type: 3}
+      propertyPath: m_Center.z
+      value: 0.006553769
+      objectReference: {fileID: 0}
     - target: {fileID: 7236329420339151181, guid: 2ad42fc20dee64e4ca84470ffa3fb42e, type: 3}
       propertyPath: m_RootOrder
       value: 0

diff --git a/302/Assets/Scenes/GameEndingScene.unity b/302/Assets/Scenes/GameEndingScene.unity
@@ -36160,7 +36160,7 @@ MonoBehaviour:
   endingMusic: {fileID: 8300000, guid: 9aebf01d2434545beaed16f416873b82, type: 3}
   doorSoundSource: {fileID: 1825529824}
   doorOpenSound: {fileID: 8300000, guid: be32529d7bbab4893b4a94fe8899b8a1, type: 3}
-  musicDuration: 30
+  musicDuration: 50
   musicFadeSpeed: 1
 --- !u!65 &1825529826
 BoxCollider:

diff --git a/302/Assets/Scripts/EndingManager.cs b/302/Assets/Scripts/EndingManager.cs
@@ -18,6 +18,15 @@ public class EndingManager : MonoBehaviour
 
     public void OnEnable()
     {
+        GameObject[] objects = GameObject.FindObjectsOfType<GameObject>();
+        foreach (GameObject obj in objects)
+        {
+            if (obj.scene.name == "DontDestroyOnLoad")
+            {
+                Destroy(obj);
+            }
+        }
+
         if(fadeImage != null)
         {
             Color c = fadeImage.color;

diff --git a/302/Assets/Scripts/GameManager.cs b/302/Assets/Scripts/GameManager.cs
@@ -46,6 +46,9 @@ private void InitializeGame()
         gameState = GameState.Playing;
         LoadDefaultScene();
     }
+    public void SetCurrentStage(int stage){
+        currentStage = stage;
+    }
 
     // 스테이지 클리어 조건 달성 시 호출
     public void SetStageClear()

diff --git a/302/Assets/Scripts/PlayerController.cs b/302/Assets/Scripts/PlayerController.cs
@@ -148,15 +148,21 @@ private void HandleInput()
             stepTimer = 0f;
         }
 
-        if (Input.GetKeyDown(KeyCode.E))
+        if (Input.GetKeyDown(KeyCode.I))
         {
             Sleep(); 
         }
-        if (Input.GetKeyDown(KeyCode.R))
+        if (Input.GetKeyDown(KeyCode.O))
         {
             GameManager.Instance.SetStageClear();  // 스테이지 클리어 설정
             Sleep();  // 잠자기
         }
+        if (Input.GetKeyDown(KeyCode.P))
+        {
+            GameManager.Instance.SetCurrentStage(8);
+            GameManager.Instance.SetStageClear();  // 스테이지 클리어 설정
+            Sleep();  // 잠자기
+        }
         // 테스트용 GameOver 키 추가
         if (Input.GetKeyDown(KeyCode.T))
         {

diff --git a/302/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset b/302/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset