버그 수정함

Assets/Scripts/Interactors/CameraTurret.cs

@@ -27,14 +27,13 @@ public class CameraTurret : MonoBehaviour, IObject, IBreakable, IPlayerInteracto
 
     public void Interact(Vector2Int pos)
     {
-        if(!GameManager.inst.isGameOver)
+        if(!GameManager.inst.isGameOver && PlayerController.inst.currentPlayer != null)
         {
             if (Position.IsInAdjacentArea(pos, 1) && MapManager.inst.currentMap.GetWallAtPos((Vector2)(Position + pos) / 2) == null)
             {
                 GameManager.inst.isGameOver = true;
                 StartCoroutine(GameManager.inst.RestartStage());
                 GameManager.inst.uiGenerator.ResetAllClearUIs();
-
                 //TODO : Restart Level
             }
         }

Assets/Scripts/Interactors/Mannequin.cs

@@ -70,18 +70,15 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
         transform.Rotate(new Vector3(0, Random.Range(0, 4) * 90, 0));
         isWhite = true;
         Color = Color.white;
-        if (GameManager.white >= 0) MapManager.inst.currentMap.clearConditions[GameManager.white].IsDone(1);
+        //if (GameManager.white >= 0) MapManager.inst.currentMap.clearConditions[GameManager.white].IsDone(1);
     }
 
     public void SetColor(bool isWhite)
     {
         Color = isWhite ? Color.white : Color.black;
         this.isWhite = isWhite;
-        if (GameManager.black >= 0 && !isWhite)
-        {
-            MapManager.inst.currentMap.clearConditions[GameManager.black].count++;
-            if (GameManager.white >= 0) MapManager.inst.currentMap.clearConditions[GameManager.white].count--;
-        }
+        if (GameManager.black >= 0 && !isWhite) MapManager.inst.currentMap.clearConditions[GameManager.black].count++;
+        if (GameManager.white >= 0 && isWhite) MapManager.inst.currentMap.clearConditions[GameManager.white].count++;
     }
 
     #region IObject Override

Assets/Scripts/Managers/MapManager.cs

@@ -90,15 +90,13 @@ public class MapManager : SingletonBehaviour<MapManager>
                 if (!child.GetComponent<Mannequin>().isWhite && GameManager.black >= 0)
                     currentMap.clearConditions[GameManager.black].IsDone(1);
             }
-
         }
-
-
         for (int i = 0; i < currentMap.startFloors.Count; i++)
             PlayerController.inst.CreatePlayer(currentMap.startFloors[i]);
         for (int i = 0; i < loadedMapData.bullets.Count; i++)
             PlayerController.inst.AddBullet(loadedMapData.bullets[i]);
     }
+
     public IEnumerator Rebaker()
     {
         yield return null;

Assets/Scripts/Map/ClearCondition.cs

@@ -25,14 +25,15 @@ public class ClearCondition
             count += _count;
             goal += _goal;
             assignedClearUI.RefreshClearCondition();
-            if (goal <= count && !isDone)
+            if ((type == ClearType.White || type == ClearType.Black) ? goal == count : goal <= count && !isDone)
             {
                 GameManager.inst.clearCounter--;
                 isDone = true;
+                Debug.Log(GameManager.inst.clearCounter);
                 if (GameManager.inst.clearCounter == 0)
                     GameManager.inst.StartCoroutine(GameManager.inst.ClearStage());
             }
-            else if (goal > count)
+            else if ((type == ClearType.White || type == ClearType.Black) ? goal != count : goal > count && isDone)
             {
                 GameManager.inst.clearCounter++;
                 isDone = false;

Assets/Scripts/Map/Map.cs

@@ -265,9 +265,9 @@ public class Map : MonoBehaviour
             else if(objectGrid[pos].GetType() == ObjType.Mannequin)
             {
                 if(objectGrid[pos].GetObject().GetComponent<Mannequin>().isWhite && GameManager.white >= 0)
-                    clearConditions[GameManager.white].IsDone(0, -1);
+                    clearConditions[GameManager.white].IsDone(-1);
                 else if (!objectGrid[pos].GetObject().GetComponent<Mannequin>().isWhite && GameManager.black >= 0)
-                    clearConditions[GameManager.black].IsDone(0, -1);
+                    clearConditions[GameManager.black].IsDone(-1);
             }
             if(objectGrid[pos].GetType() != ObjType.Mannequin)
                 PlayerController.inst.OnPlayerMove -= objectGrid[pos].GetObject().GetComponent<IPlayerInteractor>().Interact;