Skip to content

Add player animation controllers #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jojods1125 merged 4 commits into from
Sep 29, 2020
Merged

Add player animation controllers #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
006c2e2
Adds PSD importer
omundy Sep 28, 2020
8eaaa19
Updates animation timelines
omundy Sep 28, 2020
91cb7de
Testing event animations
omundy Sep 28, 2020
8b516b9
Last tweeks before next branch
omundy Sep 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Assets/_Project/Animations/Default.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
time: 0.16666667
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
Expand All @@ -39,7 +39,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: CubeAnim
path: PlayerObject
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
Expand All @@ -51,7 +51,7 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 2387847166
path: 2189091576
attribute: 1
script: {fileID: 0}
typeID: 4
Expand All @@ -63,7 +63,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_StopTime: 0.16666667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
Expand Down Expand Up @@ -92,7 +92,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 0.16666667
value: 0
inSlope: 0
outSlope: 0
Expand All @@ -104,7 +104,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: CubeAnim
path: PlayerObject
classID: 4
script: {fileID: 0}
- curve:
Expand All @@ -120,7 +120,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 0.16666667
value: 0
inSlope: 0
outSlope: 0
Expand All @@ -132,7 +132,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: CubeAnim
path: PlayerObject
classID: 4
script: {fileID: 0}
- curve:
Expand All @@ -148,7 +148,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 0.16666667
value: 0
inSlope: 0
outSlope: 0
Expand All @@ -160,7 +160,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: CubeAnim
path: PlayerObject
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: []
Expand Down
12 changes: 6 additions & 6 deletions ...Project/Animations/CubeAnimCtl.controller → ...nimations/PlayerAnimController.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionDuration: 0.2
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 0
Expand Down Expand Up @@ -315,15 +315,15 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: CubeAnimCtl
m_Name: PlayerAnimController
serializedVersion: 5
m_AnimatorParameters:
- m_Name: state
m_Type: 3
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand Down Expand Up @@ -471,9 +471,9 @@ AnimatorStateMachine:
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_AnyStatePosition: {x: 50, y: 120, z: 0}
m_EntryPosition: {x: 50, y: 180, z: 0}
m_ExitPosition: {x: 50, y: 70, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -359137941183271379}
--- !u!1102 &7250601107131478602
Expand Down
0 ...ct/Animations/CubeAnimCtl.controller.meta → ...ions/PlayerAnimController.controller.meta
View file
Open in desktop
File renamed without changes.
58 changes: 29 additions & 29 deletions Assets/_Project/Animations/Pop_sm_Shake.anim → ...ject/Animations/Pop_Shake_Stretch_sm.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Pop_sm_Shake
m_Name: Pop_Shake_Stretch_sm
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
Expand All @@ -28,7 +28,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.33333334
value: {x: 0, y: 25, z: 0}
value: {x: 0, y: 0, z: 25}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
Expand All @@ -37,7 +37,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.4
value: {x: 0, y: -10, z: 0}
value: {x: 0, y: 0, z: -10}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
Expand All @@ -46,7 +46,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.46666667
value: {x: 0, y: 25, z: 0}
value: {x: 0, y: 0, z: 25}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
Expand All @@ -55,7 +55,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.53333336
value: {x: 0, y: -10, z: 0}
value: {x: 0, y: 0, z: -10}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
Expand All @@ -64,7 +64,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.6
value: {x: 0, y: 25, z: 0}
value: {x: 0, y: 0, z: 25}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
Expand All @@ -83,7 +83,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: CubeAnim
path: PlayerObject
m_PositionCurves: []
m_ScaleCurves:
- curve:
Expand Down Expand Up @@ -119,7 +119,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: CubeAnim
path: PlayerObject
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
Expand All @@ -130,14 +130,14 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 2387847166
path: 2189091576
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
- serializedVersion: 2
path: 2387847166
path: 2189091576
attribute: 3
script: {fileID: 0}
typeID: 4
Expand Down Expand Up @@ -199,7 +199,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: CubeAnim
path: PlayerObject
classID: 4
script: {fileID: 0}
- curve:
Expand Down Expand Up @@ -236,7 +236,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: CubeAnim
path: PlayerObject
classID: 4
script: {fileID: 0}
- curve:
Expand Down Expand Up @@ -273,7 +273,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: CubeAnim
path: PlayerObject
classID: 4
script: {fileID: 0}
- curve:
Expand Down Expand Up @@ -346,7 +346,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path: CubeAnim
path: PlayerObject
classID: 4
script: {fileID: 0}
- curve:
Expand All @@ -363,7 +363,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 25
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -372,7 +372,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.4
value: -10
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -381,7 +381,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.46666667
value: 25
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -390,7 +390,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.53333336
value: -10
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -399,7 +399,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6
value: 25
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -419,7 +419,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path: CubeAnim
path: PlayerObject
classID: 4
script: {fileID: 0}
- curve:
Expand All @@ -436,7 +436,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 0
value: 25
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -445,7 +445,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.4
value: 0
value: -10
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -454,7 +454,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.46666667
value: 0
value: 25
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -463,7 +463,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.53333336
value: 0
value: -10
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -472,7 +472,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6
value: 0
value: 25
inSlope: 0
outSlope: 0
tangentMode: 136
Expand All @@ -492,7 +492,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path: CubeAnim
path: PlayerObject
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
Expand All @@ -503,7 +503,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: CubeAnim
path: PlayerObject
classID: 4
script: {fileID: 0}
- curve:
Expand All @@ -513,7 +513,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: CubeAnim
path: PlayerObject
classID: 4
script: {fileID: 0}
- curve:
Expand All @@ -523,7 +523,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: CubeAnim
path: PlayerObject
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 0
Expand Down
8 changes: 8 additions & 0 deletions Assets/_Project/Animations/Pop_Shake_Stretch_sm.anim.meta
View file
Open in desktop

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

Loading