Assets/Art/Animations/Bobble.anim

@@ -20,7 +20,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 0, y: 0.87037116, z: 0.7844082}
+        value: {x: 0, y: 0, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
@@ -29,34 +29,25 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.2
-        value: {x: 0, y: 0.9021639, z: 0.7844082}
+        value: {x: 0, y: 0.015572754, z: 0}
         inSlope: {x: 0, y: 0.25483456, z: 0}
         outSlope: {x: 0, y: 0.25483456, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.38333333
-        value: {x: 0, y: 1.1873454, z: 0.7844082}
-        inSlope: {x: 0, y: 1.9520862, z: 0}
-        outSlope: {x: 0, y: 1.9520862, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.41666666
-        value: {x: 0, y: 1.2483423, z: 0.7844082}
+        value: {x: 0, y: 0.10228437, z: 0}
-        inSlope: {x: 0, y: 1.6778376, z: 0}
+        inSlope: {x: 0, y: 0.3947592, z: 0}
-        outSlope: {x: 0, y: 1.6778376, z: 0}
+        outSlope: {x: 0, y: 0.3947592, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.5
-        value: {x: 0, y: 1.3346866, z: 0.7844082}
+        value: {x: 0, y: 0.1283131, z: 0}
         inSlope: {x: 0, y: 0.20761947, z: 0}
         outSlope: {x: 0, y: 0.20761947, z: 0}
         tangentMode: 0
@@ -65,16 +56,16 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.42225873, z: 0.33333334}
       - serializedVersion: 3
         time: 0.5833333
-        value: {x: 0, y: 1.3472093, z: 0.7844082}
+        value: {x: 0, y: 0.14025, z: 0}
-        inSlope: {x: 0, y: 0.09660107, z: 0}
+        inSlope: {x: 0, y: 0.083868586, z: 0}
-        outSlope: {x: 0, y: 0.09660107, z: 0}
+        outSlope: {x: 0, y: 0.083868586, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.85
-        value: {x: 0, y: 1.3403444, z: 0.7844082}
+        value: {x: 0, y: 0.12987658, z: 0}
         inSlope: {x: 0, y: -0.11044701, z: 0}
         outSlope: {x: 0, y: -0.11044701, z: 0}
         tangentMode: 0
@@ -83,16 +74,16 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 1
-        value: {x: 0, y: 1.1896566, z: 0.7844082}
+        value: {x: 0, y: 0.09029832, z: 0}
-        inSlope: {x: 0, y: -1.5732216, z: 0}
+        inSlope: {x: 0, y: -0.36953446, z: 0}
-        outSlope: {x: 0, y: -1.5732216, z: 0}
+        outSlope: {x: 0, y: -0.36953446, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 1.2166667
-        value: {x: 0, y: 0.9198463, z: 0.7844082}
+        value: {x: 0, y: 0.013672401, z: 0}
         inSlope: {x: 0, y: -0.23819895, z: 0}
         outSlope: {x: 0, y: -0.23819895, z: 0}
         tangentMode: 0
@@ -101,7 +92,7 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 1.3833333
-        value: {x: 0, y: 0.87037116, z: 0.7844082}
+        value: {x: 0, y: 0, z: 0}
         inSlope: {x: 0, y: 0.006638917, z: 0}
         outSlope: {x: 0, y: 0.006638917, z: 0}
         tangentMode: 0
@@ -158,7 +149,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.2
+        time: 0.41666666
         value: 0
         inSlope: 0
         outSlope: 0
@@ -167,7 +158,25 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.38333333
+        time: 0.5
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5833333
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
         value: 0
         inSlope: 0
         outSlope: 0
@@ -189,7 +198,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.87037116
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -198,7 +207,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.2
-        value: 0.9021639
+        value: 0.015572754
         inSlope: 0.25483456
         outSlope: 0.25483456
         tangentMode: 0
@@ -207,7 +216,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.5
-        value: 1.3346866
+        value: 0.1283131
         inSlope: 0.20761947
         outSlope: 0.20761947
         tangentMode: 0
@@ -216,7 +225,7 @@ AnimationClip:
         outWeight: 0.42225873
       - serializedVersion: 3
         time: 0.85
-        value: 1.3403444
+        value: 0.12987658
         inSlope: -0.11044701
         outSlope: -0.11044701
         tangentMode: 0
@@ -225,7 +234,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.2166667
-        value: 0.9198463
+        value: 0.013672401
         inSlope: -0.23819895
         outSlope: -0.23819895
         tangentMode: 0
@@ -234,7 +243,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.3833333
-        value: 0.87037116
+        value: 0
         inSlope: 0.006638917
         outSlope: 0.006638917
         tangentMode: 0
@@ -253,9 +262,18 @@ AnimationClip:
     curve:
       serializedVersion: 2
       m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.41666666
-        value: 0.7844082
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -264,7 +282,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.5
-        value: 0.7844082
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -273,7 +291,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.5833333
-        value: 0.7844082
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -282,7 +300,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1
-        value: 0.7844082
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136

Assets/Art/Animations/Player/AttackAnimation.controller

@@ -1,257 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1102 &-8153908065981635151
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Slash1
-  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: 2be3e37f29e4a6848b15663cb3ff83c8, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1101 &-7287591005394286135
-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: 5051650293656771557}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0
-  m_TransitionOffset: 0
-  m_ExitTime: 0
-  m_HasExitTime: 1
-  m_HasFixedDuration: 0
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1107 &-956128692290981692
-AnimatorStateMachine:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: New Layer
-  m_ChildStates:
-  - serializedVersion: 1
-    m_State: {fileID: -8153908065981635151}
-    m_Position: {x: 290, y: 110, 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: -8153908065981635151}
---- !u!91 &9100000
-AnimatorController:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: AttackAnimation
-  serializedVersion: 5
-  m_AnimatorParameters:
-  - m_Name: Blend
-    m_Type: 1
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
-  m_AnimatorLayers:
-  - serializedVersion: 5
-    m_Name: Base Layer
-    m_StateMachine: {fileID: 2313356623010234660}
-    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}
-  - serializedVersion: 5
-    m_Name: New Layer
-    m_StateMachine: {fileID: -956128692290981692}
-    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 &1744850431499835666
-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: 5051650293656771557}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: -0
-  m_TransitionOffset: 0
-  m_ExitTime: 0
-  m_HasExitTime: 1
-  m_HasFixedDuration: 0
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1107 &2313356623010234660
-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: 5961122163848245705}
-    m_Position: {x: 380, y: 110, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 5051650293656771557}
-    m_Position: {x: 30, y: 170, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 2502833858199228860}
-    m_Position: {x: 380, y: 160, 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: 50, y: 70, z: 0}
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 5051650293656771557}
---- !u!1102 &2502833858199228860
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Slash1
-  m_Speed: 0.3
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 1744850431499835666}
-  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: a2c0ca68423d40e428585f43f974cbf5, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &5051650293656771557
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Blank
-  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: 0}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!206 &5104837376672507423
-BlendTree:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: BlendTree
-  m_Childs: []
-  m_BlendParameter: Blend
-  m_BlendParameterY: Blend
-  m_MinThreshold: 0
-  m_MaxThreshold: 1
-  m_UseAutomaticThresholds: 1
-  m_NormalizedBlendValues: 0
-  m_BlendType: 0
---- !u!1102 &5961122163848245705
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Slash2
-  m_Speed: 0.3
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: -7287591005394286135}
-  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: 2be3e37f29e4a6848b15663cb3ff83c8, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 

Assets/Art/Animations/Player/AttackAnimation.controller.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 19053954f80562a45a8e89efeabea17d
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 9100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Art/Animations/Player/Slash1.anim

@@ -1,84 +0,0 @@
-%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: Slash1
-  serializedVersion: 7
-  m_Legacy: 0
-  m_Compressed: 0
-  m_UseHighQualityCurve: 1
-  m_RotationCurves: []
-  m_CompressedRotationCurves: []
-  m_EulerCurves: []
-  m_PositionCurves: []
-  m_ScaleCurves: []
-  m_FloatCurves: []
-  m_PPtrCurves:
-  - serializedVersion: 2
-    curve:
-    - time: 0
-      value: {fileID: 2084452910934024698, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - time: 0.016666668
-      value: {fileID: 2084452910934024698, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - time: 0.033333335
-      value: {fileID: -2736451627376223018, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - time: 0.05
-      value: {fileID: -893459440294663468, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - time: 0.06666667
-      value: {fileID: 5053079929507107595, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    attribute: m_Sprite
-    path: 
-    classID: 212
-    script: {fileID: 0}
-    flags: 2
-  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
-      isIntCurve: 0
-      isSerializeReferenceCurve: 0
-    pptrCurveMapping:
-    - {fileID: 2084452910934024698, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - {fileID: 2084452910934024698, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - {fileID: -2736451627376223018, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - {fileID: -893459440294663468, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - {fileID: 5053079929507107595, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-  m_AnimationClipSettings:
-    serializedVersion: 2
-    m_AdditiveReferencePoseClip: {fileID: 0}
-    m_AdditiveReferencePoseTime: 0
-    m_StartTime: 0
-    m_StopTime: 0.083333336
-    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: []

Assets/Art/Animations/Player/Slash1.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2be3e37f29e4a6848b15663cb3ff83c8
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Art/Animations/Player/Slash2.anim

@@ -1,260 +0,0 @@
-%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: Slash2
-  serializedVersion: 7
-  m_Legacy: 0
-  m_Compressed: 0
-  m_UseHighQualityCurve: 1
-  m_RotationCurves: []
-  m_CompressedRotationCurves: []
-  m_EulerCurves: []
-  m_PositionCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: {x: 4.1, y: 4.91, z: 0}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    path: 
-  m_ScaleCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: {x: 1, y: -1, z: 1}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    path: 
-  m_FloatCurves: []
-  m_PPtrCurves:
-  - serializedVersion: 2
-    curve:
-    - time: 0
-      value: {fileID: 2084452910934024698, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - time: 0.016666668
-      value: {fileID: 2084452910934024698, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - time: 0.033333335
-      value: {fileID: -2736451627376223018, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - time: 0.05
-      value: {fileID: -893459440294663468, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - time: 0.06666667
-      value: {fileID: 5053079929507107595, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    attribute: m_Sprite
-    path: 
-    classID: 212
-    script: {fileID: 0}
-    flags: 2
-  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
-      isIntCurve: 0
-      isSerializeReferenceCurve: 0
-    - serializedVersion: 2
-      path: 0
-      attribute: 1
-      script: {fileID: 0}
-      typeID: 4
-      customType: 0
-      isPPtrCurve: 0
-      isIntCurve: 0
-      isSerializeReferenceCurve: 0
-    - serializedVersion: 2
-      path: 0
-      attribute: 3
-      script: {fileID: 0}
-      typeID: 4
-      customType: 0
-      isPPtrCurve: 0
-      isIntCurve: 0
-      isSerializeReferenceCurve: 0
-    pptrCurveMapping:
-    - {fileID: 2084452910934024698, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - {fileID: 2084452910934024698, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - {fileID: -2736451627376223018, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - {fileID: -893459440294663468, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-    - {fileID: 5053079929507107595, guid: 309d09cd04eabea43bdf7c83eace0ecd, type: 3}
-  m_AnimationClipSettings:
-    serializedVersion: 2
-    m_AdditiveReferencePoseClip: {fileID: 0}
-    m_AdditiveReferencePoseTime: 0
-    m_StartTime: 0
-    m_StopTime: 0.083333336
-    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:
-  - serializedVersion: 2
-    curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalScale.x
-    path: 
-    classID: 4
-    script: {fileID: 0}
-    flags: 0
-  - serializedVersion: 2
-    curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: -1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalScale.y
-    path: 
-    classID: 4
-    script: {fileID: 0}
-    flags: 0
-  - serializedVersion: 2
-    curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalScale.z
-    path: 
-    classID: 4
-    script: {fileID: 0}
-    flags: 0
-  - serializedVersion: 2
-    curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 4.1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalPosition.x
-    path: 
-    classID: 4
-    script: {fileID: 0}
-    flags: 0
-  - serializedVersion: 2
-    curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 4.91
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalPosition.y
-    path: 
-    classID: 4
-    script: {fileID: 0}
-    flags: 0
-  - serializedVersion: 2
-    curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalPosition.z
-    path: 
-    classID: 4
-    script: {fileID: 0}
-    flags: 0
-  m_EulerEditorCurves: []
-  m_HasGenericRootTransform: 1
-  m_HasMotionFloatCurves: 0
-  m_Events: []

Assets/Art/Animations/Player/Slash2.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a2c0ca68423d40e428585f43f974cbf5
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Art/Sprites/DefaultCharacter/Slash1.ase.meta

@@ -1,311 +0,0 @@
-fileFormatVersion: 2
-guid: 309d09cd04eabea43bdf7c83eace0ecd
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 62a9f0aa5b59740cfbadc7e5f9823bb0, type: 3}
-  importerVersion: 2
-  textureImporterSettings:
-    alphaSource: 1
-    mipMapMode: 0
-    enableMipMap: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-    convertToNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-    swizzle: 50462976
-    isReadable: 0
-    streamingMipmaps: 0
-    streamingMipmapsPriority: 0
-    vTOnly: 0
-    ignoreMipmapLimit: 0
-    nPOTScale: 1
-    sRGBTexture: 1
-    spriteMode: 2
-    spriteExtrude: 1
-    spriteMeshType: 1
-    alignment: 0
-    spritePivot: {x: 0.5, y: 0.5}
-    spritePixelsToUnits: 16
-    spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-    spriteGenerateFallbackPhysicsShape: 0
-    generateCubemap: 6
-    cubemapConvolution: 0
-    seamlessCubemap: 0
-    alphaIsTransparency: 1
-    spriteTessellationDetail: -1
-    textureType: 8
-    textureShape: 1
-    singleChannelComponent: 0
-    flipbookRows: 0
-    flipbookColumns: 0
-    ignorePngGamma: 0
-    cookieMode: 0
-    filterMode: 0
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-    normalMap: 0
-    textureFormat: 0
-    maxTextureSize: 0
-    lightmap: 0
-    compressionQuality: 0
-    linearTexture: 0
-    grayScaleToAlpha: 0
-    rGBM: 0
-    cubemapConvolutionSteps: 0
-    cubemapConvolutionExponent: 0
-    maxTextureSizeSet: 0
-    compressionQualitySet: 0
-    textureFormatSet: 0
-    applyGammaDecoding: 0
-  previousAsepriteImporterSettings:
-    fileImportMode: 1
-    importHiddenLayers: 0
-    layerImportMode: 1
-    defaultPivotSpace: 0
-    defaultPivotAlignment: 7
-    customPivotPosition: {x: 0.5, y: 0.5}
-    mosaicPadding: 4
-    spritePadding: 0
-    generateModelPrefab: 1
-    generateAnimationClips: 1
-    addSortingGroup: 1
-    addShadowCasters: 0
-    generateIndividualEvents: 1
-    generateSpriteAtlas: 1
-  asepriteImporterSettings:
-    fileImportMode: 1
-    importHiddenLayers: 0
-    layerImportMode: 1
-    defaultPivotSpace: 0
-    defaultPivotAlignment: 7
-    customPivotPosition: {x: 0.5, y: 0.5}
-    mosaicPadding: 4
-    spritePadding: 0
-    generateModelPrefab: 1
-    generateAnimationClips: 1
-    addSortingGroup: 1
-    addShadowCasters: 0
-    generateIndividualEvents: 1
-    generateSpriteAtlas: 1
-  importFileNodeState: 1
-  platformSettingsDirtyTick: 638880009436714432
-  textureAssetName: 
-  singleSpriteImportData:
-  - name: 
-    originalName: 
-    pivot: {x: 0, y: 0}
-    alignment: 0
-    border: {x: 0, y: 0, z: 0, w: 0}
-    customData: 
-    rect:
-      serializedVersion: 2
-      x: 0
-      y: 0
-      width: 0
-      height: 0
-    spriteID: 
-    spriteBone: []
-    spriteOutline: []
-    vertices: []
-    spritePhysicsOutline: []
-    indices: 
-    edges: []
-    tessellationDetail: 0
-    uvTransform: {x: 0, y: 0}
-  animatedSpriteImportData:
-  - name: Frame_0
-    originalName: 
-    pivot: {x: 0.512, y: -0.049180325}
-    alignment: 9
-    border: {x: 0, y: 0, z: 0, w: 0}
-    customData: 
-    rect:
-      serializedVersion: 2
-      x: 4
-      y: 4
-      width: 125
-      height: 122
-    spriteID: 9f93220e7726bb04bbbf0c1291a045b1
-    spriteBone: []
-    spriteOutline: []
-    vertices: []
-    spritePhysicsOutline: []
-    indices: 
-    edges: []
-    tessellationDetail: 0
-    uvTransform: {x: 4, y: 4}
-  - name: Frame_1
-    originalName: 
-    pivot: {x: 0.512, y: -0.049180325}
-    alignment: 9
-    border: {x: 0, y: 0, z: 0, w: 0}
-    customData: 
-    rect:
-      serializedVersion: 2
-      x: 4
-      y: 134
-      width: 125
-      height: 122
-    spriteID: fa547d066d86de94abd8ccea761d1e49
-    spriteBone: []
-    spriteOutline: []
-    vertices: []
-    spritePhysicsOutline: []
-    indices: 
-    edges: []
-    tessellationDetail: 0
-    uvTransform: {x: 4, y: 134}
-  - name: Frame_2
-    originalName: 
-    pivot: {x: 0.53333336, y: -0.04}
-    alignment: 9
-    border: {x: 0, y: 0, z: 0, w: 0}
-    customData: 
-    rect:
-      serializedVersion: 2
-      x: 4
-      y: 264
-      width: 120
-      height: 100
-    spriteID: 16511587d00387b4e89c40aaed006b09
-    spriteBone: []
-    spriteOutline: []
-    vertices: []
-    spritePhysicsOutline: []
-    indices: 
-    edges: []
-    tessellationDetail: 0
-    uvTransform: {x: 4, y: 264}
-  - name: Frame_3
-    originalName: 
-    pivot: {x: 0.7710843, y: -0.093023255}
-    alignment: 9
-    border: {x: 0, y: 0, z: 0, w: 0}
-    customData: 
-    rect:
-      serializedVersion: 2
-      x: 137
-      y: 4
-      width: 83
-      height: 43
-    spriteID: 6678880db7928e84cae68285a0081844
-    spriteBone: []
-    spriteOutline: []
-    vertices: []
-    spritePhysicsOutline: []
-    indices: 
-    edges: []
-    tessellationDetail: 0
-    uvTransform: {x: 137, y: 4}
-  spriteSheetImportData: []
-  tileSetImportData: []
-  asepriteLayers:
-  - layerIndex: 0
-    uuid:
-      value0: 276277910
-      value1: 0
-      value2: 0
-      value3: 0
-    guid: 0
-    name: Slash1
-    layerFlags: 0
-    layerType: 0
-    blendMode: 0
-    cells:
-    - name: Frame_0
-      frameIndex: 0
-      additiveSortOrder: 0
-      cellRect:
-        x: 0
-        y: 6
-        width: 125
-        height: 122
-      spriteId: 9f93220e7726bb04bbbf0c1291a045b1
-    - name: Frame_1
-      frameIndex: 1
-      additiveSortOrder: 0
-      cellRect:
-        x: 0
-        y: 6
-        width: 125
-        height: 122
-      spriteId: fa547d066d86de94abd8ccea761d1e49
-    - name: Frame_2
-      frameIndex: 2
-      additiveSortOrder: 0
-      cellRect:
-        x: 0
-        y: 4
-        width: 120
-        height: 100
-      spriteId: 16511587d00387b4e89c40aaed006b09
-    - name: Frame_3
-      frameIndex: 3
-      additiveSortOrder: 0
-      cellRect:
-        x: 0
-        y: 4
-        width: 83
-        height: 43
-      spriteId: 6678880db7928e84cae68285a0081844
-    linkedCells: []
-    tileCells: []
-    tileSetIndex: 0
-    parentIndex: -1
-  tileSets: []
-  platformSettings:
-  - name: DefaultTexturePlatform
-    overridden: 0
-    ignorePlatformSupport: 0
-    maxTextureSize: 16384
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    androidETC2FallbackOverride: 0
-  - name: Standalone
-    overridden: 0
-    ignorePlatformSupport: 0
-    maxTextureSize: 16384
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    androidETC2FallbackOverride: 0
-  - name: WebGL
-    overridden: 0
-    ignorePlatformSupport: 0
-    maxTextureSize: 16384
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    androidETC2FallbackOverride: 0
-  generatePhysicsShape: 0
-  secondarySpriteTextures: []
-  spritePackingTag: 
-  canvasSize: {x: 128, y: 128}
-  previousTextureSize: {x: 256, y: 512}

Assets/Scenes/HomeTown.unity

@@ -559,7 +559,7 @@ Transform:
   m_GameObject: {fileID: 308205144}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -71.07149, y: -11.110194, z: -20.03828}
+  m_LocalPosition: {x: -3.4414895, y: -0.4461943, z: -20.03828}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -685,7 +685,7 @@ Transform:
   m_GameObject: {fileID: 399472910}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: -1.082, z: 0}
   m_LocalScale: {x: 1, y: 0.5, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -734,7 +734,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 651355007
   m_SortingLayer: 4
-  m_SortingOrder: -1
+  m_SortingOrder: 0
   m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3}
   m_Color: {r: 0, g: 0, b: 0, a: 0.5372549}
   m_FlipX: 0
@@ -833,7 +833,7 @@ Transform:
   m_GameObject: {fileID: 519420028}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -71.07149, y: -11.110194, z: -20.03828}
+  m_LocalPosition: {x: -3.4414895, y: -0.4461943, z: -20.03828}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -881,7 +881,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 243343966221896818, guid: 6447e7f877b893f46bc4efe1ebc9fe9e, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 8.53
+      value: -0.6309252
       objectReference: {fileID: 0}
     - target: {fileID: 243343966221896818, guid: 6447e7f877b893f46bc4efe1ebc9fe9e, type: 3}
       propertyPath: m_LocalPosition.y
@@ -1088,107 +1088,6 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 210474383900406282, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3}
   m_PrefabInstance: {fileID: 5778659820767749594}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &954915986
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 954915987}
-  - component: {fileID: 954915988}
-  - component: {fileID: 954915989}
-  - component: {fileID: 954915990}
-  m_Layer: 9
-  m_Name: AttackAnimations
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &954915987
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 954915986}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.08600044, z: 0}
-  m_LocalScale: {x: 0.9, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1868591327}
-  m_Father: {fileID: 1283345871}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!58 &954915988
-CircleCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 954915986}
-  m_Enabled: 0
-  serializedVersion: 3
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_ForceSendLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ForceReceiveLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ContactCaptureLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_CallbackLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_CompositeOperation: 0
-  m_CompositeOrder: 0
-  m_Offset: {x: 4, y: 0}
-  m_Radius: 4
---- !u!210 &954915989
-SortingGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 954915986}
-  m_Enabled: 1
-  m_SortingLayerID: 651355007
-  m_SortingLayer: 4
-  m_SortingOrder: 0
-  m_SortAtRoot: 0
---- !u!114 &954915990
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 954915986}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5cb42c19bc5ec4d419f9af6852bc2e5c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  MeleeAnimator: {fileID: 1868591329}
-  MeleeAnimationNames:
-  - Slash1
-  - Slash2
-  - Slash1
-  MeleeAttackState: 050000000600000007000000
 --- !u!1 &972432121
 GameObject:
   m_ObjectHideFlags: 0
@@ -1216,7 +1115,7 @@ Transform:
   m_GameObject: {fileID: 972432121}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.0120001, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 3, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -11399,7 +11298,7 @@ Transform:
   m_GameObject: {fileID: 1273554247}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.42, z: 0}
+  m_LocalPosition: {x: 0, y: -0.592, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -16205,11 +16104,6 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     vectorLabel1_3: W
---- !u!4 &1283345871 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4060073025839678449, guid: d00d92ab204198c489965b31a298b234, type: 3}
-  m_PrefabInstance: {fileID: 2316236105731553357}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1302188853
 GameObject:
   m_ObjectHideFlags: 0
@@ -16410,7 +16304,6 @@ GameObject:
   - component: {fileID: 1341160148}
   - component: {fileID: 1341160150}
   - component: {fileID: 1341160149}
-  - component: {fileID: 1341160151}
   m_Layer: 0
   m_Name: SuperSpecialGem
   m_TagString: Untagged
@@ -16500,18 +16393,6 @@ CapsuleCollider2D:
   m_Offset: {x: -0.000000041577255, y: -1.0987755}
   m_Size: {x: 0.9634323, y: 0.4174567}
   m_Direction: 1
---- !u!210 &1341160151
-SortingGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1341160147}
-  m_Enabled: 1
-  m_SortingLayerID: 651355007
-  m_SortingLayer: 4
-  m_SortingOrder: 0
-  m_SortAtRoot: 0
 --- !u!1 &1391087628 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2556762544583169317, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3}
@@ -85917,78 +85798,6 @@ Transform:
   - {fileID: 1223463192}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1702632256 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3181745081738111622, guid: d00d92ab204198c489965b31a298b234, type: 3}
-  m_PrefabInstance: {fileID: 2316236105731553357}
-  m_PrefabAsset: {fileID: 0}
---- !u!212 &1702632258
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1702632256}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 1, y: 1}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 0
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 1
---- !u!210 &1702632259
-SortingGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1702632256}
-  m_Enabled: 1
-  m_SortingLayerID: 651355007
-  m_SortingLayer: 4
-  m_SortingOrder: 0
-  m_SortAtRoot: 0
 --- !u!1 &1731397399 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 8668308405175649564, guid: 67f4f13276986cc4cb4705a4f1c4808a, type: 3}
@@ -86238,116 +86047,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1865767587}
   m_CullTransparentMesh: 1
---- !u!1 &1868591326
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1868591327}
-  - component: {fileID: 1868591329}
-  - component: {fileID: 1868591328}
-  m_Layer: 9
-  m_Name: MeleeAnimator
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1868591327
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1868591326}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 4.1, y: -3.62, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 954915987}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &1868591328
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1868591326}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 651355007
-  m_SortingLayer: 4
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 7.8125, y: 7.625}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 0
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
---- !u!95 &1868591329
-Animator:
-  serializedVersion: 7
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1868591326}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 19053954f80562a45a8e89efeabea17d, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
 --- !u!224 &1940124275 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 7265670549458409549, guid: 5d2a76780a99f14479488d05d220c246, type: 3}
@@ -86623,10 +86322,6 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 1680573792925415762, guid: d00d92ab204198c489965b31a298b234, type: 3}
-      propertyPath: AttackAnimator
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 1680573792925415762, guid: d00d92ab204198c489965b31a298b234, type: 3}
       propertyPath: StaminaSliderHud
       value: 
@@ -86647,25 +86342,13 @@ PrefabInstance:
       propertyPath: 'ClassIndicators.Array.data[3]'
       value: 
       objectReference: {fileID: 1731397399}
-    - target: {fileID: 1787569555844345674, guid: d00d92ab204198c489965b31a298b234, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1.086
-      objectReference: {fileID: 0}
-    - target: {fileID: 1897313902523258814, guid: d00d92ab204198c489965b31a298b234, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.03
-      objectReference: {fileID: 0}
-    - target: {fileID: 3647552498760287226, guid: d00d92ab204198c489965b31a298b234, type: 3}
-      propertyPath: m_SpriteSortPoint
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 4060073025839678449, guid: d00d92ab204198c489965b31a298b234, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -71.27
+      value: -3.64
       objectReference: {fileID: 0}
     - target: {fileID: 4060073025839678449, guid: d00d92ab204198c489965b31a298b234, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -11.98
+      value: -0.26
       objectReference: {fileID: 0}
     - target: {fileID: 4060073025839678449, guid: d00d92ab204198c489965b31a298b234, type: 3}
       propertyPath: m_LocalPosition.z
@@ -86699,14 +86382,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7702329272476180476, guid: d00d92ab204198c489965b31a298b234, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7702329272476180476, guid: d00d92ab204198c489965b31a298b234, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 9117212351613092415, guid: d00d92ab204198c489965b31a298b234, type: 3}
       propertyPath: m_ExcludeLayers.m_Bits
       value: 136
@@ -86719,17 +86394,8 @@ PrefabInstance:
     m_RemovedGameObjects:
     - {fileID: 4553260134269457595, guid: d00d92ab204198c489965b31a298b234, type: 3}
     - {fileID: 9098681062314285509, guid: d00d92ab204198c489965b31a298b234, type: 3}
-    m_AddedGameObjects:
+    m_AddedGameObjects: []
-    - targetCorrespondingSourceObject: {fileID: 4060073025839678449, guid: d00d92ab204198c489965b31a298b234, type: 3}
+    m_AddedComponents: []
-      insertIndex: 0
-      addedObject: {fileID: 954915987}
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 3181745081738111622, guid: d00d92ab204198c489965b31a298b234, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1702632259}
-    - targetCorrespondingSourceObject: {fileID: 3181745081738111622, guid: d00d92ab204198c489965b31a298b234, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1702632258}
   m_SourcePrefab: {fileID: 100100000, guid: d00d92ab204198c489965b31a298b234, type: 3}
 --- !u!1001 &3495966144891276242
 PrefabInstance:

Assets/Scripts/Runtime/AI/EnemyManager/Gobler.cs

@@ -23,7 +23,6 @@ public class Gobler : Alive {
   [SerializeField] public float Health = 10f;
   [SerializeField] public float Energy = 10f;
 
-  protected FloatingTextSpawner TextPopUp;
 
 
   private Player Player { get { return Player.Instance; } }
@@ -57,8 +56,6 @@ public class Gobler : Alive {
     Rigidbody = Owner.GetComponent<Rigidbody2D>();
     Materials = Owner.GetComponentsInChildren<SpriteRenderer>().Select(x => x.material).ToList();
 
-    TextPopUp = new FloatingTextSpawner(Owner.transform, 1);
-
     SetState(State.GoToCrystal);
     EnemyManagers[Enemies.Gobler].UpdateTick += Update;
     EnemyManagers[Enemies.Gobler].GizmoTick += OnDrawGizmos;
@@ -131,7 +128,7 @@ public class Gobler : Alive {
 
 
       case State.TakeDamage:
-        Rigidbody.linearVelocity = DirectionOfDamage * Knockback * 10 * InvincibilityLeft;
+        Rigidbody.linearVelocity = DirectionOfDamage * 100 * InvincibilityLeft;
         Materials.ForEach(x => x.SetFloat("_FlashAmount", InvincibilityLeft));
         if (!IsInvincible) SetState(State.None);
         break;
@@ -176,7 +173,6 @@ public class Gobler : Alive {
 
       case State.TakeDamage:
         PathAgent.isStopped = true;
-        TextPopUp.SpawnFloatingText(DamageTaken.ToString(), Color.red, 3);
         Materials.ForEach(x => x.SetColor("_FlashColor", Color.white));
         break;
 
@@ -239,16 +235,14 @@ public class Alive {
 
   protected int DamageTaken;
   protected Vector2 DirectionOfDamage;
-  protected int Knockback;
 
-  public void Damage(int amount, Vector2 hitDirection, int knockback = 1) {
+  public void TakeDamage(int amount, Vector2 hitDirection) {
     if (IsDead || IsInvincible) return;
 
     CurrentHealth -= amount;
     CurrentHealth = Mathf.Max(CurrentHealth, 0);
     InvincibleUntil = Time.time + InvincibilityDuration;
     DamageTaken = amount;
-    Knockback = knockback;
 
     hitDirection = hitDirection.normalized;
     if (hitDirection == Vector2.zero) hitDirection = Vector2.up;

Assets/Scripts/Runtime/Characters/Player/Classes/AttackAnimatorFactory.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Unity.Mathematics;
+using UnityEngine;
+
+
+public class AttackAnimatorFactory : MonoBehaviour {
+
+  private Animator Melee;
+  private Player Player;
+  private bool AllowAttacks;
+  protected FloatingTextSpawner TextPopUp;
+
+  public void Awake() {
+    Melee = GetComponent<Animator>();
+    Player = GetComponentInParent<Player>();
+    TextPopUp = new FloatingTextSpawner(this.transform);
+
+  }
+
+  public Action<GameObject> OnHit;
+  private void OnTriggerEnter2D(Collider2D other) {
+    if (!AllowAttacks) return;
+    if (!other.CompareTag("EnemyHitBox")) return;
+    Debug.Log($"Colliding with {other.gameObject.name}");
+    TextPopUp.SpawnFloatingText($"Hit", Color.red, 3);
+    OnHit?.Invoke(other.gameObject);
+    ApplyKnockBack(other);
+  }
+
+  private void ApplyKnockBack(Collider2D other) {
+    Rigidbody2D parentRb = other.transform.root.GetComponent<Rigidbody2D>();
+    if (parentRb == null) return;
+    Vector3 mouseWorldPos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
+    Vector2 direction = mouseWorldPos - Player.transform.parent.gameObject.transform.position;
+    parentRb.AddForce(direction * 10f, ForceMode2D.Impulse);
+    //KnockbackUtility.ApplyKnockback(this, rb2D, hitDirection, 10f, 0.3f);
+  }
+
+  public void AllowAttack(int allow) {
+    AllowAttacks = (allow == 1);
+  }
+
+  public void RotateTowardsMouse() {
+    Vector3 mouseWorldPos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
+    Vector2 direction = mouseWorldPos - Player.transform.position;
+    float angle = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg;
+    transform.rotation = Quaternion.Euler(0, 0, angle - 180f);
+  }
+
+  public void MeleeResetKineticCharge() {
+    //Melee.CrossFade("Blank", 0, 1);
+  }
+
+  public void MeleeBasic(int set) {
+    return;
+    RotateTowardsMouse();
+
+    if (set == 1) Melee.CrossFade("BasicAttack1", 0, 0);
+    else if (set == 2) Melee.CrossFade("BasicAttack2", 0, 0);
+    else if (set == 3) Melee.CrossFade("BasicAttack3", 0, 0);
+
+    if (set == 1) Melee.CrossFade("KineticSurge1", 0, 1);
+    else if (set == 2) Melee.CrossFade("KineticSurge2", 0, 1);
+    else if (set == 3) Melee.CrossFade("KineticSurge3", 0, 1);
+  }
+
+  public void MeleeKineticSurge() {
+    return;
+    Melee.CrossFade("KineticSurgeRelease", 0, 0);
+  }
+}

Assets/Scripts/Runtime/Characters/Player/Classes/ClassBase.cs

@@ -24,7 +24,7 @@ public class ClassBase {
   protected Transform PlayerTransform { get { return Player.transform; } }
   protected Vector2 PlayerPos { get { return PlayerTransform.position; } }
   protected Animator Animator;
-  protected PlayerAttackAnimatorFactory AttackAnimator;
+  protected AttackAnimatorFactory AttackAnimator;
   protected float PlayerOriginalSpeed;
   protected FloatingTextSpawner TextPopUp;
   /// <summary>Always in the order of Up, Down, Left, Right</summary>
@@ -35,8 +35,8 @@ public class ClassBase {
   public ClassBase(Player player) {
     Player = player;
     Animator = Player.Animator;
-    AttackAnimator = PlayerAttackAnimatorFactory.Instance;
+    AttackAnimator = Player.AttackAnimator;
-    TextPopUp = new FloatingTextSpawner(player.transform, 0.5f);
+    TextPopUp = new FloatingTextSpawner(player.transform);
   }
 
   virtual public void Tick() {
@@ -98,14 +98,11 @@ public class ClassBase {
 
 
   protected Coroutine AttackCoroutine;
-  protected void CreateHitBoxOffset(float centerOffset, float radius, float hitDelay, float hitDuration, int damage, int knockback) {
+  protected void CreateHitBoxOffset(float centerOffset, float radius, float hitDelay, float hitDuration) {
     if (AttackCoroutine != null)
       Player.Instance.StopCoroutine(AttackCoroutine);
     var center = PlayerPos + Player.PrevDirection * centerOffset;
     hitDelay = 0;
-    HitBoxDraw.Knockback = knockback;
-    HitBoxDraw.Directional = centerOffset != 0;
-    HitBoxDraw.Damage = damage;
     AttackCoroutine = Player.Instance.StartCoroutine(CreateHitBoxHelper(center, radius, hitDelay, hitDuration));
   }
 
@@ -130,11 +127,8 @@ public class ClassBase {
   public class HitBoxDrawClass {
     public bool Draw;
     public bool Active;
-    public bool Directional;
     public Vector2 Center;
     public float Radius;
     public Color Color;
-    public int Knockback;
-    public int Damage;
   }
 }

Assets/Scripts/Runtime/Characters/Player/Classes/MeleeFighterClass.cs

@@ -19,9 +19,6 @@ public class MeleeFighterClass : ClassBase {
   public float Cooldown;
   public bool TimesUp;
 
-  public int DamageMultiplier = 1;
-  public int DamageOffset = 0;
-
 
   public VfxHandlerBase VfxKineticSurgeHandler { get { return Player.VfxKineticSurgeHandler; } }
 
@@ -77,9 +74,8 @@ public class MeleeFighterClass : ClassBase {
         AttackAnimator?.MeleeResetKineticCharge();
         AttackAnimator?.MeleeKineticSurge();
         AnimationToPlay = "Attack1";
-        //TextPopUp.SpawnFloatingText("KineticSurge", Color.red, 3);
+        TextPopUp.SpawnFloatingText("KineticSurge", Color.red, 3);
         AllowBladeVortex = ComboTimeElapsed <= 0.1f;
-        CreateHitBoxOffset(0, 5, 0.1f, 0.1f, (10 * DamageMultiplier) + DamageOffset, 20);
         break;
 
 
@@ -210,12 +206,11 @@ public class MeleeFighterClass : ClassBase {
     Player.MoveSpeedDampener = (state == AttackState.None) ? 1 : 1 / decreasedSpeed;
     if (state == AttackState.None) return;
     Cooldown = cooldown;
-    //TextPopUp.SpawnFloatingText(state.ToString(), Color.red, 3);
+    TextPopUp.SpawnFloatingText(state.ToString(), Color.red, 3);
     ComboResetTime = resetTime;
     LastComboTime = Time.time;
 
     RotateTowardsMouse();
-    AttackAnimator?.MeleeBasic(CurrentState);
 
     switch (CurrentState) {
       case AttackState.None:
@@ -227,7 +222,6 @@ public class MeleeFighterClass : ClassBase {
       case AttackState.Shockwave:
         AnimationToPlay = "Shockwave";
         Player.VfxShockwavePool.Get(Player.transform.position);
-        CreateHitBoxOffset(0, 5, 0.1f, 0.1f, (20 * DamageMultiplier) + DamageOffset, 20);
         Player.IsJumping = false;
         break;
 
@@ -237,17 +231,20 @@ public class MeleeFighterClass : ClassBase {
 
       case AttackState.BasicAttack1:
         AnimationToPlay = "Attack1";
-        CreateHitBoxOffset(4, 4, 0.1f, 0.1f, (2 * DamageMultiplier) + DamageOffset, 10);
+        AttackAnimator?.MeleeBasic(1);
+        CreateHitBoxOffset(2, 3, 0.1f, 0.1f);
         break;
 
       case AttackState.BasicAttack2:
         AnimationToPlay = "Attack2";
-        CreateHitBoxOffset(4, 4, 0.1f, 0.1f, (4 * DamageMultiplier) + DamageOffset, 15);
+        AttackAnimator?.MeleeBasic(2);
+        CreateHitBoxOffset(2, 3, 0.1f, 0.1f);
         break;
 
       case AttackState.BasicAttack3:
         AnimationToPlay = "Attack1";
-        CreateHitBoxOffset(4, 4, 0.1f, 0.1f, (6 * DamageMultiplier) + DamageOffset, 20);
+        AttackAnimator?.MeleeBasic(3);
+        CreateHitBoxOffset(2, 3, 0.1f, 0.1f);
         break;
 
       case AttackState.KineticSurgeRelease:

Assets/Scripts/Runtime/Characters/Player/Classes/PlayerAttackAnimatorFactory.cs

@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Unity.Mathematics;
-using UnityEngine;
-
-
-public class PlayerAttackAnimatorFactory : MonoBehaviour {
-  public static PlayerAttackAnimatorFactory Instance;
-  private Player Player;
-  private bool AllowAttacks;
-  protected FloatingTextSpawner TextPopUp;
-
-  public Animator MeleeAnimator;
-  public List<string> MeleeAnimationNames;
-  public List<MeleeFighterClass.AttackState> MeleeAttackState;
-  private Dictionary<MeleeFighterClass.AttackState, string> MeleeAnimationNameDict;
-
-  public void Awake() {
-    Instance = this;
-    Player = GetComponentInParent<Player>();
-    TextPopUp = new FloatingTextSpawner(this.transform, 0.5f);
-
-    BuildMeleeAnimationClips();
-  }
-
-  private void BuildMeleeAnimationClips() {
-    MeleeAnimationNameDict = new Dictionary<MeleeFighterClass.AttackState, string>();
-    for (int i = 0; i < MeleeAttackState.Count; i++)
-      MeleeAnimationNameDict.Add(MeleeAttackState[i], MeleeAnimationNames[i]);
-  }
-
-  public Action<GameObject> OnHit;
-  private void OnTriggerEnter2D(Collider2D other) {
-    if (!AllowAttacks) return;
-    if (!other.CompareTag("EnemyHitBox")) return;
-    Debug.Log($"Colliding with {other.gameObject.name}");
-    TextPopUp.SpawnFloatingText($"Hit", Color.red, 3);
-    OnHit?.Invoke(other.gameObject);
-    ApplyKnockBack(other);
-  }
-
-  private void ApplyKnockBack(Collider2D other) {
-    Rigidbody2D parentRb = other.transform.root.GetComponent<Rigidbody2D>();
-    if (parentRb == null) return;
-    Vector3 mouseWorldPos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
-    Vector2 direction = mouseWorldPos - Player.transform.parent.gameObject.transform.position;
-    parentRb.AddForce(direction * 10f, ForceMode2D.Impulse);
-    //KnockbackUtility.ApplyKnockback(this, rb2D, hitDirection, 10f, 0.3f);
-  }
-
-  public void AllowAttack(int allow) {
-    AllowAttacks = (allow == 1);
-  }
-
-  public void RotateTowardsPlayerDirection() {
-    //float angle = Mathf.Atan2(Player.PrevDirection.y, Player.PrevDirection.x) * Mathf.Rad2Deg;
-    //angle = (angle + 360f) % 360f;
-
-    //Vector3 mouseWorldPos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
-    //Vector2 direction = mouseWorldPos - Player.transform.position;
-    float angle = Mathf.Atan2(Player.PrevDirection.y, Player.PrevDirection.x) * Mathf.Rad2Deg;
-    transform.rotation = Quaternion.Euler(0, 0, angle);
-  }
-
-  public void MeleeResetKineticCharge() {
-    //Melee.CrossFade("Blank", 0, 1);
-  }
-
-  public void MeleeBasic(MeleeFighterClass.AttackState state) {
-    Debug.Log(state.ToString());
-    if (!MeleeAnimationNameDict.ContainsKey(state)) return;
-    RotateTowardsPlayerDirection();
-
-    MeleeAnimator.CrossFade(MeleeAnimationNameDict[state], 0, 0);
-  }
-
-  public void MeleeKineticSurge() {
-    return;
-    MeleeAnimator.CrossFade("KineticSurgeRelease", 0, 0);
-  }
-}

Assets/Scripts/Runtime/Characters/Player/PlayerMainController.cs

@@ -25,7 +25,7 @@ public class Player : MonoBehaviour {
   [SerializeField] private GameObject[] ClassIndicators;
   private ClassBase ActiveClass;
   [SerializeField] private MeleeFighterClass FighterClass;
-  public PlayerAttackAnimatorFactory AttackAnimator;
+  public AttackAnimatorFactory AttackAnimator;
 
   [Header("Stamina")]
   [SerializeField] public float StaminaMax = 100;
@@ -203,8 +203,8 @@ public class Player : MonoBehaviour {
       if (!hit.CompareTag("EnemyHurtBox")) continue;
 
       GameObject parent = hit.transform.parent?.gameObject;
-      Vector2 knockbakDirection = ActiveClass.HitBoxDraw.Directional ? PrevDirection : parent.transform.position - transform.position;
+      //EnemySpawnerData.EnemyMap[parent].TakeDamage(0, transform.position - parent.transform.position);
-      EnemySpawnerData.EnemyMap[parent].Damage(ActiveClass.HitBoxDraw.Damage, knockbakDirection, ActiveClass.HitBoxDraw.Knockback);
+      EnemySpawnerData.EnemyMap[parent].TakeDamage(0, PrevDirection);
     }
   }
 
@@ -243,7 +243,6 @@ public class Player : MonoBehaviour {
 
   private void UpdateAnimation() {
     string state = GetAnimationState(MoveDirection);
-    if (state == "") return;
     if (state.Last() == '_')
       state = state.Replace("_", "");
     else

Assets/Scripts/Runtime/Environment/FloatingTextSpawner.cs

@@ -8,12 +8,10 @@ using UnityEngine;
 public class FloatingTextSpawner {
   private static GameObject GameObjectContainer = new GameObject($"Floating Text Container");
   private Transform Transform;
-  private float YOffset;
   private List<Transform> TextList = new List<Transform>();
 
-  public FloatingTextSpawner(Transform transform, float yOffset) {
+  public FloatingTextSpawner(Transform transform) {
     Transform = transform;
-    YOffset = yOffset;
   }
 
   public void SpawnFloatingText(string message, Color color, float duration = 1.5f) {
@@ -35,7 +33,7 @@ public class FloatingTextSpawner {
       renderer.sortingLayerName = "UI";
       renderer.sortingOrder = 0;
 
-      textObj.AddComponent<FloatingText>().Init(duration, ref TextList, YOffset);
+      textObj.AddComponent<FloatingText>().Init(duration, ref TextList);
       UnityEngine.Object.Instantiate(textObj, GameObjectContainer.transform);
     } catch (Exception e) { }
   }
@@ -49,7 +47,7 @@ public class FloatingText : MonoBehaviour {
   private TextMesh textMesh;
 
 
-  public void Init(float duration, ref List<Transform> textList, float yOffset) {
+  public void Init(float duration, ref List<Transform> textList) {
     try {
       lifetime = duration;
       textMesh = GetComponent<TextMesh>();
@@ -59,7 +57,7 @@ public class FloatingText : MonoBehaviour {
         if (textList[i] == null)
           textList.RemoveAt(i);
         else
-          textList[i].position += Vector3.up * yOffset;
+          textList[i].position += Vector3.up * 0.5f;
       }
 
       textList.Add(this.transform);

Assets/Scripts/Runtime/GameManagement/GameManager.cs

@@ -7,7 +7,6 @@ using Unity.VisualScripting;
 using UnityEngine;
 
 public class GameManager : MonoBehaviour {
-  [SerializeField] public float Timescale { set { Time.timeScale = value; } }
   [SerializeField] private GameObject CrystalRef;
   public static GameObject Crystal;
 

Packages/manifest.json

@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "com.unity.2d.aseprite": "1.2.5",
     "com.unity.cinemachine": "3.1.4",
     "com.unity.collab-proxy": "2.8.2",
     "com.unity.feature.2d": "2.0.1",

Packages/packages-lock.json

@@ -15,7 +15,7 @@
     },
     "com.unity.2d.aseprite": {
       "version": "1.2.5",
-      "depth": 0,
+      "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.2d.common": "10.0.0",
@@ -28,7 +28,7 @@
     },
     "com.unity.2d.common": {
       "version": "10.0.0",
-      "depth": 1,
+      "depth": 2,
       "source": "registry",
       "dependencies": {
         "com.unity.burst": "1.8.4",
@@ -194,7 +194,7 @@
     },
     "com.unity.mathematics": {
       "version": "1.3.2",
-      "depth": 1,
+      "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"

UserSettings/EditorUserSettings.asset

@@ -6,7 +6,7 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     GraphicsSettingsInspector_UserSettings:
-      value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b56d6cacb72ba5a52a362c3c0ee63201181433fe3e101bf3250b06144ca74c33ea191f058831cb58d5
+      value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b07a68ffab74f9ee2a3a30300cea1a11320d0beb1a0c25f7060f494b4cdf1b18f3045e38cb5ad8
       flags: 0
     RecentlyUsedSceneGuid-0:
       value: 5554570006545b0e590f0d24457a5e444e154a7d752d72687e2a4835bab66039