Änderungen am 15.03.2025 um 03:58 Uhr zuhause getroffen.

(Mache nach 2-4h Schlaf weiter. Noch nicht ganz fertig, aufgrund aufgrund mangelnder Zeit durch Arbeit, damaligen privaten Problemen und damals zu viel vorgenommen).
2025-03-15 03:58:28 +01:00
parent 823261e1b0
commit 8b29c36c54
209 changed files with 19442 additions and 5386 deletions
--- a/Assets/Animation/Idle.anim
+++ b/Assets/Animation/Idle.anim
@@ -1,117 +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: Idle
-  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: 868125030339051646, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 0.16666667
-      value: {fileID: 9105311359223224860, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 0.33333334
-      value: {fileID: -3097949279674416321, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 0.5
-      value: {fileID: -1519776253423612641, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 0.6666667
-      value: {fileID: -243276264118256662, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 0.8333333
-      value: {fileID: 900569118414966675, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 1
-      value: {fileID: 6668237522174485407, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 1.1666666
-      value: {fileID: 1921403233359721339, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 1.3333334
-      value: {fileID: 7893237874172254386, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 1.5
-      value: {fileID: 1834521522961548115, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 1.6666666
-      value: {fileID: 1010312392576486467, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 1.8333334
-      value: {fileID: -6702119853248141463, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 2
-      value: {fileID: 8979531466886121111, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 2.1666667
-      value: {fileID: 9179478403591178965, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 2.3333333
-      value: {fileID: 1899819381790022751, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - time: 2.5
-      value: {fileID: -8840293953672822298, guid: 66f231239f4aaa64da7b8db84bfcf931, 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: 868125030339051646, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: 9105311359223224860, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: -3097949279674416321, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: -1519776253423612641, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: -243276264118256662, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: 900569118414966675, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: 6668237522174485407, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: 1921403233359721339, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: 7893237874172254386, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: 1834521522961548115, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: 1010312392576486467, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: -6702119853248141463, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: 8979531466886121111, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: 9179478403591178965, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: 1899819381790022751, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-    - {fileID: -8840293953672822298, guid: 66f231239f4aaa64da7b8db84bfcf931, type: 3}
-  m_AnimationClipSettings:
-    serializedVersion: 2
-    m_AdditiveReferencePoseClip: {fileID: 0}
-    m_AdditiveReferencePoseTime: 0
-    m_StartTime: 0
-    m_StopTime: 2.5166667
-    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/Animation/Idle.anim.meta
+++ b/Assets/Animation/Idle.anim.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 36b76f957a83d2943a6151b6dd4654d3
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Animation/Player.controller
+++ b/Assets/Animation/Player.controller
@@ -1,30 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-6320704786582141446
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: run
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -4551705227777761421}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.516129
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1101 &-6123014394633386484
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -57,38 +32,11 @@ AnimatorState:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: Idle
+  m_Name: Player_Run
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions:
-  - {fileID: 2574957673272886650}
-  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: 36b76f957a83d2943a6151b6dd4654d3, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
--- !u!1102 &-3094120156657150406
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Run
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: -6320704786582141446}
+  - {fileID: -1503060013136022417}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -104,6 +52,31 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &-1503060013136022417
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: jump
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -525351659679146507}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.516129
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1107 &-1270366485340198211
 AnimatorStateMachine:
  serializedVersion: 6
@@ -116,15 +89,15 @@ AnimatorStateMachine:
  - serializedVersion: 1
    m_State: {fileID: -4551705227777761421}
    m_Position: {x: -160, y: 50, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: -3094120156657150406}
-    m_Position: {x: -160, y: 120, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -525351659679146507}
    m_Position: {x: -160, y: -20, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 6197601184112406635}
    m_Position: {x: 90, y: 50, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 5440229784051905774}
+    m_Position: {x: 90, y: -20, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions:
  - {fileID: -6123014394633386484}
@@ -143,7 +116,7 @@ AnimatorState:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: Jump
+  m_Name: Player_Jump
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions:
@@ -177,19 +150,13 @@ AnimatorController:
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
-  - m_Name: grounded
+    m_Controller: {fileID: 0}
+  - m_Name: jump
    m_Type: 4
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
-  - m_Name: jump
-    m_Type: 9
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@@ -203,31 +170,32 @@ AnimatorController:
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
--- !u!1101 &2574957673272886650
-AnimatorStateTransition:
+--- !u!1102 &5440229784051905774
+AnimatorState:
+  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: run
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -3094120156657150406}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.90066224
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
+  m_Name: Hurt
+  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!1102 &6197601184112406635
 AnimatorState:
  serializedVersion: 6
@@ -262,8 +230,8 @@ AnimatorStateTransition:
  m_PrefabAsset: {fileID: 0}
  m_Name: 
  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: grounded
+  - m_ConditionMode: 2
+    m_ConditionEvent: jump
    m_EventTreshold: 0
  m_DstStateMachine: {fileID: 0}
  m_DstState: {fileID: -4551705227777761421}
--- a/Assets/Animation/Player_Jump.anim
+++ b/Assets/Animation/Player_Jump.anim
@@ -6,7 +6,7 @@ AnimationClip:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: Run
+  m_Name: Player_Jump
  serializedVersion: 7
  m_Legacy: 0
  m_Compressed: 0
@@ -21,13 +21,13 @@ AnimationClip:
  - serializedVersion: 2
    curve:
    - time: 0
-      value: {fileID: 8226428791740424174, guid: 8d1cc4375d4560a4d983435e8fe296a9, type: 3}
+      value: {fileID: 21300000, guid: 3ff5190487272304684bb4a914da5710, type: 3}
    - time: 0.16666667
-      value: {fileID: -2475193019872397023, guid: 8d1cc4375d4560a4d983435e8fe296a9, type: 3}
+      value: {fileID: 21300000, guid: 9a34788dff7b33143a6fcb1f411ccdcf, type: 3}
    - time: 0.33333334
-      value: {fileID: 6552183235965900790, guid: 8d1cc4375d4560a4d983435e8fe296a9, type: 3}
+      value: {fileID: 21300000, guid: db4b1c25227137c4b883fc23cee90a85, type: 3}
    - time: 0.5
-      value: {fileID: 8850658752795833336, guid: 8d1cc4375d4560a4d983435e8fe296a9, type: 3}
+      value: {fileID: 21300000, guid: aeca1ccd16e0a114685bac5a742c5caf, type: 3}
    attribute: m_Sprite
    path: 
    classID: 212
@@ -50,10 +50,10 @@ AnimationClip:
      isIntCurve: 0
      isSerializeReferenceCurve: 0
    pptrCurveMapping:
-    - {fileID: 8226428791740424174, guid: 8d1cc4375d4560a4d983435e8fe296a9, type: 3}
-    - {fileID: -2475193019872397023, guid: 8d1cc4375d4560a4d983435e8fe296a9, type: 3}
-    - {fileID: 6552183235965900790, guid: 8d1cc4375d4560a4d983435e8fe296a9, type: 3}
-    - {fileID: 8850658752795833336, guid: 8d1cc4375d4560a4d983435e8fe296a9, type: 3}
+    - {fileID: 21300000, guid: 3ff5190487272304684bb4a914da5710, type: 3}
+    - {fileID: 21300000, guid: 9a34788dff7b33143a6fcb1f411ccdcf, type: 3}
+    - {fileID: 21300000, guid: db4b1c25227137c4b883fc23cee90a85, type: 3}
+    - {fileID: 21300000, guid: aeca1ccd16e0a114685bac5a742c5caf, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
--- a/Assets/Animation/Player_Jump.anim.meta
+++ b/Assets/Animation/Player_Jump.anim.meta
--- a/Assets/Animation/Player_Run.anim
+++ b/Assets/Animation/Player_Run.anim
@@ -6,7 +6,7 @@ AnimationClip:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: Jump
+  m_Name: Player_Run
  serializedVersion: 7
  m_Legacy: 0
  m_Compressed: 0
@@ -21,15 +21,13 @@ AnimationClip:
  - serializedVersion: 2
    curve:
    - time: 0
-      value: {fileID: 7156257804345056425, guid: 74d923a9f5c01844fb678c4ffefbd5a4, type: 3}
-    - time: 0.16666667
-      value: {fileID: 8637069488260089552, guid: 74d923a9f5c01844fb678c4ffefbd5a4, type: 3}
-    - time: 0.33333334
-      value: {fileID: 6798385304093286024, guid: 74d923a9f5c01844fb678c4ffefbd5a4, type: 3}
+      value: {fileID: 21300000, guid: 0dddba14433200f45bb353bda11b20b8, type: 3}
+    - time: 0.15
+      value: {fileID: 21300000, guid: d3289d8b97bef4949ad3d03a1b1c05d6, type: 3}
+    - time: 0.35
+      value: {fileID: 21300000, guid: 2bae8e705a88c6347b491586a1e3581e, type: 3}
    - time: 0.5
-      value: {fileID: 9129958432873934667, guid: 74d923a9f5c01844fb678c4ffefbd5a4, type: 3}
-    - time: 0.6666667
-      value: {fileID: 2592701112045043740, guid: 74d923a9f5c01844fb678c4ffefbd5a4, type: 3}
+      value: {fileID: 21300000, guid: b7e8be581e51bf7499ec75d874f3515c, type: 3}
    attribute: m_Sprite
    path: 
    classID: 212
@@ -52,22 +50,21 @@ AnimationClip:
      isIntCurve: 0
      isSerializeReferenceCurve: 0
    pptrCurveMapping:
-    - {fileID: 7156257804345056425, guid: 74d923a9f5c01844fb678c4ffefbd5a4, type: 3}
-    - {fileID: 8637069488260089552, guid: 74d923a9f5c01844fb678c4ffefbd5a4, type: 3}
-    - {fileID: 6798385304093286024, guid: 74d923a9f5c01844fb678c4ffefbd5a4, type: 3}
-    - {fileID: 9129958432873934667, guid: 74d923a9f5c01844fb678c4ffefbd5a4, type: 3}
-    - {fileID: 2592701112045043740, guid: 74d923a9f5c01844fb678c4ffefbd5a4, type: 3}
+    - {fileID: 21300000, guid: 0dddba14433200f45bb353bda11b20b8, type: 3}
+    - {fileID: 21300000, guid: d3289d8b97bef4949ad3d03a1b1c05d6, type: 3}
+    - {fileID: 21300000, guid: 2bae8e705a88c6347b491586a1e3581e, type: 3}
+    - {fileID: 21300000, guid: b7e8be581e51bf7499ec75d874f3515c, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 0.68333334
+    m_StopTime: 0.51666665
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 0
+    m_LoopTime: 1
    m_LoopBlend: 0
    m_LoopBlendOrientation: 0
    m_LoopBlendPositionY: 0
--- a/Assets/Animation/Player_Run.anim.meta
+++ b/Assets/Animation/Player_Run.anim.meta