Skip to content

M
man-in-the-mirror
Commit b5ea9c89 authored by 18손재민's avatar 18손재민
Browse files
Options

Merge branch 'mirror'

parents 185da338 3918b704
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 4 deletions
Assets/Scripts/Map/Mirror.cs
View file @ b5ea9c89
...@@ -157,7 +157,12 @@ public class Mirror : Wall, IBulletInteractor, IBreakable ...@@ -157,7 +157,12 @@ public class Mirror : Wall, IBulletInteractor, IBreakable
MapManager.inst.currentMap.CreateFloor(oppFloorPos, floor.isGoalFloor); MapManager.inst.currentMap.CreateFloor(oppFloorPos, floor.isGoalFloor);
MapManager.inst.currentMap.RemoveObject(oppFloorPos); MapManager.inst.currentMap.RemoveObject(oppFloorPos);
if (floor.objOnFloor != null) if (floor.objOnFloor != null)
MapManager.inst.currentMap.CreateObject(oppFloorPos, floor.objOnFloor.GetType(), (floor.objOnFloor.GetType() != ObjType.Mannequin ? true : ((Mannequin)floor.objOnFloor).isWhite)); {
if (floor.objOnFloor.GetType() == ObjType.Briefcase)
MapManager.inst.currentMap.CreateObject(oppFloorPos, ObjType.Briefcase, ((Briefcase)floor.objOnFloor).dropBullet);
else
MapManager.inst.currentMap.CreateObject(oppFloorPos, floor.objOnFloor.GetType(), (floor.objOnFloor.GetType() != ObjType.Mannequin ? true : ((Mannequin)floor.objOnFloor).isWhite));
}
if (floor.isPlayerOn) if (floor.isPlayerOn)
PlayerController.inst.CreatePlayer(oppFloorPos); PlayerController.inst.CreatePlayer(oppFloorPos);
} }
...@@ -186,7 +191,12 @@ public class Mirror : Wall, IBulletInteractor, IBreakable ...@@ -186,7 +191,12 @@ public class Mirror : Wall, IBulletInteractor, IBreakable
MapManager.inst.currentMap.CreateFloor(oppFloorPos, floor.isGoalFloor); MapManager.inst.currentMap.CreateFloor(oppFloorPos, floor.isGoalFloor);
MapManager.inst.currentMap.RemoveObject(oppFloorPos); MapManager.inst.currentMap.RemoveObject(oppFloorPos);
if (floor.objOnFloor != null) if (floor.objOnFloor != null)
MapManager.inst.currentMap.CreateObject(oppFloorPos, floor.objOnFloor.GetType(), (floor.objOnFloor.GetType() != ObjType.Mannequin ? true : ((Mannequin)floor.objOnFloor).isWhite)); {
if (floor.objOnFloor.GetType() == ObjType.Briefcase)
MapManager.inst.currentMap.CreateObject(oppFloorPos, ObjType.Briefcase, ((Briefcase)floor.objOnFloor).dropBullet);
else
MapManager.inst.currentMap.CreateObject(oppFloorPos, floor.objOnFloor.GetType(), (floor.objOnFloor.GetType() != ObjType.Mannequin ? true : ((Mannequin)floor.objOnFloor).isWhite));
}
if (floor.isPlayerOn) if (floor.isPlayerOn)
PlayerController.inst.CreatePlayer(oppFloorPos); PlayerController.inst.CreatePlayer(oppFloorPos);
} }
...@@ -215,7 +225,12 @@ public class Mirror : Wall, IBulletInteractor, IBreakable ...@@ -215,7 +225,12 @@ public class Mirror : Wall, IBulletInteractor, IBreakable
MapManager.inst.currentMap.CreateFloor(oppFloorPos, floor.isGoalFloor); MapManager.inst.currentMap.CreateFloor(oppFloorPos, floor.isGoalFloor);
MapManager.inst.currentMap.RemoveObject(oppFloorPos); MapManager.inst.currentMap.RemoveObject(oppFloorPos);
if (floor.objOnFloor != null) if (floor.objOnFloor != null)
MapManager.inst.currentMap.CreateObject(oppFloorPos, floor.objOnFloor.GetType(), (floor.objOnFloor.GetType() != ObjType.Mannequin ? true : ((Mannequin)floor.objOnFloor).isWhite)); {
if (floor.objOnFloor.GetType() == ObjType.Briefcase)
MapManager.inst.currentMap.CreateObject(oppFloorPos, ObjType.Briefcase, ((Briefcase)floor.objOnFloor).dropBullet);
else
MapManager.inst.currentMap.CreateObject(oppFloorPos, floor.objOnFloor.GetType(), (floor.objOnFloor.GetType() != ObjType.Mannequin ? true : ((Mannequin)floor.objOnFloor).isWhite));
}
if (floor.isPlayerOn) if (floor.isPlayerOn)
PlayerController.inst.CreatePlayer(oppFloorPos); PlayerController.inst.CreatePlayer(oppFloorPos);
} }
...@@ -244,7 +259,12 @@ public class Mirror : Wall, IBulletInteractor, IBreakable ...@@ -244,7 +259,12 @@ public class Mirror : Wall, IBulletInteractor, IBreakable
MapManager.inst.currentMap.CreateFloor(oppFloorPos, floor.isGoalFloor); MapManager.inst.currentMap.CreateFloor(oppFloorPos, floor.isGoalFloor);
MapManager.inst.currentMap.RemoveObject(oppFloorPos); MapManager.inst.currentMap.RemoveObject(oppFloorPos);
if (floor.objOnFloor != null) if (floor.objOnFloor != null)
MapManager.inst.currentMap.CreateObject(oppFloorPos, floor.objOnFloor.GetType(), (floor.objOnFloor.GetType() != ObjType.Mannequin ? true : ((Mannequin)floor.objOnFloor).isWhite)); {
if (floor.objOnFloor.GetType() == ObjType.Briefcase)
MapManager.inst.currentMap.CreateObject(oppFloorPos, ObjType.Briefcase, ((Briefcase)floor.objOnFloor).dropBullet);
else
MapManager.inst.currentMap.CreateObject(oppFloorPos, floor.objOnFloor.GetType(), (floor.objOnFloor.GetType() != ObjType.Mannequin ? true : ((Mannequin)floor.objOnFloor).isWhite));
}
if (floor.isPlayerOn) if (floor.isPlayerOn)
PlayerController.inst.CreatePlayer(oppFloorPos); PlayerController.inst.CreatePlayer(oppFloorPos);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment