janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-29 12:52:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Player walk animations

Browse Source 
-Added walk animation
-Added strafe animation
-Added animation blending for strafe and walk
-Added method that controls animation parameters based on movement speed

-smol canvas fix
This commit is contained in:
juliuse98
2021-11-28 18:54:24 +01:00
parent 20080a4dd5
commit a4fb6b9f33
14 changed files with 2576 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
Assets/Prefabs/Player/Player Animation Test.prefab
View File

@@ -27,6 +27,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1197111049}
m_RootOrder: 1
@@ -82,6 +83,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0}
m_LocalPosition: {x: 0.023, y: -0.035, z: -0.066}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1197111049}
m_RootOrder: 0
@@ -137,6 +139,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.6539999, z: 0.4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 357599824}
- {fileID: 65959153}
@@ -186,6 +189,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4074665071222326704}
m_RootOrder: 0
@@ -279,6 +283,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.266}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6272346181657429396}
m_RootOrder: 2
@@ -306,6 +311,7 @@ GameObject:
- component: {fileID: -7261721819113345487}
- component: {fileID: 8357986889675898169}
- component: {fileID: 701870116503968957}
- component: {fileID: 7564572533756368624}
m_Layer: 0
m_Name: Player Animation Test
m_TagString: Player
@@ -323,6 +329,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 2.15, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6272346182417644039}
- {fileID: 981273033772084037}
@@ -382,7 +389,7 @@ MonoBehaviour:
sprintSpeed: 7
aimWalkSpeed: 3
fallDamageSpeed: 10
moveSmoothTime: 0.05
moveSmoothTime: 0.07
gravity: -10
jumpHeight: 1
inputDirection: {x: 0, y: 0, z: 0}
@@ -394,7 +401,10 @@ MonoBehaviour:
moveGroundAngle: 0
isGrounded: 0
isSprinting: 0
currentMaxSpeed: 5
currentDir: {x: 0, y: 0, z: 0}
velocity: {x: 0, y: 0, z: 0}
localVelocity: {x: 0, y: 0, z: 0}
--- !u!114 &3387435154213398635
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -440,6 +450,7 @@ MonoBehaviour:
returnForce: 0.001
impulsForce: 0.01
maxRecoil: 0.1
playerAnimator: {fileID: 1978909962}
aimSpeed: 0.06
aimVal: 0
AimPoint: {fileID: 2992488853448454767}
@@ -687,6 +698,22 @@ MonoBehaviour:
playerUICanvas: {fileID: 7193250173947823101}
damageImage: {fileID: 7193250173330865329}
healthText: {fileID: 3136766855045967149}
--- !u!114 &7564572533756368624
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6272346181302961293}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7f6f3bf89aa97405989c802ba270f815, type: 3}
m_Name:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.1
clientAuthority: 1
animator: {fileID: 1978909962}
--- !u!1 &6272346181657429393
GameObject:
m_ObjectHideFlags: 0
@@ -715,6 +742,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.15, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4074665071222326704}
- {fileID: 1979435770070801855}
@@ -803,6 +831,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6272346181302961296}
m_RootOrder: 0
@@ -834,6 +863,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6035287771982183217}
- {fileID: 4484858124469057129}
@@ -852,41 +882,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!95 &1978909962
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6576156620079053231}
m_Enabled: 1
m_Avatar: {fileID: 9000000, guid: 01316cb596562384da845bc519fb90de, type: 3}
m_Controller: {fileID: 9100000, guid: bcfd120671431f84097ebc1045370f76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &3855419186248803448
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6576156620079053231}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fff0960ef4ea6e04eac66b4a7fd2189d, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RigLayers:
- m_Rig: {fileID: 8865635171929772803}
m_Active: 1
m_Effectors: []
--- !u!1 &7061967201775281134
GameObject:
m_ObjectHideFlags: 0
@@ -914,6 +909,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1.66, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6272346181657429396}
m_Father: {fileID: 6272346181302961296}
@@ -957,6 +953,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.108, y: -0.084, z: 0.266}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6272346181657429396}
m_RootOrder: 1
@@ -989,6 +986,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7193250173947823100}
m_RootOrder: 1
@@ -1120,7 +1118,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3865739620182508120, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3}
propertyPath: m_Enabled
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3865739620182508120, guid: 1694107e062c51a49add7c6c9c7a0fbc, type: 3}
propertyPath: m_AdditionalShaderChannelsFlag
@@ -1398,6 +1396,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 01316cb596562384da845bc519fb90de, type: 3}
--- !u!1 &6576156620079053231 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3}
m_PrefabInstance: {fileID: 6305701708507383038}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5767109144009335573 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3}
m_PrefabInstance: {fileID: 6305701708507383038}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8334588817950881727 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3}
@@ -1428,16 +1436,42 @@ Transform:
m_CorrespondingSourceObject: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3}
m_PrefabInstance: {fileID: 6305701708507383038}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6576156620079053231 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3}
m_PrefabInstance: {fileID: 6305701708507383038}
--- !u!95 &1978909962
Animator:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5767109144009335573 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3}
m_PrefabInstance: {fileID: 6305701708507383038}
m_GameObject: {fileID: 6576156620079053231}
m_Enabled: 1
m_Avatar: {fileID: 9000000, guid: 01316cb596562384da845bc519fb90de, type: 3}
m_Controller: {fileID: 9100000, guid: bcfd120671431f84097ebc1045370f76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &3855419186248803448
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6576156620079053231}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fff0960ef4ea6e04eac66b4a7fd2189d, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RigLayers:
- m_Rig: {fileID: 8865635171929772803}
m_Active: 1
m_Effectors: []
--- !u!1001 &6343958082870406749
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1499,16 +1533,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
--- !u!1 &4484858123614617853 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7365407324475125408, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
m_PrefabInstance: {fileID: 6343958082870406749}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4484858124630204699 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7365407325624913734, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
m_PrefabInstance: {fileID: 6343958082870406749}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4484858123614617853 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7365407324475125408, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}
m_PrefabInstance: {fileID: 6343958082870406749}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4484858124469057129 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7365407325767981108, guid: f1dd059fe90d9e14da7ad60b3612969c, type: 3}