Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Animations
Done with animations now just to add the volume slider on the pause menu
  • Loading branch information
aps16104 committed Mar 5, 2020
1 parent 4109a4d commit a89c03e
Show file tree
Hide file tree
Showing 21 changed files with 1,374 additions and 126 deletions.
89 changes: 89 additions & 0 deletions RPG/Assets/Animations/P_ChargedAttack.anim
@@ -0,0 +1,89 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: P_ChargedAttack
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: 21300000, guid: 6f257f98eeccdf04da26f28b83067ed5, type: 3}
- time: 0.083333336
value: {fileID: 21300000, guid: ff95915caecde394899da9508aeeb725, type: 3}
- time: 0.16666667
value: {fileID: 21300000, guid: 1b7e132892ab34242b26c73875d7a53b, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: f4f982a2775964246ab7f79eff0b361e, type: 3}
- time: 0.33333334
value: {fileID: 21300000, guid: eea732f3b0689e34c9b54536d0c088d1, type: 3}
- time: 0.41666666
value: {fileID: 21300000, guid: 578f0a60d33ea9646a8bbb3107b8b910, type: 3}
- time: 0.5
value: {fileID: 21300000, guid: 9d26784af33813f4d9a3071cee411915, type: 3}
- time: 0.5833333
value: {fileID: 21300000, guid: 86bfc2ec8b796584c83a40752ba8278a, 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: 21300000, guid: 6f257f98eeccdf04da26f28b83067ed5, type: 3}
- {fileID: 21300000, guid: ff95915caecde394899da9508aeeb725, type: 3}
- {fileID: 21300000, guid: 1b7e132892ab34242b26c73875d7a53b, type: 3}
- {fileID: 21300000, guid: f4f982a2775964246ab7f79eff0b361e, type: 3}
- {fileID: 21300000, guid: eea732f3b0689e34c9b54536d0c088d1, type: 3}
- {fileID: 21300000, guid: 578f0a60d33ea9646a8bbb3107b8b910, type: 3}
- {fileID: 21300000, guid: 9d26784af33813f4d9a3071cee411915, type: 3}
- {fileID: 21300000, guid: 86bfc2ec8b796584c83a40752ba8278a, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.6666666
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
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_Events: []
8 changes: 8 additions & 0 deletions RPG/Assets/Animations/P_ChargedAttack.anim.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions RPG/Assets/Animations/P_Death.anim
Expand Up @@ -21,29 +21,29 @@ AnimationClip:
- curve:
- time: 0
value: {fileID: 21300000, guid: 79d84b30b3613954c8a2361bd40405a6, type: 3}
- time: 0.1
value: {fileID: 21300000, guid: 94c4c4bf3918c714b92846f9a608ee1c, type: 3}
- time: 0.2
value: {fileID: 21300000, guid: 94c4c4bf3918c714b92846f9a608ee1c, type: 3}
- time: 0.4
value: {fileID: 21300000, guid: 387d873e05d99914281de6d3cfd591ed, type: 3}
- time: 0.3
- time: 0.6
value: {fileID: 21300000, guid: 32640277e12a060419b012dac05a85d4, type: 3}
- time: 0.4
- time: 0.8
value: {fileID: 21300000, guid: dd4b655b19ccb5e459220ab813470ea8, type: 3}
- time: 0.5
- time: 1
value: {fileID: 21300000, guid: 27393ad7c64528a4eaa98160aedb7660, type: 3}
- time: 0.6
- time: 1.2
value: {fileID: 21300000, guid: 39e8a2d4fec56b34fbdd34d784c0beb4, type: 3}
- time: 0.7
- time: 1.4
value: {fileID: 21300000, guid: 31a1e6e5cc6128e4ba6d7edfb3f34559, type: 3}
- time: 0.8
- time: 1.6
value: {fileID: 21300000, guid: e5ae94d39d880684dbb3f78fbf904767, type: 3}
- time: 0.9
- time: 1.8
value: {fileID: 21300000, guid: cda7697700d163142a83c484e201c382, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 10
m_SampleRate: 5
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -73,7 +73,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_StopTime: 2
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
Expand Down
44 changes: 31 additions & 13 deletions RPG/Assets/Animations/P_Heal.anim
Expand Up @@ -20,17 +20,29 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: 567caf10e2be9404bb0aa1b75c05b443, type: 3}
value: {fileID: 21300000, guid: 952280097aba2cd43a9cbdcc9635bcd0, type: 3}
- time: 0.125
value: {fileID: 21300000, guid: c8cc0879bb27d0540b36c5fab9f3b5f0, type: 3}
value: {fileID: 21300000, guid: e094b29c9d0dd0e42bd4269f27165156, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: a6333c2d5552f624a8c4dffc6ad58f07, type: 3}
value: {fileID: 21300000, guid: 7f02dded345580142a42fd118af7e061, type: 3}
- time: 0.375
value: {fileID: 21300000, guid: 3621e3be8a578434ea30d317882cfeff, type: 3}
value: {fileID: 21300000, guid: 6ccdc4b4cb4638b4987af623e8b4c685, type: 3}
- time: 0.5
value: {fileID: 21300000, guid: 37ac561fe5bef7741b00134b15e05bb7, type: 3}
value: {fileID: 21300000, guid: cd4f0bf03608c4e458444ead725ab935, type: 3}
- time: 0.625
value: {fileID: 21300000, guid: 31a5fe8343be3804b9f862613040cc69, type: 3}
value: {fileID: 21300000, guid: f11bd7a736092b9428fc1d5f75d84aa0, type: 3}
- time: 0.75
value: {fileID: 21300000, guid: 4c4215473cc817d4db6a2b6ec22fdd1f, type: 3}
- time: 0.875
value: {fileID: 21300000, guid: 7de7b4dd1e3324c40bb847b9ce3edc13, type: 3}
- time: 1
value: {fileID: 21300000, guid: 87374196e3308e649b6ac1979766f932, type: 3}
- time: 1.125
value: {fileID: 21300000, guid: 1927cee495a407746914eca5695cc03b, type: 3}
- time: 1.25
value: {fileID: 21300000, guid: 396fd25bbdb95dd40976e088238bc669, type: 3}
- time: 1.375
value: {fileID: 21300000, guid: 705e86037f878984d9e9dac77e4b1ae2, type: 3}
attribute: m_Sprite
path:
classID: 212
Expand All @@ -50,18 +62,24 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: 567caf10e2be9404bb0aa1b75c05b443, type: 3}
- {fileID: 21300000, guid: c8cc0879bb27d0540b36c5fab9f3b5f0, type: 3}
- {fileID: 21300000, guid: a6333c2d5552f624a8c4dffc6ad58f07, type: 3}
- {fileID: 21300000, guid: 3621e3be8a578434ea30d317882cfeff, type: 3}
- {fileID: 21300000, guid: 37ac561fe5bef7741b00134b15e05bb7, type: 3}
- {fileID: 21300000, guid: 31a5fe8343be3804b9f862613040cc69, type: 3}
- {fileID: 21300000, guid: 952280097aba2cd43a9cbdcc9635bcd0, type: 3}
- {fileID: 21300000, guid: e094b29c9d0dd0e42bd4269f27165156, type: 3}
- {fileID: 21300000, guid: 7f02dded345580142a42fd118af7e061, type: 3}
- {fileID: 21300000, guid: 6ccdc4b4cb4638b4987af623e8b4c685, type: 3}
- {fileID: 21300000, guid: cd4f0bf03608c4e458444ead725ab935, type: 3}
- {fileID: 21300000, guid: f11bd7a736092b9428fc1d5f75d84aa0, type: 3}
- {fileID: 21300000, guid: 4c4215473cc817d4db6a2b6ec22fdd1f, type: 3}
- {fileID: 21300000, guid: 7de7b4dd1e3324c40bb847b9ce3edc13, type: 3}
- {fileID: 21300000, guid: 87374196e3308e649b6ac1979766f932, type: 3}
- {fileID: 21300000, guid: 1927cee495a407746914eca5695cc03b, type: 3}
- {fileID: 21300000, guid: 396fd25bbdb95dd40976e088238bc669, type: 3}
- {fileID: 21300000, guid: 705e86037f878984d9e9dac77e4b1ae2, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.75
m_StopTime: 1.5
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
Expand Down
2 changes: 1 addition & 1 deletion RPG/Assets/Animations/P_Hurt.anim
Expand Up @@ -60,7 +60,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
Expand Down
2 changes: 1 addition & 1 deletion RPG/Assets/Animations/P_QuickAttack.anim
Expand Up @@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: P_Ember
m_Name: P_QuickAttack
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
Expand Down
31 changes: 5 additions & 26 deletions RPG/Assets/Animations/P_Tackle.anim
Expand Up @@ -20,34 +20,20 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: 557821c0b2219cf4da72a05e94b51b5f, type: 3}
- time: 0.083333336
value: {fileID: 21300000, guid: 2b1e98da62868a848ba19504d73e9e71, type: 3}
- time: 0.16666667
value: {fileID: 21300000, guid: 3c86dea0c0088744591cb92c38ac55f5, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: 5d7da9768b68b464b9c3b87878e9cc50, type: 3}
- time: 0.33333334
value: {fileID: 21300000, guid: 073be82b0e9bcc94bae10a19bc3f0d0b, type: 3}
- time: 0.41666666
value: {fileID: 21300000, guid: 62336ffdd817f974eb7711570a31b884, type: 3}
- time: 0.5
value: {fileID: 21300000, guid: c2b9d7f0840191b4a8da64cd8ad4be37, type: 3}
- time: 0.5833333
value: {fileID: 21300000, guid: 63a6e249f870c5143b2315084b88ab98, type: 3}
- time: 0.6666667
- time: 0.2
value: {fileID: 21300000, guid: 9abb8f1c6e3416149959f6d8f2428b9b, type: 3}
- time: 0.75
- time: 0.4
value: {fileID: 21300000, guid: 9ca64824d1d625d4cbd5d5e1b5adaa61, type: 3}
- time: 0.8333333
- time: 0.6
value: {fileID: 21300000, guid: 52e8dc53ff2bb9b4cb891378d61aae57, type: 3}
- time: 0.9166667
- time: 0.8
value: {fileID: 21300000, guid: ad4c73a6e8ad27f44bba0489b35de61d, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
m_SampleRate: 5
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
Expand All @@ -62,13 +48,6 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: 557821c0b2219cf4da72a05e94b51b5f, type: 3}
- {fileID: 21300000, guid: 2b1e98da62868a848ba19504d73e9e71, type: 3}
- {fileID: 21300000, guid: 3c86dea0c0088744591cb92c38ac55f5, type: 3}
- {fileID: 21300000, guid: 5d7da9768b68b464b9c3b87878e9cc50, type: 3}
- {fileID: 21300000, guid: 073be82b0e9bcc94bae10a19bc3f0d0b, type: 3}
- {fileID: 21300000, guid: 62336ffdd817f974eb7711570a31b884, type: 3}
- {fileID: 21300000, guid: c2b9d7f0840191b4a8da64cd8ad4be37, type: 3}
- {fileID: 21300000, guid: 63a6e249f870c5143b2315084b88ab98, type: 3}
- {fileID: 21300000, guid: 9abb8f1c6e3416149959f6d8f2428b9b, type: 3}
- {fileID: 21300000, guid: 9ca64824d1d625d4cbd5d5e1b5adaa61, type: 3}
Expand Down

0 comments on commit a89c03e

Please sign in to comment.