diff --git a/Assets/Animation/ZombunnyAC.controller b/Assets/Animation/ZombunnyAC.controller
new file mode 100644
index 0000000000000000000000000000000000000000..726af713450f1fb11c7694bb001abe714f8e7cdf
--- /dev/null
+++ b/Assets/Animation/ZombunnyAC.controller
@@ -0,0 +1,194 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-7780078403477305298
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Idle
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ 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: 3e99ec06c5efc9d4089299d760d40f7c, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &-5055140776114455487
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Move
+ m_Speed: 2
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -4323266053887586222}
+ m_StateMachineBehaviours: []
+ 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: af57220899fe7f942bcb29e993d89983, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1101 &-4323266053887586222
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: PlayerDead
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -7780078403477305298}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.82558143
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1102 &-4049321667482666445
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Death
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ 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: 3446299ea8161824aa26187412d69ede, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1107 &-3396469402594231737
+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: -5055140776114455487}
+ m_Position: {x: 20, y: 260, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -7780078403477305298}
+ m_Position: {x: -230, y: 190, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -4049321667482666445}
+ m_Position: {x: 250, y: 200, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions:
+ - {fileID: 3011294842453135158}
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 270, y: 120, 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: -5055140776114455487}
+--- !u!91 &9100000
+AnimatorController:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: ZombunnyAC
+ serializedVersion: 5
+ m_AnimatorParameters:
+ - m_Name: PlayerDead
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 9100000}
+ - m_Name: Dead
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 9100000}
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: -3396469402594231737}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
+--- !u!1101 &3011294842453135158
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: Dead
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -4049321667482666445}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 0
diff --git a/Assets/Animation/ZombunnyAC.controller.meta b/Assets/Animation/ZombunnyAC.controller.meta
new file mode 100644
index 0000000000000000000000000000000000000000..87240ab8273ab9c7912b796a96a550d6479b0cd4
--- /dev/null
+++ b/Assets/Animation/ZombunnyAC.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7815e7c931e285841af215acc0d7591d
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 9100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Zombunny.prefab b/Assets/Prefabs/Zombunny.prefab
index 1ab0e9abc7bd290732894b958ffc5d2b70e355b6..b5253bd669bef0f52ed9da35f8a124b693d25666 100644
--- a/Assets/Prefabs/Zombunny.prefab
+++ b/Assets/Prefabs/Zombunny.prefab
@@ -147,7 +147,7 @@ Animator:
m_GameObject: {fileID: 3690101264539895444}
m_Enabled: 1
m_Avatar: {fileID: 9000000, guid: be66986effd141b4992d2d78be127139, type: 3}
- m_Controller: {fileID: 9100000, guid: ac08d25ba98cb124d89920699e56d8b5, type: 2}
+ m_Controller: {fileID: 9100000, guid: 2cd6bf77cac24414c8e134b0c0e7aed3, type: 2}
m_CullingMode: 1
m_UpdateMode: 0
m_ApplyRootMotion: 0
@@ -361,7 +361,7 @@ MonoBehaviour:
currentHealth: 0
sinkSpeed: 2.5
deathClip: {fileID: 8300000, guid: 1d3bfb9269f136947bf8ac164cace1ff, type: 3}
- enemyType: Zombunny
+ enemyType: 0
--- !u!1 &3690101264539895446
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Level_Final.unity b/Assets/Scenes/Level_Final.unity
index 4e41358b5395fa07244af748fddf359dbaa3288f..19752f0eb0179812d55b4edf1e001569db352cf6 100644
--- a/Assets/Scenes/Level_Final.unity
+++ b/Assets/Scenes/Level_Final.unity
@@ -2006,19 +2006,12 @@ MonoBehaviour:
gunMode: 1
damagePerShot: 30
gunAudioSrc:
-<<<<<<< HEAD
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
-=======
- {fileID: 8300000, guid: fa7f046ce321d4021b5e753bf1152916, type: 3}
- {fileID: 8300000, guid: ba7220d25e509f9409ceacf04b5962e2, type: 3}
- {fileID: 8300000, guid: ea3810a94c786994592b4af9547b4c46, type: 3}
- {fileID: 8300000, guid: 0a5dd97bd0604d44397959b4c9a0deb9, type: 3}
BowSliderIcon: {fileID: 1456880656}
BowSlider: {fileID: 806967238}
->>>>>>> 91d4d968aed39017c46150f8bc493614eaf496cc
--- !u!82 &880479557
AudioSource:
m_ObjectHideFlags: 0