Commit ede88ee9 authored by 18손재민's avatar 18손재민

IObject에 init(Floor floor) 추가함

parent 255c8a17
......@@ -1362,7 +1362,7 @@ Animator:
m_Controller: {fileID: 9100000, guid: eaf238dc35bc3074fa2fffcbcbbe58df, type: 2}
m_CullingMode: 1
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_ApplyRootMotion: 1
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
......@@ -1585,6 +1585,7 @@ SkinnedMeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -2310,6 +2311,7 @@ SkinnedMeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......
......@@ -65,6 +65,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......@@ -87,6 +88,7 @@ GameObject:
m_Component:
- component: {fileID: 6001025753464593565}
- component: {fileID: 439939669}
- component: {fileID: 896145114}
m_Layer: 0
m_Name: camera
m_TagString: Untagged
......@@ -129,6 +131,19 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &896145114
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6001025753464815805}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 00412ad71b8f0e14c9a23118682ee6f9, type: 3}
m_Name:
m_EditorClassIdentifier:
floor: {fileID: 0}
--- !u!1 &6001025753464815807
GameObject:
m_ObjectHideFlags: 0
......@@ -195,6 +210,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
......
This diff is collapsed.
......@@ -6,7 +6,9 @@ public static class Vector2IntExtensions
{
public static bool IsInSquareArea(this Vector2Int a, Vector2Int b, int size)
{
return Mathf.Abs(a.x - b.x) <= size && Mathf.Abs(a.y - b.y) <= size;
bool xdiff = Mathf.Abs(a.x - b.x) <= size;
bool ydiff = Mathf.Abs(a.y - b.y) <= size;
return (xdiff && !ydiff) || (!xdiff && ydiff);
}
public static int ManhattanDistance(this Vector2Int a, Vector2Int b)
......
......@@ -12,6 +12,7 @@ public enum ObjType
public interface IObject
{
void Init(Floor floor);
GameObject GetObject();
Vector2Int GetPos();
ObjType GetType();
......
......@@ -7,6 +7,7 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
[SerializeField]
private Mesh[] mannequinMesh = new Mesh[2];
private Color _color;
[SerializeField] private Floor floor;
public Color Color {
get
{
......@@ -44,7 +45,12 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
}
}
public void Init(bool isWhite)
public void Init(Floor floor)
{
this.floor = floor;
}
public void SetColor(bool isWhite)
{
Color = isWhite ? Color.white : Color.black;
}
......
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