diff --git a/Assets/Prefabs/Enemies/Dice_Enemy_0.5.prefab b/Assets/Prefabs/Enemies/Dice_Enemy_0.5.prefab index ee27750..76db030 100644 --- a/Assets/Prefabs/Enemies/Dice_Enemy_0.5.prefab +++ b/Assets/Prefabs/Enemies/Dice_Enemy_0.5.prefab @@ -81,10 +81,10 @@ PrefabInstance: addedObject: {fileID: 2706656759585124322} - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: f1ba87c0234acfa4da251bb1bf3fe963, type: 3} insertIndex: -1 - addedObject: {fileID: 8062664184138368341} + addedObject: {fileID: 7925268694638970133} - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: f1ba87c0234acfa4da251bb1bf3fe963, type: 3} insertIndex: -1 - addedObject: {fileID: 7925268694638970133} + addedObject: {fileID: 8062664184138368341} m_SourcePrefab: {fileID: 100100000, guid: f1ba87c0234acfa4da251bb1bf3fe963, type: 3} --- !u!1 &7324912429315955413 stripped GameObject: @@ -112,6 +112,27 @@ SphereCollider: serializedVersion: 3 m_Radius: 0.034196023 m_Center: {x: 0.000000018626451, y: -0.000000013038518, z: 0.000000014901165} +--- !u!114 &7925268694638970133 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7324912429315955413} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 53554f0e5c5ef3146a592d5dfe75e390, type: 3} + m_Name: + m_EditorClassIdentifier: + hp: 100 + prefab: {fileID: 0} + detectionRadius: 5 + patrollRadius: 3 + damage: 5 + attackRate: 1 + attackRadius: 1 + target: {fileID: 0} + currentState: 0 --- !u!195 &8062664184138368341 NavMeshAgent: m_ObjectHideFlags: 0 @@ -134,24 +155,3 @@ NavMeshAgent: m_BaseOffset: 0.033343785 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 4 ---- !u!114 &7925268694638970133 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7324912429315955413} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 53554f0e5c5ef3146a592d5dfe75e390, type: 3} - m_Name: - m_EditorClassIdentifier: - hp: 100 - prefab: {fileID: 0} - detectionRadius: 5 - patrollRadius: 3 - damage: 5 - attackRate: 1 - attackRadius: 1 - target: {fileID: 0} - currentState: 0 diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index 00f4063..9f1fcdd 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -1445,7 +1445,7 @@ MonoBehaviour: m_OverrideVoxelSize: 0 m_VoxelSize: 0.16666667 m_MinRegionArea: 2 - m_NavMeshData: {fileID: 23800000, guid: 94503c9617c3db6459977597f152b6f0, type: 2} + m_NavMeshData: {fileID: 23800000, guid: fff27cd9af0b5ef4c8ae1bab79c1f9dc, type: 2} m_BuildHeightMesh: 0 --- !u!4 &2057016901 Transform: @@ -1893,5 +1893,5 @@ SceneRoots: - {fileID: 1481837882} - {fileID: 512102627} - {fileID: 1311630986} - - {fileID: 2057016901} - {fileID: 556875446353582464} + - {fileID: 2057016901} diff --git a/Assets/Scenes/Level1/NavMesh-NavMesh Surface.asset b/Assets/Scenes/Level1/NavMesh-NavMesh Surface.asset index 212f88e..5f7a00e 100644 Binary files a/Assets/Scenes/Level1/NavMesh-NavMesh Surface.asset and b/Assets/Scenes/Level1/NavMesh-NavMesh Surface.asset differ diff --git a/Assets/Scenes/Level1/NavMesh-NavMesh Surface.asset.meta b/Assets/Scenes/Level1/NavMesh-NavMesh Surface.asset.meta index f4ceadd..7a0c552 100644 --- a/Assets/Scenes/Level1/NavMesh-NavMesh Surface.asset.meta +++ b/Assets/Scenes/Level1/NavMesh-NavMesh Surface.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 94503c9617c3db6459977597f152b6f0 +guid: fff27cd9af0b5ef4c8ae1bab79c1f9dc NativeFormatImporter: externalObjects: {} mainObjectFileID: 23800000 diff --git a/Assets/Scenes/Level2.meta b/Assets/Scenes/Level2.meta new file mode 100644 index 0000000..fe672d6 --- /dev/null +++ b/Assets/Scenes/Level2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e09188000d3ef1841b8a2d8144b3027f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level2.unity b/Assets/Scenes/Level2.unity index bad2f94..d1756d2 100644 --- a/Assets/Scenes/Level2.unity +++ b/Assets/Scenes/Level2.unity @@ -584,6 +584,70 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5157f3098ce9b0d4282980ecd17a9ec3, type: 3} +--- !u!1 &838620468 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 838620470} + - component: {fileID: 838620469} + m_Layer: 0 + m_Name: NavMesh Surface + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &838620469 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838620468} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SerializedVersion: 0 + m_AgentTypeID: 0 + m_CollectObjects: 0 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 2, z: 0} + m_LayerMask: + serializedVersion: 2 + m_Bits: 64 + m_UseGeometry: 0 + m_DefaultArea: 0 + m_GenerateLinks: 0 + m_IgnoreNavMeshAgent: 1 + m_IgnoreNavMeshObstacle: 1 + m_OverrideTileSize: 0 + m_TileSize: 256 + m_OverrideVoxelSize: 0 + m_VoxelSize: 0.16666667 + m_MinRegionArea: 2 + m_NavMeshData: {fileID: 23800000, guid: 185381146626af94589ceb547d598db4, type: 2} + m_BuildHeightMesh: 0 +--- !u!4 &838620470 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838620468} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &840308436 GameObject: m_ObjectHideFlags: 0 @@ -1568,3 +1632,4 @@ SceneRoots: - {fileID: 237025644} - {fileID: 240409401} - {fileID: 1718333314} + - {fileID: 838620470} diff --git a/Assets/Scenes/Level2/NavMesh-NavMesh Surface.asset b/Assets/Scenes/Level2/NavMesh-NavMesh Surface.asset new file mode 100644 index 0000000..beca10c Binary files /dev/null and b/Assets/Scenes/Level2/NavMesh-NavMesh Surface.asset differ diff --git a/Assets/Scenes/Level2/NavMesh-NavMesh Surface.asset.meta b/Assets/Scenes/Level2/NavMesh-NavMesh Surface.asset.meta new file mode 100644 index 0000000..a71b6c9 --- /dev/null +++ b/Assets/Scenes/Level2/NavMesh-NavMesh Surface.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 185381146626af94589ceb547d598db4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level3.meta b/Assets/Scenes/Level3.meta new file mode 100644 index 0000000..931c1cc --- /dev/null +++ b/Assets/Scenes/Level3.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cdc0a12f4d9770e4aa644986d36ff632 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level3.unity b/Assets/Scenes/Level3.unity index 9d74b1b..60140ee 100644 --- a/Assets/Scenes/Level3.unity +++ b/Assets/Scenes/Level3.unity @@ -268,6 +268,70 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ca28c894d7e3a8e4d8feb70b9a8bb1c4, type: 3} +--- !u!1 &461712683 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 461712685} + - component: {fileID: 461712684} + m_Layer: 0 + m_Name: NavMesh Surface + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &461712684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 461712683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SerializedVersion: 0 + m_AgentTypeID: 0 + m_CollectObjects: 0 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 2, z: 0} + m_LayerMask: + serializedVersion: 2 + m_Bits: 64 + m_UseGeometry: 0 + m_DefaultArea: 0 + m_GenerateLinks: 0 + m_IgnoreNavMeshAgent: 1 + m_IgnoreNavMeshObstacle: 1 + m_OverrideTileSize: 0 + m_TileSize: 256 + m_OverrideVoxelSize: 0 + m_VoxelSize: 0.16666667 + m_MinRegionArea: 2 + m_NavMeshData: {fileID: 23800000, guid: 3d0e0ff361bcb4e4597cc418078273a1, type: 2} + m_BuildHeightMesh: 0 +--- !u!4 &461712685 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 461712683} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &506206182 PrefabInstance: m_ObjectHideFlags: 0 @@ -2234,3 +2298,4 @@ SceneRoots: - {fileID: 923663413} - {fileID: 623453700} - {fileID: 1722346154} + - {fileID: 461712685} diff --git a/Assets/Scenes/Level3/NavMesh-NavMesh Surface.asset b/Assets/Scenes/Level3/NavMesh-NavMesh Surface.asset new file mode 100644 index 0000000..9227187 Binary files /dev/null and b/Assets/Scenes/Level3/NavMesh-NavMesh Surface.asset differ diff --git a/Assets/Scenes/Level3/NavMesh-NavMesh Surface.asset.meta b/Assets/Scenes/Level3/NavMesh-NavMesh Surface.asset.meta new file mode 100644 index 0000000..99e6f1b --- /dev/null +++ b/Assets/Scenes/Level3/NavMesh-NavMesh Surface.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3d0e0ff361bcb4e4597cc418078273a1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 23800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemies/MeleeEnemy.cs b/Assets/Scripts/Enemies/MeleeEnemy.cs index a199be8..f26b037 100644 --- a/Assets/Scripts/Enemies/MeleeEnemy.cs +++ b/Assets/Scripts/Enemies/MeleeEnemy.cs @@ -1,3 +1,4 @@ +using Unity.AI.Navigation; using UnityEngine; using UnityEngine.AI; @@ -16,6 +17,10 @@ public class MeleeEnemy : Enemy float currentDelay = 0; void Start() { + if (!FindFirstObjectByType()) { + Destroy(gameObject); + return; + } target = FindFirstObjectByType(); navMeshAgent = GetComponent(); patrollingTarget = GetPatrollingTarget();