From b90b13621cd29f08ac99c64a185d9ec42f5c80a6 Mon Sep 17 00:00:00 2001 From: Neil Kollack Date: Fri, 15 Apr 2022 13:50:23 -0500 Subject: fix: Enemy colliders update to help movement --- Assets/Prefabs/Enemies/Mummy.prefab | 32 ++++++++- Assets/Prefabs/Enemies/Zombie.prefab | 25 ++++++- Assets/Scenes/Jungle.unity | 130 ----------------------------------- 3 files changed, 53 insertions(+), 134 deletions(-) diff --git a/Assets/Prefabs/Enemies/Mummy.prefab b/Assets/Prefabs/Enemies/Mummy.prefab index 8e3e3e2..293db08 100644 --- a/Assets/Prefabs/Enemies/Mummy.prefab +++ b/Assets/Prefabs/Enemies/Mummy.prefab @@ -14,6 +14,7 @@ GameObject: - component: {fileID: 8919320861035673883} - component: {fileID: 8919320861035673882} - component: {fileID: 8919320861035673863} + - component: {fileID: 565923085} m_Layer: 10 m_Name: Mummy m_TagString: Enemy @@ -130,6 +131,12 @@ MonoBehaviour: jumpForce: 500 damage: 0 groundCheckPoint: {fileID: 8919320863032976505} + stats: + maxHealth: 0 + speedMultiplier: 0 + maxJumps: 0 + jumpForce: 0 + damage: 0 health: 0 --- !u!60 &8919320861035673882 PolygonCollider2D: @@ -141,7 +148,7 @@ PolygonCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} @@ -171,10 +178,13 @@ PolygonCollider2D: - {x: -0.15446186, y: -0.327318} - {x: -0.123628415, y: -0.32778835} - {x: -0.12353212, y: -0.51483876} + - {x: 0.00047017095, y: -0.5159048} + - {x: 0.07817555, y: -0.21324027} + - {x: 0.3111925, y: -0.51857585} - {x: 0.4375, y: -0.515625} - {x: 0.3125105, y: -0.20174655} - - {x: 0.46387002, y: -0.12658024} - - {x: 0.45324838, y: 0.1735998} + - {x: 0.43713662, y: -0.11321354} + - {x: 0.44155252, y: 0.14519536} - {x: 0.27001193, y: 0.3500944} - {x: 0.19489595, y: 0.515625} --- !u!95 &8919320861035673863 @@ -197,6 +207,22 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!70 &565923085 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8919320861035673885} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.12936941, y: 0} + m_Size: {x: 0.6162614, y: 1.03125} + m_Direction: 0 --- !u!1 &8919320863032976504 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Enemies/Zombie.prefab b/Assets/Prefabs/Enemies/Zombie.prefab index 7059ac9..3725290 100644 --- a/Assets/Prefabs/Enemies/Zombie.prefab +++ b/Assets/Prefabs/Enemies/Zombie.prefab @@ -14,6 +14,7 @@ GameObject: - component: {fileID: -1788752809794239346} - component: {fileID: 4349160083341462742} - component: {fileID: -849362167687110816} + - component: {fileID: 861919842} m_Layer: 10 m_Name: Zombie m_TagString: Enemy @@ -130,6 +131,12 @@ MonoBehaviour: jumpForce: 500 damage: 0 groundCheckPoint: {fileID: 2602158014784719401} + stats: + maxHealth: 0 + speedMultiplier: 0 + maxJumps: 0 + jumpForce: 0 + damage: 0 health: 0 --- !u!95 &4349160083341462742 Animator: @@ -161,7 +168,7 @@ PolygonCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} @@ -273,6 +280,22 @@ PolygonCollider2D: - {x: 0.31132627, y: -0.1250647} - {x: 0.27915064, y: -0.12528598} - {x: 0.27996275, y: -0.06255028} +--- !u!70 &861919842 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4799600927363337844} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.012937165, y: -0.08984017} + m_Size: {x: 0.58601534, y: 0.82031965} + m_Direction: 0 --- !u!1 &8191793094342821551 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Jungle.unity b/Assets/Scenes/Jungle.unity index a7246e7..2bb163d 100644 --- a/Assets/Scenes/Jungle.unity +++ b/Assets/Scenes/Jungle.unity @@ -9825,27 +9825,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &565923078 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8919320861035673885, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - m_PrefabInstance: {fileID: 8919320862215231254} - m_PrefabAsset: {fileID: 0} ---- !u!70 &565923085 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 565923078} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.12936941, y: 0} - m_Size: {x: 0.6162614, y: 1.03125} - m_Direction: 0 --- !u!1001 &579896363 PrefabInstance: m_ObjectHideFlags: 0 @@ -11159,27 +11138,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5267721061292888517, guid: 47596d04057f55146bb75d8cea49ccdb, type: 3} m_PrefabInstance: {fileID: 814781393} m_PrefabAsset: {fileID: 0} ---- !u!1 &861919835 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4799600927363337844, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - m_PrefabInstance: {fileID: 2119287057} - m_PrefabAsset: {fileID: 0} ---- !u!70 &861919842 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861919835} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.012937165, y: -0.08984017} - m_Size: {x: 0.58601534, y: 0.82031965} - m_Direction: 0 --- !u!1001 &869826067 PrefabInstance: m_ObjectHideFlags: 0 @@ -325047,10 +325005,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -849362167687110816, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} - propertyPath: m_IsTrigger - value: 1 - objectReference: {fileID: 0} - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3} propertyPath: m_RootOrder value: 9 @@ -325564,90 +325518,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8919320861035673881, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_FlipX - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_IsTrigger - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.size - value: 24 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[15].x - value: 0.00047017095 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[15].y - value: -0.5159048 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[16].x - value: 0.07817555 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[16].y - value: -0.21324027 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[17].x - value: 0.3111925 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[17].y - value: -0.51857585 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[18].x - value: 0.4375 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[18].y - value: -0.515625 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[19].x - value: 0.3125105 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[19].y - value: -0.20174655 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[20].x - value: 0.43713662 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[20].y - value: -0.11321354 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[21].x - value: 0.44155252 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[21].y - value: 0.14519536 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[22].x - value: 0.27001193 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[22].y - value: 0.3500944 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[23].x - value: 0.19489595 - objectReference: {fileID: 0} - - target: {fileID: 8919320861035673882, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[23].y - value: 0.515625 - objectReference: {fileID: 0} - target: {fileID: 8919320861035673885, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3} propertyPath: m_Name value: Mummy -- cgit v1.2.3-70-g09d2