Commit 1c531be9 authored by 18손재민's avatar 18손재민

mannequin 고침

parent 63bc07c4
fileFormatVersion: 2
guid: 4731b0a3d859f2d4ab6e84178c528304
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -1432,7 +1432,7 @@ MonoBehaviour: ...@@ -1432,7 +1432,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
head: {fileID: 3233955354714130270} head: {fileID: 3233955354714130270}
shootingArm: {fileID: 0} shootingArm: {fileID: 494213313239917623}
--- !u!1 &494213313239918029 --- !u!1 &494213313239918029
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -324,7 +324,7 @@ Camera: ...@@ -324,7 +324,7 @@ Camera:
y: 0 y: 0
width: 1 width: 1
height: 1 height: 1
near clip plane: 0.3 near clip plane: 0.01
far clip plane: 1000 far clip plane: 1000
field of view: 40 field of view: 40
orthographic: 0 orthographic: 0
......
...@@ -44,8 +44,13 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor ...@@ -44,8 +44,13 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
Color = Color.black; Color = Color.black;
} }
} }
public void Init(bool isWhite) public void Init(Floor floor)
{
this.floor = floor;
}
public void SetColor(bool isWhite)
{ {
Color = isWhite ? Color.white : Color.black; Color = isWhite ? Color.white : Color.black;
} }
......
...@@ -177,19 +177,7 @@ public class Map : MonoBehaviour ...@@ -177,19 +177,7 @@ public class Map : MonoBehaviour
if (!objectGrid.ContainsKey(pos)) if (!objectGrid.ContainsKey(pos))
{ {
objectGrid.Add(pos, Instantiate(MapManager.inst.objects[(int)objType - 1], new Vector3(pos.x, 0, pos.y), Quaternion.identity, objects.transform).GetComponent<IObject>()); objectGrid.Add(pos, Instantiate(MapManager.inst.objects[(int)objType - 1], new Vector3(pos.x, 0, pos.y), Quaternion.identity, objects.transform).GetComponent<IObject>());
switch (objType) objectGrid[pos].Init(GetFloorAtPos(pos));
{
case ObjType.Briefcase:
objectGrid[pos].GetObject().GetComponent<Briefcase>().Init(GetFloorAtPos(pos));
return;
case ObjType.Camera:
objectGrid[pos].GetObject().GetComponent<CameraTurret>().Init(GetFloorAtPos(pos));
return;
//Need to make mannequin init
/*case ObjType.Mannequin:
objectGrid[pos].GetObject().GetComponent<Mannequin>().Init(GetFloorAtPos(pos));
return;*/
}
StartCoroutine(MapManager.inst.Rebaker()); StartCoroutine(MapManager.inst.Rebaker());
} }
else else
......
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