diff --git a/Assets/Scenes/Sam_UnitScene.unity b/Assets/Scenes/Sam_UnitScene.unity index 7455d33..45df74c 100644 --- a/Assets/Scenes/Sam_UnitScene.unity +++ b/Assets/Scenes/Sam_UnitScene.unity @@ -87,180 +87,6 @@ NavMeshSettings: cellSize: .166666672 manualCellSize: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &90076749 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 90076750} - - 33: {fileID: 90076754} - - 135: {fileID: 90076753} - - 23: {fileID: 90076752} - - 114: {fileID: 90076751} - m_Layer: 0 - m_Name: VampireCollisionField - m_TagString: VampirePlayer - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &90076750 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 90076749} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 209133699} - m_RootOrder: 0 ---- !u!114 &90076751 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 90076749} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c1cd93867b8a1d7459a4fb92cac63854, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultHp: 250 - defaultAttack: 100 ---- !u!23 &90076752 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 90076749} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!135 &90076753 -SphereCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 90076749} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 3 - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &90076754 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 90076749} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &110104606 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 110104611} - - 33: {fileID: 110104610} - - 135: {fileID: 110104609} - - 23: {fileID: 110104608} - - 114: {fileID: 110104607} - m_Layer: 0 - m_Name: ZombieCollisionField - m_TagString: ZombiePlayer - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &110104607 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 110104606} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9346fd84c59bd7d42a27381aeed17dbf, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultHp: 250 - defaultAttack: 100 ---- !u!23 &110104608 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 110104606} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!135 &110104609 -SphereCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 110104606} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 3 - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &110104610 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 110104606} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &110104611 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 110104606} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1589771518} - m_RootOrder: 0 --- !u!1 &209133695 GameObject: m_ObjectHideFlags: 0 @@ -274,6 +100,8 @@ GameObject: - 23: {fileID: 209133696} - 143: {fileID: 209133700} - 54: {fileID: 209133701} + - 135: {fileID: 209133703} + - 114: {fileID: 209133702} m_Layer: 0 m_Name: Vampire m_TagString: VampirePlayer @@ -333,8 +161,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 90076750} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 --- !u!143 &209133700 @@ -369,6 +196,31 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 112 m_CollisionDetection: 0 +--- !u!114 &209133702 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 209133695} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1cd93867b8a1d7459a4fb92cac63854, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultHp: 250 + defaultAttack: 100 +--- !u!135 &209133703 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 209133695} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 3 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &215281597 GameObject: m_ObjectHideFlags: 0 @@ -527,6 +379,8 @@ GameObject: - 23: {fileID: 1589771521} - 143: {fileID: 1589771520} - 54: {fileID: 1589771519} + - 135: {fileID: 1589771525} + - 114: {fileID: 1589771524} m_Layer: 0 m_Name: Zombie m_TagString: ZombiePlayer @@ -543,8 +397,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 5, z: 15} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 110104611} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 --- !u!54 &1589771519 @@ -622,6 +475,31 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1589771517} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1589771524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1589771517} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9346fd84c59bd7d42a27381aeed17dbf, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultHp: 250 + defaultAttack: 100 +--- !u!135 &1589771525 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1589771517} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 3 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1674696785 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Unit.cs b/Assets/Scripts/Unit.cs index 1b708ab..b15de44 100644 --- a/Assets/Scripts/Unit.cs +++ b/Assets/Scripts/Unit.cs @@ -41,7 +41,7 @@ public class Unit : MonoBehaviour /// protected void DestroyUnit() { - Destroy(this.transform.parent.gameObject); + Destroy(this.transform.gameObject); } #region Unit properties