머지함

Assets/Scripts/Interactors/Mannequin.cs

@@ -46,6 +46,7 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
         if (bullet is TruthBullet && tempColor == Color.black)
         {
             Color = Color.white;
+            isWhite = true;
             if (GameManager.white >= 0)
                 MapManager.inst.currentMap.clearConditions[GameManager.white].IsDone(1);
             if (GameManager.black >= 0)
@@ -54,6 +55,7 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
         else if (bullet is FakeBullet && tempColor == Color.white)
         {
 			Color = Color.black;
+            isWhite = false;
             if (GameManager.black >= 0)
                 MapManager.inst.currentMap.clearConditions[GameManager.black].IsDone(1);
             if (GameManager.white >= 0)

Assets/Scripts/Map/Map.cs

@@ -251,9 +251,9 @@ public class Map : MonoBehaviour
                 MapManager.inst.currentMap.clearConditions[GameManager.aTurret].IsDone(0, -1);
             else if(objectGrid[pos].GetType() == ObjType.Mannequin)
             {
-                if(objectGrid[pos].GetObject().GetComponent<Mannequin>().Color == Color.white && GameManager.white >= 0)
+                if(objectGrid[pos].GetObject().GetComponent<Mannequin>().isWhite && GameManager.white >= 0)
                     MapManager.inst.currentMap.clearConditions[GameManager.white].IsDone(0, -1);
-                else if (objectGrid[pos].GetObject().GetComponent<Mannequin>().Color == Color.black && GameManager.black >= 0)
+                else if (!objectGrid[pos].GetObject().GetComponent<Mannequin>().isWhite && GameManager.black >= 0)
                     MapManager.inst.currentMap.clearConditions[GameManager.black].IsDone(0, -1);
             }
             Destroy(objectGrid[pos].GetObject());