Merge remote-tracking branch 'origin/Player-Animation' into weapons-without-scriptableobjects

This commit is contained in:
Noah4ever
2021-11-09 11:18:16 +01:00
12 changed files with 594 additions and 449 deletions

View File

@@ -68,13 +68,13 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: ShootSpeed
m_Type: 1
m_DefaultFloat: 1
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -127,9 +127,9 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionDuration: 0.03
m_TransitionOffset: 0
m_ExitTime: 0.9
m_ExitTime: 0.96
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0