Player walk animations

-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

View File

@@ -14,10 +14,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 573.60004
y: 38.4
width: 1521.6
height: 780.8
x: 0.8
y: 50.4
width: 889.60004
height: 772.8
m_ShowMode: 4
m_Title: Game
m_RootView: {fileID: 2}
@@ -44,8 +44,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1521.6
height: 780.8
width: 889.60004
height: 772.8
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1
@@ -69,7 +69,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 1521.6
width: 889.60004
height: 30
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -90,8 +90,8 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 760.8
width: 1521.6
y: 752.8
width: 889.60004
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
@@ -109,17 +109,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 6}
- {fileID: 12}
- {fileID: 11}
m_Position:
serializedVersion: 2
x: 0
y: 30
width: 1521.6
height: 730.8
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
width: 889.60004
height: 722.8
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 112
controlID: 124
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -134,17 +134,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 7}
- {fileID: 11}
- {fileID: 10}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1119.2
height: 730.8
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
width: 654.4
height: 722.8
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 113
controlID: 125
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -160,17 +160,16 @@ MonoBehaviour:
m_Children:
- {fileID: 8}
- {fileID: 9}
- {fileID: 10}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1119.2
height: 438.4
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 8096}
width: 654.4
height: 433.6
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 114
controlID: 126
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -188,13 +187,13 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
width: 324.8
height: 438.4
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14}
width: 189.6
height: 433.6
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 14}
- {fileID: 13}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &9
@@ -207,50 +206,25 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: SceneView
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 324.8
y: 0
width: 317.60004
height: 438.4
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 15}
- {fileID: 16}
m_Selected: 1
m_LastSelected: 0
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
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: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: GameView
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 642.4
x: 189.6
y: 0
width: 476.79993
height: 438.4
width: 464.80002
height: 433.6
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 13}
m_ActualView: {fileID: 12}
m_Panes:
- {fileID: 13}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &11
- {fileID: 14}
- {fileID: 15}
- {fileID: 12}
m_Selected: 2
m_LastSelected: 1
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -266,18 +240,18 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 438.4
width: 1119.2
height: 292.4
y: 433.6
width: 654.4
height: 289.19998
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 17}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 16}
- {fileID: 17}
- {fileID: 18}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &12
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -292,18 +266,18 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
x: 1119.2
x: 654.4
y: 0
width: 402.40002
height: 730.8
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 19}
width: 235.20001
height: 722.8
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 19}
- {fileID: 18}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &13
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -323,10 +297,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 649.60004
x: 190.40001
y: 80.8
width: 474.79993
height: 417.4
width: 462.80002
height: 412.6
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -337,7 +311,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 474.79993, y: 396.4}
m_TargetSize: {x: 462.80002, y: 391.6}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -352,10 +326,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -189.91997
m_HBaseRangeMax: 189.91997
m_VBaseRangeMin: -158.56
m_VBaseRangeMax: 158.56
m_HBaseRangeMin: -185.12001
m_HBaseRangeMax: 185.12001
m_VBaseRangeMin: -156.64
m_VBaseRangeMax: 156.64
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -373,29 +347,29 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 474.79993
height: 396.4
width: 462.80002
height: 391.6
m_Scale: {x: 1, y: 1}
m_Translation: {x: 237.39996, y: 198.2}
m_Translation: {x: 231.40001, y: 195.8}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -237.39996
y: -198.2
width: 474.79993
height: 396.4
x: -231.40001
y: -195.8
width: 462.80002
height: 391.6
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 593.4999, y: 521.75}
m_LastWindowPixelSize: {x: 578.5, y: 515.75}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
--- !u!114 &14
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -415,10 +389,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 7.2000003
x: 0.8
y: 80.8
width: 323.8
height: 417.4
width: 188.6
height: 412.6
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -426,23 +400,23 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 5ef0ffff
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 2afbffff
m_ExpandedIDs: 6832fdffac32fdffdc36fdff3443fdff7843fdffa847fdff465ffdff8a5ffdffa063fdff9489fdffd689fdffee8dfdff24f9ffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
m_OriginalName:
m_Name: BloodScreen
m_OriginalName: BloodScreen
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 0
m_UserData: -181096
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 11
m_OriginalEventType: 0
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 8}
m_SearchString:
@@ -452,7 +426,7 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 4c969a2b90040154d917609493e03593
--- !u!114 &15
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -472,10 +446,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 328.80002
x: 327.2
y: 73.6
width: 318
height: 418
width: 801.2
height: 417.4
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -484,6 +458,7 @@ MonoBehaviour:
m_KeySerializationHelper:
- {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
- {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2}
- {fileID: -9128348295522208378, guid: bcfd120671431f84097ebc1045370f76, type: 2}
m_ValueSerializationHelper:
- e00: 0.70260465
e01: 0
@@ -501,14 +476,30 @@ MonoBehaviour:
e31: 0
e32: 0
e33: 1
- e00: 0.6782804
- e00: 0.87967086
e01: 0
e02: 0
e03: -240.35721
e03: -127.94919
e10: 0
e11: 0.6782804
e11: 0.87967086
e12: 0
e13: 92.776474
e13: 81.58563
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- e00: 0.66389865
e01: 0
e02: 0
e03: 154.2858
e10: 0
e11: 0.66389865
e12: 0
e13: 99.095055
e20: 0
e21: 0
e22: 1
@@ -522,6 +513,8 @@ MonoBehaviour:
m_BreadCrumbs:
- m_Target: {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2}
m_ScrollPosition: {x: 0, y: 0}
- m_Target: {fileID: -9128348295522208378, guid: bcfd120671431f84097ebc1045370f76, type: 2}
m_ScrollPosition: {x: 0, y: 0}
stateMachineGraph: {fileID: 0}
stateMachineGraphGUI: {fileID: 0}
blendTreeGraph: {fileID: 0}
@@ -533,7 +526,7 @@ MonoBehaviour:
m_CurrentEditor: 0
m_LayerEditor:
m_SelectedLayerIndex: 0
--- !u!114 &16
--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -553,9 +546,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 332
y: 80.8
width: 315.60004
x: 327.2
y: 73.6
width: 801.2
height: 417.4
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -622,7 +615,7 @@ MonoBehaviour:
collapsed: 0
displayed: 1
snapOffset: {x: -112.000015, y: 86}
snapOffsetDelta: {x: 0, y: 0}
snapOffsetDelta: {x: 0.000015258789, y: 0}
snapCorner: 1
id: Orientation
index: 0
@@ -769,9 +762,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 11.616212, y: 1.3419256, z: 4.6519175}
m_Target: {x: 8.289744, y: -0.14671704, z: 6.968469}
speed: 2
m_Value: {x: 11.616212, y: 1.3419256, z: 4.6519175}
m_Value: {x: 8.289744, y: -0.14671704, z: 6.968469}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -818,17 +811,17 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: -0.20971945, y: 0.7315626, z: -0.25770992, w: -0.5953333}
m_Target: {x: 0.21894762, y: 0.10310626, z: -0.023273276, w: 0.96999484}
speed: 2
m_Value: {x: -0.20971923, y: 0.73156184, z: -0.25770965, w: -0.5953326}
m_Value: {x: 0.21894756, y: 0.10310624, z: -0.02327327, w: 0.9699946}
m_Size:
m_Target: 0.93468356
m_Target: 1.8152742
speed: 2
m_Value: 0.93468356
m_Value: 1.8152742
m_Ortho:
m_Target: 0
m_Target: 1
speed: 2
m_Value: 0
m_Value: 1
m_CameraSettings:
m_Speed: 1
m_SpeedNormalized: 0.5
@@ -849,7 +842,7 @@ MonoBehaviour:
m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
--- !u!114 &17
--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -869,10 +862,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 7.2000003
y: 519.2
width: 1118.2
height: 271.4
x: 0.8
y: 514.4
width: 653.4
height: 268.19998
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -890,22 +883,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Scripts/Weapons
- Assets/Prefabs/Player
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_StartGridSize: 91
m_LastFolders:
- Assets/Scripts/Weapons
m_LastFoldersGridSize: -1
- Assets/Prefabs/Player
m_LastFoldersGridSize: 91
m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 191}
m_SelectedIDs: ce660000
m_LastClickedID: 26318
m_ExpandedIDs: 00000000d6640000d8640000da640000f0640000f464000000ca9a3bffffff7f
scrollPos: {x: 0, y: 180}
m_SelectedIDs: 3e670000
m_LastClickedID: 26430
m_ExpandedIDs: 00000000c4650000c6650000c8650000ce650000d8650000da6500004e66000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -921,7 +914,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 11}
m_ClientGUIView: {fileID: 10}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
@@ -933,7 +926,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000d6640000d8640000da640000
m_ExpandedIDs: 00000000c4650000c6650000c8650000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -961,7 +954,7 @@ MonoBehaviour:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e60000036650000
m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e60000036650000b469000014250000bc690000b8690000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -977,7 +970,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 11}
m_ClientGUIView: {fileID: 10}
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
@@ -986,10 +979,10 @@ MonoBehaviour:
m_ResourceFile:
m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64
m_GridSize: 91
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 207
--- !u!114 &18
--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1017,7 +1010,7 @@ MonoBehaviour:
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
--- !u!114 &19
--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1037,10 +1030,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1126.4
x: 655.2
y: 80.8
width: 401.40002
height: 709.8
width: 234.20001
height: 701.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -1048,7 +1041,7 @@ MonoBehaviour:
m_ObjectsLockedBeforeSerialization: []
m_InstanceIDsLockedBeforeSerialization:
m_PreviewResizer:
m_CachedPref: 151
m_CachedPref: -417
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1