Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added more functionalities (finally some Damage!) and blood particles. Added first attack animation and updated the animation controller Stats are now Scriptable Objects
- Loading branch information
1 parent
acd9a31
commit a175a93
Showing
39 changed files
with
5,540 additions
and
187 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...mations/Pogo Puschel/Idle_Right.anim.meta → Assets/Animations/Player/Kick_Down.anim.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!74 &7400000 | ||
| AnimationClip: | ||
| m_ObjectHideFlags: 0 | ||
| m_PrefabParentObject: {fileID: 0} | ||
| m_PrefabInternal: {fileID: 0} | ||
| m_Name: Kick_Left | ||
| serializedVersion: 6 | ||
| m_Legacy: 0 | ||
| m_Compressed: 0 | ||
| m_UseHighQualityCurve: 1 | ||
| m_RotationCurves: [] | ||
| m_CompressedRotationCurves: [] | ||
| m_EulerCurves: [] | ||
| m_PositionCurves: [] | ||
| m_ScaleCurves: [] | ||
| m_FloatCurves: [] | ||
| m_PPtrCurves: | ||
| - curve: | ||
| - time: 0 | ||
| value: {fileID: 21300066, guid: f54c46f6c269bf54eb5eaef876cfd48f, type: 3} | ||
| - time: 0.083333336 | ||
| value: {fileID: 21300068, guid: f54c46f6c269bf54eb5eaef876cfd48f, type: 3} | ||
| - time: 0.16666667 | ||
| value: {fileID: 21300070, guid: f54c46f6c269bf54eb5eaef876cfd48f, type: 3} | ||
| attribute: m_Sprite | ||
| path: | ||
| classID: 212 | ||
| script: {fileID: 0} | ||
| m_SampleRate: 12 | ||
| 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 | ||
| pptrCurveMapping: | ||
| - {fileID: 21300066, guid: f54c46f6c269bf54eb5eaef876cfd48f, type: 3} | ||
| - {fileID: 21300068, guid: f54c46f6c269bf54eb5eaef876cfd48f, type: 3} | ||
| - {fileID: 21300070, guid: f54c46f6c269bf54eb5eaef876cfd48f, type: 3} | ||
| m_AnimationClipSettings: | ||
| serializedVersion: 2 | ||
| m_AdditiveReferencePoseClip: {fileID: 0} | ||
| m_AdditiveReferencePoseTime: 0 | ||
| m_StartTime: 0 | ||
| m_StopTime: 0.25 | ||
| m_OrientationOffsetY: 0 | ||
| m_Level: 0 | ||
| m_CycleOffset: 0 | ||
| m_HasAdditiveReferencePose: 0 | ||
| m_LoopTime: 0 | ||
| 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_GenerateMotionCurves: 0 | ||
| m_Events: [] |
4 changes: 2 additions & 2 deletions
4
...ions/Pogo Puschel/Walking_Right.anim.meta → Assets/Animations/Player/Kick_Left.anim.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!74 &7400000 | ||
| AnimationClip: | ||
| m_ObjectHideFlags: 0 | ||
| m_PrefabParentObject: {fileID: 0} | ||
| m_PrefabInternal: {fileID: 0} | ||
| m_Name: Kick_Right | ||
| serializedVersion: 6 | ||
| m_Legacy: 0 | ||
| m_Compressed: 0 | ||
| m_UseHighQualityCurve: 1 | ||
| m_RotationCurves: [] | ||
| m_CompressedRotationCurves: [] | ||
| m_EulerCurves: [] | ||
| m_PositionCurves: [] | ||
| m_ScaleCurves: [] | ||
| m_FloatCurves: [] | ||
| m_PPtrCurves: | ||
| - curve: | ||
| - time: 0 | ||
| value: {fileID: 21300066, guid: f54c46f6c269bf54eb5eaef876cfd48f, type: 3} | ||
| - time: 0.083333336 | ||
| value: {fileID: 21300068, guid: f54c46f6c269bf54eb5eaef876cfd48f, type: 3} | ||
| - time: 0.16666667 | ||
| value: {fileID: 21300070, guid: f54c46f6c269bf54eb5eaef876cfd48f, type: 3} | ||
| attribute: m_Sprite | ||
| path: | ||
| classID: 212 | ||
| script: {fileID: 0} | ||
| m_SampleRate: 12 | ||
| 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 | ||
| pptrCurveMapping: | ||
| - {fileID: 21300066, guid: f54c46f6c269bf54eb5eaef876cfd48f, type: 3} | ||
| - {fileID: 21300068, guid: f54c46f6c269bf54eb5eaef876cfd48f, type: 3} | ||
| - {fileID: 21300070, guid: f54c46f6c269bf54eb5eaef876cfd48f, type: 3} | ||
| m_AnimationClipSettings: | ||
| serializedVersion: 2 | ||
| m_AdditiveReferencePoseClip: {fileID: 0} | ||
| m_AdditiveReferencePoseTime: 0 | ||
| m_StartTime: 0 | ||
| m_StopTime: 0.25 | ||
| m_OrientationOffsetY: 0 | ||
| m_Level: 0 | ||
| m_CycleOffset: 0 | ||
| m_HasAdditiveReferencePose: 0 | ||
| m_LoopTime: 0 | ||
| 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_GenerateMotionCurves: 0 | ||
| m_Events: [] |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.