animation fixes, combo trigger break, new attack animation settings

2025-09-05 15:26:40 +02:00
parent 312dae2f4d
commit 8067a01b8e
22 changed files with 2077 additions and 732 deletions
--- a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat
+++ b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat
@@ -22,6 +22,28 @@ AnimatorStateMachine:
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: -2074274001345678418}
+--- !u!1101 &-9191327555805306621
+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: 1102861933717182418}
+  m_Solo: 0
+  m_Mute: 1
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.6808511
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-9143515860420698953
 AnimatorState:
  serializedVersion: 6
@@ -738,7 +760,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 9c0e8cc669ad24ae3bcdae73fa4c003b, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  startDamage: 0.3
+  startDamage: 0.2
  endDamage: 0.4
  damageMultiplier: 0
  recoilID: 1
@@ -758,9 +780,9 @@ MonoBehaviour:
  positionLerpSpeed: 2
  stoppingDistance: 1.2
  useComboTimingWindow: 1
-  comboWindowStartTime: 0.5
-  comboWindowDuration: 0.2
-  comboWindowTimeScale: 0.3
+  comboWindowStartTime: 0.7
+  comboWindowDuration: 0.4
+  comboWindowTimeScale: 0.2
  useAttackTimeScale: 0
  maxTargetDistance: 3
  lowHealthTh: 10
@@ -769,7 +791,7 @@ MonoBehaviour:
  attackTimeScaleEnd: 0.37
  rotatePlayerTowardsTarget: 1
  degreeThreshold: 100
-  debug: 1
+  debug: 0
 --- !u!1101 &-8051095333111886674
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -2715,7 +2737,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 9c0e8cc669ad24ae3bcdae73fa4c003b, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  startDamage: 0.4
+  startDamage: 0.3
  endDamage: 0.5
  damageMultiplier: 2
  recoilID: 2
@@ -2736,8 +2758,8 @@ MonoBehaviour:
  stoppingDistance: 1.2
  useComboTimingWindow: 1
  comboWindowStartTime: 0.6
-  comboWindowDuration: 0.2
-  comboWindowTimeScale: 0.3
+  comboWindowDuration: 0.4
+  comboWindowTimeScale: 0.2
  useAttackTimeScale: 1
  maxTargetDistance: 3
  lowHealthTh: 30
@@ -4604,6 +4626,24 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
+--- !u!114 &-2385230577109390366
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f3b04f29aa5b134b99e94c78b296dcf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  stateInfos: []
+  debug: 0
+  tags:
+  - tagName: Attack
+    tagType: 3
+    normalizedTime: {x: 0.1, y: 0.8}
 --- !u!206 &-2382170802819547054
 BlendTree:
  m_ObjectHideFlags: 1
@@ -4832,6 +4872,28 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &-1951197489304851175
+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: -262143111545491946}
+  m_Solo: 0
+  m_Mute: 1
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.99222386
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-1890823228988152332
 AnimatorState:
  serializedVersion: 6
@@ -5163,8 +5225,8 @@ MonoBehaviour:
  stoppingDistance: 1.2
  useComboTimingWindow: 1
  comboWindowStartTime: 0.6
-  comboWindowDuration: 0.2
-  comboWindowTimeScale: 0.3
+  comboWindowDuration: 0.4
+  comboWindowTimeScale: 0.2
  useAttackTimeScale: 1
  maxTargetDistance: 3
  lowHealthTh: 10
@@ -6086,6 +6148,36 @@ MonoBehaviour:
  stateInfos: []
  tags:
  - CustomAction
+--- !u!1102 &-262143111545491946
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: A1
+  m_Speed: 1.4
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 3665975024854504718}
+  - {fileID: -9191327555805306621}
+  m_StateMachineBehaviours:
+  - {fileID: -2385230577109390366}
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 1
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 6399467581995111687, guid: fb07a934dbc1969468121112ca048964,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1109 &-164828508768324166
 AnimatorTransition:
  m_ObjectHideFlags: 1
@@ -29503,10 +29595,10 @@ AnimatorStateTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0.23156369
-  m_TransitionOffset: 0.05401399
-  m_ExitTime: 0.7634842
-  m_HasExitTime: 1
+  m_TransitionDuration: 0.17750603
+  m_TransitionOffset: 0.12662058
+  m_ExitTime: 0.8490755
+  m_HasExitTime: 0
  m_HasFixedDuration: 0
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
@@ -33828,10 +33920,10 @@ AnimatorStateTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0.09166676
-  m_TransitionOffset: 0.012494694
-  m_ExitTime: 0.617021
-  m_HasExitTime: 1
+  m_TransitionDuration: 0.15347171
+  m_TransitionOffset: 0.008216396
+  m_ExitTime: 0.8888667
+  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
@@ -36601,12 +36693,13 @@ AnimatorState:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: A
+  m_Name: A0
  m_Speed: 1.3
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 1101963861138605418}
  - {fileID: 1101255493625229458}
+  - {fileID: -1951197489304851175}
  m_StateMachineBehaviours:
  - {fileID: 114405241802589726}
  - {fileID: 114667135945300734}
@@ -40730,30 +40823,33 @@ AnimatorStateMachine:
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: 1102466317250516052}
-    m_Position: {x: 240, y: 120, z: 0}
+    m_Position: {x: 170, y: 140, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 1102861933717182418}
-    m_Position: {x: 240, y: 50, z: 0}
+    m_Position: {x: 170, y: 20, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 1102186001672383516}
-    m_Position: {x: 240, y: -10, z: 0}
+    m_Position: {x: 400, y: -50, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 2206263804988382436}
-    m_Position: {x: 240, y: -120, z: 0}
+    m_Position: {x: 390, y: -140, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -493156934175870501}
    m_Position: {x: -30, y: -130, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -3801079781883241350}
    m_Position: {x: 270, y: -330, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -262143111545491946}
+    m_Position: {x: 440, y: 150, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 48, y: 60, z: 0}
-  m_EntryPosition: {x: 30, y: 120, z: 0}
-  m_ExitPosition: {x: 528, y: 60, z: 0}
+  m_AnyStatePosition: {x: 10, y: 60, z: 0}
+  m_EntryPosition: {x: -30, y: 140, z: 0}
+  m_ExitPosition: {x: 680, y: 40, z: 0}
  m_ParentStateMachinePosition: {x: 710, y: -50, z: 0}
  m_DefaultState: {fileID: 1102466317250516052}
 --- !u!1107 &1107517961391708756
@@ -46053,6 +46149,28 @@ MonoBehaviour:
  - tagName: LockRotation
    tagType: 3
    normalizedTime: {x: 0.35, y: 0.65}
+--- !u!1101 &3665975024854504718
+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: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8717949
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!114 &3671708723907702589
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -48772,10 +48890,10 @@ AnimatorStateTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0.33513224
-  m_TransitionOffset: 0
-  m_ExitTime: 0.8191499
-  m_HasExitTime: 1
+  m_TransitionDuration: 0.26323152
+  m_TransitionOffset: 0.018871611
+  m_ExitTime: 0.8424806
+  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1