-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Shooting feature JIRA ID [ZS-52] (#22)
* Added idle shooting animation * Added shooting while moving animations * Added jumping shooting animaitons * Fixed animtion bug * Added the ability to shoot bullets * Finished Feature with passing tests JIRA ID [ZS-52]
- Loading branch information
1 parent
2ee9c64
commit f6494ae
Showing
31 changed files
with
2,648 additions
and
394 deletions.
There are no files selected for viewing
69 changes: 69 additions & 0 deletions
69
RWM-P2-TEAM-C/Assets/Animations/Player/Idle_Shoot_Animation.anim
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,69 @@ | ||
| %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: Idle_Shoot_Animation | ||
| 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: -987661838687446635, guid: 31b7072394dd43844af6f583ac5307b0, | ||
| type: 3} | ||
| attribute: m_Sprite | ||
| path: | ||
| classID: 212 | ||
| script: {fileID: 0} | ||
| m_SampleRate: 60 | ||
| 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: -987661838687446635, guid: 31b7072394dd43844af6f583ac5307b0, type: 3} | ||
| m_AnimationClipSettings: | ||
| serializedVersion: 2 | ||
| m_AdditiveReferencePoseClip: {fileID: 0} | ||
| m_AdditiveReferencePoseTime: 0 | ||
| m_StartTime: 0 | ||
| m_StopTime: 0.016666668 | ||
| 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
8
RWM-P2-TEAM-C/Assets/Animations/Player/Idle_Shoot_Animation.anim.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
69 changes: 69 additions & 0 deletions
69
RWM-P2-TEAM-C/Assets/Animations/Player/Jumping_Shooting_Animation.anim
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,69 @@ | ||
| %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: Jumping_Shooting_Animation | ||
| 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: 8205761894758743175, guid: 31b7072394dd43844af6f583ac5307b0, | ||
| type: 3} | ||
| attribute: m_Sprite | ||
| path: | ||
| classID: 212 | ||
| script: {fileID: 0} | ||
| m_SampleRate: 60 | ||
| 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: 8205761894758743175, guid: 31b7072394dd43844af6f583ac5307b0, type: 3} | ||
| m_AnimationClipSettings: | ||
| serializedVersion: 2 | ||
| m_AdditiveReferencePoseClip: {fileID: 0} | ||
| m_AdditiveReferencePoseTime: 0 | ||
| m_StartTime: 0 | ||
| m_StopTime: 0.016666668 | ||
| 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
8
RWM-P2-TEAM-C/Assets/Animations/Player/Jumping_Shooting_Animation.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
Oops, something went wrong.