PlayerAnimation erweitert

Assets/_Game/Animator/PlayerAnimator.controller

@@ -200,7 +200,7 @@ AnimatorStateTransition:
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.25
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1

Assets/_Game/Prefabs/Player/Player.prefab

@@ -78,9 +78,10 @@ GameObject:
   - component: {fileID: 352228603}
   - component: {fileID: 352228604}
   - component: {fileID: 352228605}
-  - component: {fileID: 352228606}
-  - component: {fileID: 2596175625849265254}
   - component: {fileID: 352228607}
+  - component: {fileID: 5703659376326297473}
+  - component: {fileID: 1141687766}
+  - component: {fileID: 1141687779}
   m_Layer: 10
   m_Name: Player
   m_TagString: Player
@@ -310,35 +311,6 @@ MonoBehaviour:
   attackSpeed: 1
   shotSpawn: {fileID: 2139239323}
   fireBall: {fileID: 1870586037468468, guid: e5f7d8895a3df6547bca926919077d19, type: 3}
---- !u!114 &5703659376326297473
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 52145075018362288}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 78a856772da6c1c46a1edda241587b17, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  savePointList: []
---- !u!114 &8997061578198512906
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 52145075018362288}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: -0.05, y: -0.3}
-  m_Size: {x: 1, y: 1.4}
-  m_Direction: 0
 --- !u!114 &352228607
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -377,6 +349,68 @@ MonoBehaviour:
     m_RotationOrder: 4
   m_Time: 0.1
   m_SizePerCharge: 0.2
+  m_Speed: 3
+  m_Radius: 1
+  m_RadiusSinDifference: 0.2
+  m_MaxScale: 0.3
+  m_ElementPrefab: {fileID: 3003439661819703112, guid: 484d043ea1f2a4f04bd827a3d15bea9b,
+    type: 3}
+  m_RotationOrigin: {fileID: 52145075018362285}
+  m_RotationOriginOffset: {x: 0, y: 0}
+  m_AirSprite: {fileID: 21300000, guid: fb7b033b78f4c7b44a9423c82efcd319, type: 3}
+  m_EarthSprite: {fileID: 21300000, guid: 0e669910a08f7cc4aab72705d1b69f9b, type: 3}
+  m_FireSprite: {fileID: 21300000, guid: f1a1b3fcad5c98845ba0de6c90e65b4d, type: 3}
+  m_WaterSprite: {fileID: 21300000, guid: 7a2ce65a83cff2340b4d887a879d765b, type: 3}
   r_State: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639, type: 2}
   r_Controller: {fileID: 52145075018362291}
   r_Collider2D: {fileID: 0}
+--- !u!114 &5703659376326297473
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 52145075018362288}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 78a856772da6c1c46a1edda241587b17, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  savePointList: []
+--- !u!95 &1141687766
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 52145075018362288}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 375b65aa2cf684af6978a76db238f875, 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!114 &1141687779
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 52145075018362288}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c0ce2eb523274b6fa61fccbf0227d85, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MaxLife: 3
+  LostLife:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null

Assets/_Game/Prefabs/Player/RotationElement.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3003439661819703112
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3003439661819703113}
+  - component: {fileID: 3003439661819703114}
+  m_Layer: 0
+  m_Name: RotationElement
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &3003439661819703113
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3003439661819703112}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.92, y: -0.2, z: 0}
+  m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &3003439661819703114
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3003439661819703112}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: -614652393
+  m_SortingLayer: 4
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: dc83a4d53c09d2c47b5eec2911bd35d0, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 10.24, y: 10.24}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/_Game/Prefabs/Player/RotationElement.prefab.meta

+fileFormatVersion: 2
+guid: 484d043ea1f2a4f04bd827a3d15bea9b
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Game/Scenes/MainLevelPlayerTest.unity

@@ -162,7 +162,7 @@ PrefabInstance:
     - target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
         type: 3}
       propertyPath: m_RootOrder
-      value: 6
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
         type: 3}
@@ -231,7 +231,7 @@ PrefabInstance:
     - target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
         type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
         type: 3}
@@ -256,109 +256,49 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 527951491}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &352228596
+--- !u!114 &352228598 stripped
 MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
+    type: 3}
+  m_PrefabInstance: {fileID: 527951491}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 352228595}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 04143d4b812b542329f18723f680be69, type: 3}
+  m_Script: {fileID: 11500000, guid: e310ba2b65602490894409ff217e2731, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_AirScale:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    - serializedVersion: 3
-      time: 1
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  m_Time: 10
---- !u!114 &352228598 stripped
+--- !u!114 &352228607 stripped
 MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
+  m_CorrespondingSourceObject: {fileID: 352228607, guid: 2e3528907311e438dab0d393127aa332,
     type: 3}
   m_PrefabInstance: {fileID: 527951491}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 352228595}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e310ba2b65602490894409ff217e2731, type: 3}
+  m_Script: {fileID: 11500000, guid: 04143d4b812b542329f18723f680be69, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &352228607
-MonoBehaviour:
+--- !u!95 &352228608
+Animator:
+  serializedVersion: 3
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 352228595}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cd35dc826bb88514993730d585216e35, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  gameEvent: {fileID: 11400000, guid: 7e5b80a8353af1846a878c3a997bdb4a, type: 2}
-  allResponse:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 352228598}
-        m_MethodName: UpdateMovementParameters
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
-  airResponse:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
-  earthResponse:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
-  fireResponse:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
-  waterResponse:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
-  defaultResponse:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 375b65aa2cf684af6978a76db238f875, 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!1001 &527951491
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -409,7 +349,7 @@ PrefabInstance:
     - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
         type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
         type: 3}
@@ -426,22 +366,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_fallMultiplier
-      value: 2.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: r_State
-      value: 
-      objectReference: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639,
-        type: 2}
-    - target: {fileID: 352228602, guid: 2e3528907311e438dab0d393127aa332, type: 3}
-      propertyPath: onChargeChange
-      value: 
-      objectReference: {fileID: 11400000, guid: 6ec6544f645a9d1458383b111fcaf8b6,
-        type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 2e3528907311e438dab0d393127aa332, type: 3}
 --- !u!1 &719626315
@@ -639,7 +563,7 @@ SpriteShapeRenderer:
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
+  m_DynamicOccludee: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -697,7 +621,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!68 &719626319
 EdgeCollider2D:
@@ -1216,7 +1140,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 731052799}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 8.83, y: -2.95, z: -10}
+  m_LocalPosition: {x: 18.4, y: -16.08, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -1236,7 +1160,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   target: {fileID: 0}
   smoothSpeed: 0.5
-  lookAt: 0
+  lookAt: 1
   maxDistance: 5
 --- !u!1 &924553758
 GameObject:
@@ -1305,7 +1229,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1001 &1441015606
 PrefabInstance:
@@ -1357,7 +1281,7 @@ PrefabInstance:
     - target: {fileID: 100393043881132463, guid: e9f234b3fda124fe29a2b937c13c099e,
         type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 100393043881132463, guid: e9f234b3fda124fe29a2b937c13c099e,
         type: 3}
@@ -1446,7 +1370,7 @@ PrefabInstance:
     - target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
         type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
         type: 3}
@@ -1515,7 +1439,7 @@ PrefabInstance:
     - target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
         type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
         type: 3}
@@ -1534,3 +1458,82 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1, type: 3}
+--- !u!1001 &9144624199089369672
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 9144624198248816052, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: m_Name
+      value: GameEventListeners
+      objectReference: {fileID: 0}
+    - target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9144624198248816055, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9144624198248816054, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: allResponse.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 352228598}
+    - target: {fileID: 9144624198248816053, guid: 6275ea6a12d5b40b99ac332a7818ebf4,
+        type: 3}
+      propertyPath: response.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 352228607}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6275ea6a12d5b40b99ac332a7818ebf4, type: 3}

Assets/_Game/Scripts/Level Hazards/Spikes.cs

@@ -8,10 +8,10 @@ public class Spikes : MonoBehaviour {
     [SerializeField] private int m_Damage = 1;
 
     void OnCollisionEnter2D(Collision2D col2D){
-        if(col2D.transform.gameObject.tag.Equals("Player")){
+        if(col2D.transform.gameObject.tag.Equals("Player") || col2D.transform.gameObject.tag.Equals("Enemy")){
             Life l = col2D.transform.GetComponent<Life>();
             l.Damage(m_Damage);
         }
     }
 
-}
\ No newline at end of file
+}

Assets/_Game/Scripts/Player/Life.cs

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Events;
+using PlayerSpawnPointScript;
 
 public class Life : MonoBehaviour {
 
@@ -36,8 +37,11 @@ public class Life : MonoBehaviour {
     public void Death(){
 		if (gameObject.CompareTag("Player"))
 		{
+			//PlayerSpawnPoint.psp.SetPlayerPosition();
 			gameObject.SetActive(false);
+			Heal(5);
 			Debug.Log("Death");
+
 			return;
 		}
 		Destroy(gameObject);

Assets/_Game/Scripts/Player/PlayerAnimation.cs

-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Timers;
 using UnityEngine;
 using _Game.Scripts.Scriptable_Object;
 
 public class PlayerAnimation : MonoBehaviour
 {
-	public AnimationCurve m_AirScale;
+	[Header("Scaling")] public AnimationCurve m_AirScale;
 	public float m_Time = 10f;
 	public float m_SizePerCharge = 0.2f;
 
-	[SerializeField] private PlayerState r_State;
+	[Header("Rotation")] public float m_Speed = 3f;
+	public float m_Radius = 1f;
+	public float m_RadiusSinDifference = 0.3f;
+	public float m_MaxScale = 0.3f;
+	public GameObject m_ElementPrefab;
+	public Transform m_RotationOrigin;
+	public Vector2 m_RotationOriginOffset;
+	public Sprite m_AirSprite;
+	public Sprite m_EarthSprite;
+	public Sprite m_FireSprite;
+	public Sprite m_WaterSprite;
+	private List<GameObject> m_ElementOrbTransforms;
+	private List<SpriteRenderer> m_ElementOrbRenderer;
+	private float m_TimeCounter = 0;
+