aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcross28 <icross028@gmail.com>2022-04-15 04:43:23 -0500
committercross28 <icross028@gmail.com>2022-04-15 04:43:23 -0500
commite50fc523b25010582c158b7a307e3e7b1db7fb47 (patch)
tree34a2b7880004b456ea51159b6b47c87098c5bb4a
parent34cb39ef5d6ec1f19b5509ae58f4e87f0774bd6b (diff)
feat: Added zombie idle and moving animation
-rw-r--r--Assets/Animations/Enemies/Zombie/Attack.anim86
-rw-r--r--Assets/Animations/Enemies/Zombie/Attack.anim.meta8
-rw-r--r--Assets/Animations/Enemies/Zombie/Idle.anim46
-rw-r--r--Assets/Animations/Enemies/Zombie/Moving.anim46
-rw-r--r--Assets/Animations/Enemies/Zombie/Zombie.controller139
-rw-r--r--Assets/Animations/MontanaJohns/MontanaJohns.controller8
-rw-r--r--Assets/Prefabs/Projectile.prefab2
-rw-r--r--Assets/Scenes/Jungle.unity28
-rw-r--r--Assets/Scripts/Actors/Enemy.cs12
-rw-r--r--Assets/Scripts/Projectile.cs9
10 files changed, 310 insertions, 74 deletions
diff --git a/Assets/Animations/Enemies/Zombie/Attack.anim b/Assets/Animations/Enemies/Zombie/Attack.anim
new file mode 100644
index 0000000..43658a5
--- /dev/null
+++ b/Assets/Animations/Enemies/Zombie/Attack.anim
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Attack
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 2078424329, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.05
+ value: {fileID: 828034450, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.11666667
+ value: {fileID: -302372421, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.16666667
+ value: {fileID: -85932321, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.21666667
+ value: {fileID: 1639612969, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.28333333
+ value: {fileID: -1764084075, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.33333334
+ value: {fileID: -560229937, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 2078424329, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: 828034450, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -302372421, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -85932321, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: 1639612969, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -1764084075, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -560229937, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.35000002
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Animations/Enemies/Zombie/Attack.anim.meta b/Assets/Animations/Enemies/Zombie/Attack.anim.meta
new file mode 100644
index 0000000..ef6267c
--- /dev/null
+++ b/Assets/Animations/Enemies/Zombie/Attack.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 46751831936f6464b867e572e5529105
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Animations/Enemies/Zombie/Idle.anim b/Assets/Animations/Enemies/Zombie/Idle.anim
index c89c100..b93a7b9 100644
--- a/Assets/Animations/Enemies/Zombie/Idle.anim
+++ b/Assets/Animations/Enemies/Zombie/Idle.anim
@@ -17,26 +17,62 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
- m_PPtrCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.1
+ value: {fileID: -1785555725, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.21666667
+ value: {fileID: -2003769690, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.31666666
+ value: {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.41666666
+ value: {fileID: -1702410671, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.53333336
+ value: {fileID: -1785555725, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.6166667
+ value: {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.68333334
+ value: {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
- pptrCurveMapping: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -1785555725, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -2003769690, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -1702410671, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -1785555725, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: 606266643, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 1
+ m_StopTime: 0.7
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 0
+ m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
diff --git a/Assets/Animations/Enemies/Zombie/Moving.anim b/Assets/Animations/Enemies/Zombie/Moving.anim
index e8c12fb..a091f1f 100644
--- a/Assets/Animations/Enemies/Zombie/Moving.anim
+++ b/Assets/Animations/Enemies/Zombie/Moving.anim
@@ -17,26 +17,62 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
- m_PPtrCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: -459294537, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.06666667
+ value: {fileID: -932836783, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.13333334
+ value: {fileID: 2098029280, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.2
+ value: {fileID: -948577929, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.26666668
+ value: {fileID: -1063589079, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.33333334
+ value: {fileID: -1106049903, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.41666666
+ value: {fileID: -1787249033, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - time: 0.5
+ value: {fileID: -1687654213, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
- pptrCurveMapping: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: -459294537, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -932836783, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: 2098029280, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -948577929, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -1063589079, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -1106049903, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -1787249033, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
+ - {fileID: -1687654213, guid: 5b8b5784d85f20e4db4cd6c05e225e16, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 1
+ m_StopTime: 0.51666665
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 0
+ m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
diff --git a/Assets/Animations/Enemies/Zombie/Zombie.controller b/Assets/Animations/Enemies/Zombie/Zombie.controller
index 3f9455b..7cc8d1f 100644
--- a/Assets/Animations/Enemies/Zombie/Zombie.controller
+++ b/Assets/Animations/Enemies/Zombie/Zombie.controller
@@ -1,53 +1,32 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1101 &-8731865481558821802
-AnimatorStateTransition:
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name:
- m_Conditions: []
- m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: -6089190274217570171}
- m_Solo: 0
- m_Mute: 0
- m_IsExit: 0
- serializedVersion: 3
- m_TransitionDuration: 0.25
- m_TransitionOffset: 0
- m_ExitTime: 0.75
- m_HasExitTime: 1
- m_HasFixedDuration: 1
- m_InterruptionSource: 0
- m_OrderedInterruption: 1
- m_CanTransitionToSelf: 1
---- !u!1107 &-6204006212838014119
-AnimatorStateMachine:
+--- !u!1102 &-2461426347161001773
+AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Base Layer
- m_ChildStates:
- - serializedVersion: 1
- m_State: {fileID: 8969007887231168511}
- m_Position: {x: 320, y: 130, z: 0}
- - serializedVersion: 1
- m_State: {fileID: -6089190274217570171}
- m_Position: {x: 320, y: 10, z: 0}
- m_ChildStateMachines: []
- m_AnyStateTransitions: []
- m_EntryTransitions: []
- m_StateMachineTransitions: {}
+ m_Name: Attack
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
m_StateMachineBehaviours: []
- m_AnyStatePosition: {x: 50, y: 20, z: 0}
- m_EntryPosition: {x: 50, y: 120, z: 0}
- m_ExitPosition: {x: 800, y: 120, z: 0}
- m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
- m_DefaultState: {fileID: 8969007887231168511}
---- !u!1102 &-6089190274217570171
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 46751831936f6464b867e572e5529105, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &-1887222890965656619
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
@@ -58,7 +37,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- - {fileID: 8139433511157601217}
+ - {fileID: 9190035719620373905}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -68,7 +47,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 0}
+ m_Motion: {fileID: 7400000, guid: 1c65a4008d81eec4fa1a98d6a2218261, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -92,7 +71,7 @@ AnimatorController:
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
- m_StateMachine: {fileID: -6204006212838014119}
+ m_StateMachine: {fileID: 1063358119497531979}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
@@ -102,29 +81,60 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
---- !u!1101 &8139433511157601217
+--- !u!1107 &1063358119497531979
+AnimatorStateMachine:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Base Layer
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: -2461426347161001773}
+ m_Position: {x: 290, y: -30, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 5416144975737678020}
+ m_Position: {x: 320, y: 120, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -1887222890965656619}
+ m_Position: {x: 440, y: 270, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 40, y: -30, z: 0}
+ m_EntryPosition: {x: 90, y: 80, z: 0}
+ m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: 5416144975737678020}
+--- !u!1101 &3411777108285681989
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
- m_Conditions: []
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: moving
+ m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 8969007887231168511}
+ m_DstState: {fileID: -1887222890965656619}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.75
- m_HasExitTime: 1
+ m_ExitTime: 0.64285713
+ m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1102 &8969007887231168511
+--- !u!1102 &5416144975737678020
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
@@ -135,7 +145,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- - {fileID: -8731865481558821802}
+ - {fileID: 3411777108285681989}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -151,3 +161,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &9190035719620373905
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 2
+ m_ConditionEvent: moving
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 5416144975737678020}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.54545456
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
diff --git a/Assets/Animations/MontanaJohns/MontanaJohns.controller b/Assets/Animations/MontanaJohns/MontanaJohns.controller
index 46d4d12..c295976 100644
--- a/Assets/Animations/MontanaJohns/MontanaJohns.controller
+++ b/Assets/Animations/MontanaJohns/MontanaJohns.controller
@@ -220,25 +220,25 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 9100000}
+ m_Controller: {fileID: 0}
- m_Name: jump
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 9100000}
+ m_Controller: {fileID: 0}
- m_Name: fall
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 9100000}
+ m_Controller: {fileID: 0}
- m_Name: airborn
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 9100000}
+ m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
diff --git a/Assets/Prefabs/Projectile.prefab b/Assets/Prefabs/Projectile.prefab
index 2069524..659aca8 100644
--- a/Assets/Prefabs/Projectile.prefab
+++ b/Assets/Prefabs/Projectile.prefab
@@ -118,7 +118,7 @@ BoxCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
- m_IsTrigger: 1
+ m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
diff --git a/Assets/Scenes/Jungle.unity b/Assets/Scenes/Jungle.unity
index a699f61..d385757 100644
--- a/Assets/Scenes/Jungle.unity
+++ b/Assets/Scenes/Jungle.unity
@@ -325005,6 +325005,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: -849362167687110816, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_IsTrigger
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
propertyPath: m_RootOrder
value: 9
@@ -325385,6 +325389,30 @@ PrefabInstance:
propertyPath: hearts.Array.data[2]
value:
objectReference: {fileID: 2019698001}
+ - target: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2776418409812533937, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 2776418409999972307, guid: b2169aaeb9a0e4542b1fb9d601bcc4b2, type: 3}
propertyPath: m_RootOrder
value: 4
diff --git a/Assets/Scripts/Actors/Enemy.cs b/Assets/Scripts/Actors/Enemy.cs
index 8e4ce1b..6862298 100644
--- a/Assets/Scripts/Actors/Enemy.cs
+++ b/Assets/Scripts/Actors/Enemy.cs
@@ -18,6 +18,18 @@ namespace MontanaJohns.Actors
{
if (player.transform.position.x < transform.position.x) Move(-stats.speedMultiplier * 0.5f);
else Move(stats.speedMultiplier * 0.5f);
+
+ if (health <= 0) Destroy(gameObject);
+ }
+
+ private void OnCollisionEnter2D(Collision2D other)
+ {
+ if (other.gameObject.tag == "Projectile")
+ {
+ Debug.Log("Enemy: Hit by projectile");
+ TakeDamage(1);
+ Destroy(other.gameObject);
+ }
}
}
}
diff --git a/Assets/Scripts/Projectile.cs b/Assets/Scripts/Projectile.cs
index 5331264..7692917 100644
--- a/Assets/Scripts/Projectile.cs
+++ b/Assets/Scripts/Projectile.cs
@@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+using MontanaJohns.Actors;
public class Projectile : MonoBehaviour
{
@@ -13,14 +14,8 @@ public class Projectile : MonoBehaviour
rb.velocity = transform.right * speed;
}
- private void OnTriggerEnter2D(Collider2D collision)
+ private void OnCollisionEnter2D(Collision2D collision)
{
- Debug.Log(collision.name);
Destroy(gameObject);
-
- if (collision.tag == "Enemy")
- {
- Destroy(collision.gameObject);
- }
}
}