Add a bunch of animations and make bullet better

2019-08-04 16:43:22 +03:00 · 2019-08-04 16:43:22 +03:00 · 834d2fe6d2
commit 834d2fe6d2
parent 82b1105654
23 changed files with 10544 additions and 24 deletions
--- a/Assets/Graphics/Animations.meta
+++ b/Assets/Graphics/Animations.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8b415b206dde739468f453c29e57847b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Graphics/Animations/BodyAnim.controller
+++ b/Assets/Graphics/Animations/BodyAnim.controller
@ -0,0 +1,107 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-3707230729431605428
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: VerticalBody
+  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: 1
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 7ef19a0adcf66eb4a88dac33eaadf1d7, type: 2}
+  m_Tag: 
+  m_SpeedParameter: Speed
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &-3700635770632097640
+AnimatorStateMachine:
+  serializedVersion: 5
+  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: -3707230729431605428}
+    m_Position: {x: 340, y: 80, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 3757771331602400307}
+    m_Position: {x: 350, y: 180, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 40, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -3707230729431605428}
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BodyAnim
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: Speed
+    m_Type: 1
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -3700635770632097640}
+    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!1102 &3757771331602400307
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: HorizontalBody
+  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: 1
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 2b0b60046ece57547bd95270100904f5, type: 2}
+  m_Tag: 
+  m_SpeedParameter: Speed
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
--- a/Assets/Graphics/Animations/BodyAnim.controller.meta
+++ b/Assets/Graphics/Animations/BodyAnim.controller.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a0d615054869f7c479dcfe3c00b8288a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Graphics/Animations/HeadAnim.controller
+++ b/Assets/Graphics/Animations/HeadAnim.controller
@ -0,0 +1,136 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-409229592655819495
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: HeadUp
+  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: 1
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: a166f1cfdbb2bc84abbe7d555e47a703, type: 2}
+  m_Tag: 
+  m_SpeedParameter: Speed
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: HeadAnim
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: Speed
+    m_Type: 1
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 3228138676903575627}
+    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!1102 &418650676628883313
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: HeadRight
+  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: 1
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 48aae59ec9f86e848a41e8c41d55bf10, type: 2}
+  m_Tag: 
+  m_SpeedParameter: Speed
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &3228138676903575627
+AnimatorStateMachine:
+  serializedVersion: 5
+  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: 9205345042520426857}
+    m_Position: {x: 351.21954, y: 138.85886, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 418650676628883313}
+    m_Position: {x: 429.00696, y: 259.67767, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -409229592655819495}
+    m_Position: {x: 193.98956, y: 243.12714, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  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: 9205345042520426857}
+--- !u!1102 &9205345042520426857
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: HeadDown
+  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: 1
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 7629834a2fed5b64787526ddf657b9c4, type: 2}
+  m_Tag: 
+  m_SpeedParameter: Speed
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
--- a/Assets/Graphics/Animations/HeadAnim.controller.meta
+++ b/Assets/Graphics/Animations/HeadAnim.controller.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 50c6615d9d9f88540a814106a496d504
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Graphics/Animations/HeadDown.anim
+++ b/Assets/Graphics/Animations/HeadDown.anim
@ -0,0 +1,77 @@
+%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: HeadDown
+  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: -6198316879909490977, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    - time: 0.25
+      value: {fileID: -5576338770054835268, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    - time: 0.5
+      value: {fileID: -6198316879909490977, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  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: -6198316879909490977, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+    - {fileID: -5576338770054835268, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+    - {fileID: -6198316879909490977, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.5833333
+    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: []
--- a/Assets/Graphics/Animations/HeadDown.anim.meta
+++ b/Assets/Graphics/Animations/HeadDown.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7629834a2fed5b64787526ddf657b9c4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Graphics/Animations/HeadRight.anim
+++ b/Assets/Graphics/Animations/HeadRight.anim
@ -0,0 +1,77 @@
+%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: HeadRight
+  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: 5110585885055717846, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    - time: 0.25
+      value: {fileID: 3379145957502006849, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    - time: 0.5
+      value: {fileID: 5110585885055717846, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  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: 5110585885055717846, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+    - {fileID: 3379145957502006849, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+    - {fileID: 5110585885055717846, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.5833333
+    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: []
--- a/Assets/Graphics/Animations/HeadRight.anim.meta
+++ b/Assets/Graphics/Animations/HeadRight.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 48aae59ec9f86e848a41e8c41d55bf10
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Graphics/Animations/HeadUp.anim
+++ b/Assets/Graphics/Animations/HeadUp.anim
@ -0,0 +1,77 @@
+%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: HeadUp
+  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: -5974094763163677011, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    - time: 0.25
+      value: {fileID: -4595800850781774619, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    - time: 0.5
+      value: {fileID: -5974094763163677011, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  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: -5974094763163677011, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+    - {fileID: -4595800850781774619, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+    - {fileID: -5974094763163677011, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.5833333
+    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: []
--- a/Assets/Graphics/Animations/HeadUp.anim.meta
+++ b/Assets/Graphics/Animations/HeadUp.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a166f1cfdbb2bc84abbe7d555e47a703
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Graphics/Animations/HorizontalBody.anim
+++ b/Assets/Graphics/Animations/HorizontalBody.anim
@ -0,0 +1,77 @@
+%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: HorizontalBody
+  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: -7462660833460506756, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    - time: 0.25
+      value: {fileID: -4217919737391766035, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    - time: 0.5
+      value: {fileID: -7462660833460506756, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  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: -7462660833460506756, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+    - {fileID: -4217919737391766035, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+    - {fileID: -7462660833460506756, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.5833333
+    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: []
--- a/Assets/Graphics/Animations/HorizontalBody.anim.meta
+++ b/Assets/Graphics/Animations/HorizontalBody.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2b0b60046ece57547bd95270100904f5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Graphics/Animations/VerticalBody.anim
+++ b/Assets/Graphics/Animations/VerticalBody.anim
@ -0,0 +1,77 @@
+%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: VerticalBody
+  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: 1687475652488265116, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    - time: 0.25
+      value: {fileID: 6447738421054277292, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    - time: 0.5
+      value: {fileID: 1687475652488265116, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  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: 1687475652488265116, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+    - {fileID: 6447738421054277292, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+    - {fileID: 1687475652488265116, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.5833333
+    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: []
--- a/Assets/Graphics/Animations/VerticalBody.anim.meta
+++ b/Assets/Graphics/Animations/VerticalBody.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7ef19a0adcf66eb4a88dac33eaadf1d7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Graphics/revolver.png.meta
+++ b/Assets/Graphics/revolver.png.meta
@ -43,8 +43,8 @@ TextureImporter:
  spriteMode: 1
  spriteExtrude: 1
  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
+  alignment: 9
+  spritePivot: {x: 0.37072495, y: 0.40018007}
  spritePixelsToUnits: 32
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
--- a/Assets/Prefabs/FunBullet.prefab
+++ b/Assets/Prefabs/FunBullet.prefab
--- a/Assets/Prefabs/FunBullet.prefab.meta
+++ b/Assets/Prefabs/FunBullet.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9dc3be160e0749f468ebcbe066a6249a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@ -122,8 +122,9 @@ GameObject:
  m_Component:
  - component: {fileID: 8489029732241002785}
  - component: {fileID: 8489029732241002784}
+  - component: {fileID: 7470056256336689202}
  m_Layer: 0
-  m_Name: PlayerAtlas_0
+  m_Name: Body
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -137,7 +138,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8489029732241002798}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.4, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 8489029732530782807}
@ -181,7 +182,7 @@ SpriteRenderer:
  m_SortingLayerID: -947994997
  m_SortingLayer: 3
  m_SortingOrder: 0
-  m_Sprite: {fileID: -6198316879909490977, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+  m_Sprite: {fileID: 1687475652488265116, guid: 0aff57dccbcba5d4db39143523f7b1eb,
    type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@ -193,6 +194,25 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
+--- !u!95 &7470056256336689202
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8489029732241002798}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: a0d615054869f7c479dcfe3c00b8288a, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &8489029732530782804
 GameObject:
  m_ObjectHideFlags: 0
@ -291,6 +311,10 @@ MonoBehaviour:
  Body: {fileID: 8489029732530782792}
  Hand: {fileID: 8334477035414792174}
  MoveSpeed: 50
+  BodySprite: {fileID: 8489029732241002784}
+  BodyAnim: {fileID: 7470056256336689202}
+  HeadSprite: {fileID: 8489029732599905344}
+  HeadAnim: {fileID: 4393298056784288995}
 --- !u!1 &8489029732599905358
 GameObject:
  m_ObjectHideFlags: 0
@ -301,8 +325,9 @@ GameObject:
  m_Component:
  - component: {fileID: 8489029732599905345}
  - component: {fileID: 8489029732599905344}
+  - component: {fileID: 4393298056784288995}
  m_Layer: 0
-  m_Name: PlayerAtlas_6
+  m_Name: Head
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -316,7 +341,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8489029732599905358}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0.4, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 8489029732530782807}
@ -359,8 +384,8 @@ SpriteRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: -947994997
  m_SortingLayer: 3
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 1687475652488265116, guid: 0aff57dccbcba5d4db39143523f7b1eb,
+  m_SortingOrder: 10
+  m_Sprite: {fileID: -6198316879909490977, guid: 0aff57dccbcba5d4db39143523f7b1eb,
    type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@ -372,3 +397,22 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
+--- !u!95 &4393298056784288995
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8489029732599905358}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 50c6615d9d9f88540a814106a496d504, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
--- a/Assets/Prefabs/Revolver.prefab
+++ b/Assets/Prefabs/Revolver.prefab
@ -30,6 +30,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4462327695001662283}
+  - {fileID: 427857587156450783}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -72,6 +73,8 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  Bullet: {fileID: 4482402865533696887, guid: a3bd810156720f24a9fe5e1ba27d7da8, type: 3}
+  Sprite: {fileID: 4462327695001662280}
+  BulletHole: {fileID: 427857587156450783}
 --- !u!1 &4462327695001662282
 GameObject:
  m_ObjectHideFlags: 0
@ -152,3 +155,33 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
+--- !u!1 &5364776498526555370
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 427857587156450783}
+  m_Layer: 0
+  m_Name: BulletHole
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &427857587156450783
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5364776498526555370}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.811, y: 0.129, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4462327694118370271}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/Prefabs/RevolverBullet.prefab
+++ b/Assets/Prefabs/RevolverBullet.prefab
@ -4868,7 +4868,7 @@ ParticleSystem:
    startLifetime:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 0.3
+      scalar: 0.15
      minScalar: 5
      maxCurve:
        serializedVersion: 2
@ -4975,7 +4975,7 @@ ParticleSystem:
      serializedVersion: 2
      minMaxState: 0
      minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 1, g: 0, b: 0, a: 1}
+      maxColor: {r: 0.6226415, g: 0.6226415, b: 0.6226415, a: 0.23137255}
      maxGradient:
        serializedVersion: 2
        key0: {r: 1, g: 1, b: 1, a: 1}
@ -5037,7 +5037,7 @@ ParticleSystem:
    startSize:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 0.4
+      scalar: 0.3
      minScalar: 1
      maxCurve:
        serializedVersion: 2
@ -5736,20 +5736,20 @@ ParticleSystem:
        - serializedVersion: 3
          time: 0
          value: 1
-          inSlope: 0
-          outSlope: 0
+          inSlope: -2.180328
+          outSlope: -2.180328
          tangentMode: 0
          weightedMode: 0
          inWeight: 0.33333334
-          outWeight: 0.33333334
+          outWeight: 0.14285713
        - serializedVersion: 3
          time: 1
          value: 0
-          inSlope: -1.9923258
-          outSlope: -1.9923258
+          inSlope: 0.06844979
+          outSlope: 0.06844979
          tangentMode: 0
          weightedMode: 0
-          inWeight: 0.19747907
+          inWeight: 0.23949587
          outWeight: 0.33333334
        m_PreInfinity: 2
        m_PostInfinity: 2
@ -6048,7 +6048,7 @@ ParticleSystem:
        m_RotationOrder: 4
    separateAxes: 0
  ColorModule:
-    enabled: 1
+    enabled: 0
    gradient:
      serializedVersion: 2
      minMaxState: 1
--- a/Assets/Scripts/Gun.cs
+++ b/Assets/Scripts/Gun.cs
@ -7,6 +7,8 @@ namespace Saltosion.OneWeapon {
    public class Gun : MonoBehaviour {

        public Bullet Bullet;
+        public SpriteRenderer Sprite;
+        public Transform BulletHole;

        private bool IsHeld = false;

@ -22,14 +24,18 @@ namespace Saltosion.OneWeapon {
            }
        }

-        public void Shoot(Vector2 position, Vector2 direction, float rotation) {
+        public void Shoot(Vector2 direction, float rotation) {
            if (Bullet == null) {
                Debug.LogError("THERE IS NO BULLET");
            } else {
-                Bullet ShotBullet = Instantiate(Bullet, position, new Quaternion());
+                Bullet ShotBullet = Instantiate(Bullet, BulletHole.position, new Quaternion());
                ShotBullet.Direction = direction.normalized;
                ShotBullet.InitialRotation = rotation;
            }
        }
+
+        public void FlipGun(bool flipped) {
+            Sprite.flipY = flipped;
+        }
    }
 }
--- a/Assets/Scripts/Player.cs
+++ b/Assets/Scripts/Player.cs
@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Animations;

 namespace Saltosion.OneWeapon {
    public class Player : MonoBehaviour {
@ -9,9 +10,14 @@ namespace Saltosion.OneWeapon {
        public Transform Hand;
        public float MoveSpeed = 50f;

+        public SpriteRenderer BodySprite;
+        public Animator BodyAnim;
+        public SpriteRenderer HeadSprite;
+        public Animator HeadAnim;
+
        private Gun Gun;

-        private Vector2 GunLocation = new Vector2(0.1f, -0.7f);
+        private Vector2 GunLocation = new Vector2(0, -0.6f);
        private Vector3 GunRotation = new Vector3(0, 0, -90);

        void Start() {
@ -31,13 +37,53 @@ namespace Saltosion.OneWeapon {

            Vector2 LookDirection = (PointedPos - Hand.position).normalized;

-            var Rot = Hand.localEulerAngles;
+            Vector3 Rot = Hand.localEulerAngles;
            Rot.z = Mathf.Atan2(LookDirection.y, LookDirection.x) * Mathf.Rad2Deg + 90;
            Hand.localEulerAngles = Rot;

+            float Rotation = Rot.z;
+
+            if (Rotation >= 45 && Rotation < 135) {
+                BodyAnim.Play("HorizontalBody");
+                BodySprite.flipX = false;
+                HeadAnim.Play("HeadRight");
+                HeadSprite.flipX = false;
+            } else if (Rotation >= 225 || Rotation < -45) {
+                BodyAnim.Play("HorizontalBody");
+                BodySprite.flipX = true;
+                HeadAnim.Play("HeadRight");
+                HeadSprite.flipX = true;
+            } else {
+                if (Rotation >= 135 && Rotation < 225) {
+                    HeadAnim.Play("HeadUp");
+                } else {
+                    HeadAnim.Play("HeadDown");
+                }
+                BodyAnim.Play("VerticalBody");
+                BodySprite.flipX = false;
+                HeadSprite.flipX = false;
+            }
+            if (Gun != null) {
+                if (Rotation >= 180 || Rotation <= -45) {
+                    Gun.FlipGun(true);
+                } else if (Rotation < 180 || Rotation > 45) {
+                    Gun.FlipGun(false);
+                }
+            }
+
+
+            if (Direction.magnitude > 0.05) {
+                BodyAnim.SetFloat("Speed", 1);
+                HeadAnim.SetFloat("Speed", 1);
+
+            } else {
+                BodyAnim.SetFloat("Speed", 0);
+                HeadAnim.SetFloat("Speed", 0);
+            }
+
            bool Shoot = Input.GetButtonDown("Shoot");
            if (Shoot && Gun != null) {
-                Gun.Shoot(Gun.transform.position, LookDirection, Rot.z);
+                Gun.Shoot(LookDirection, Rotation);
            }
        }