-
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.
Final commit before build submission. Updated UI because of scaling i…
…ssues, achievements and displaying one after another, etc.
- Loading branch information
Showing
55 changed files
with
5,801 additions
and
2,630 deletions.
There are no files selected for viewing
159 changes: 159 additions & 0 deletions
159
Assets/Alexis/Animations & Animators/Achievement.controller
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,159 @@ | ||
%YAML 1.1 | ||
%TAG !u! tag:unity3d.com,2011: | ||
--- !u!91 &9100000 | ||
AnimatorController: | ||
m_ObjectHideFlags: 0 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_Name: Achievement | ||
serializedVersion: 5 | ||
m_AnimatorParameters: | ||
- m_Name: isExiting | ||
m_Type: 4 | ||
m_DefaultFloat: 0 | ||
m_DefaultInt: 0 | ||
m_DefaultBool: 0 | ||
m_Controller: {fileID: 0} | ||
m_AnimatorLayers: | ||
- serializedVersion: 5 | ||
m_Name: Base Layer | ||
m_StateMachine: {fileID: 6076655609511533933} | ||
m_Mask: {fileID: 0} | ||
m_Motions: [] | ||
m_Behaviours: [] | ||
m_BlendingMode: 0 | ||
m_SyncedLayerIndex: -1 | ||
m_DefaultWeight: 0 | ||
m_IKPass: 0 | ||
m_SyncedLayerAffectsTiming: 0 | ||
m_Controller: {fileID: 9100000} | ||
--- !u!1102 &2579945315093262854 | ||
AnimatorState: | ||
serializedVersion: 6 | ||
m_ObjectHideFlags: 1 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_Name: Achievement_Entry | ||
m_Speed: 1 | ||
m_CycleOffset: 0 | ||
m_Transitions: | ||
- {fileID: 3940391564846150369} | ||
m_StateMachineBehaviours: [] | ||
m_Position: {x: 50, y: 50, z: 0} | ||
m_IKOnFeet: 0 | ||
m_WriteDefaultValues: 1 | ||
m_Mirror: 0 | ||
m_SpeedParameterActive: 0 | ||
m_MirrorParameterActive: 0 | ||
m_CycleOffsetParameterActive: 0 | ||
m_TimeParameterActive: 0 | ||
m_Motion: {fileID: 7400000, guid: 1122aacbdae787b4bba72e3cdc073474, type: 2} | ||
m_Tag: | ||
m_SpeedParameter: | ||
m_MirrorParameter: | ||
m_CycleOffsetParameter: | ||
m_TimeParameter: | ||
--- !u!1101 &3940391564846150369 | ||
AnimatorStateTransition: | ||
m_ObjectHideFlags: 1 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_Name: | ||
m_Conditions: | ||
- m_ConditionMode: 1 | ||
m_ConditionEvent: isExiting | ||
m_EventTreshold: 0 | ||
m_DstStateMachine: {fileID: 0} | ||
m_DstState: {fileID: 5912734319000174096} | ||
m_Solo: 0 | ||
m_Mute: 0 | ||
m_IsExit: 0 | ||
serializedVersion: 3 | ||
m_TransitionDuration: 0.25 | ||
m_TransitionOffset: 0 | ||
m_ExitTime: 0.75 | ||
m_HasExitTime: 1 | ||
m_HasFixedDuration: 1 | ||
m_InterruptionSource: 0 | ||
m_OrderedInterruption: 1 | ||
m_CanTransitionToSelf: 1 | ||
--- !u!1102 &5912734319000174096 | ||
AnimatorState: | ||
serializedVersion: 6 | ||
m_ObjectHideFlags: 1 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_Name: Achievement_Exit | ||
m_Speed: 1 | ||
m_CycleOffset: 0 | ||
m_Transitions: | ||
- {fileID: 7679731052343355417} | ||
m_StateMachineBehaviours: [] | ||
m_Position: {x: 50, y: 50, z: 0} | ||
m_IKOnFeet: 0 | ||
m_WriteDefaultValues: 1 | ||
m_Mirror: 0 | ||
m_SpeedParameterActive: 0 | ||
m_MirrorParameterActive: 0 | ||
m_CycleOffsetParameterActive: 0 | ||
m_TimeParameterActive: 0 | ||
m_Motion: {fileID: 7400000, guid: 776b127e7ff92254c81a51413007d0dd, type: 2} | ||
m_Tag: | ||
m_SpeedParameter: | ||
m_MirrorParameter: | ||
m_CycleOffsetParameter: | ||
m_TimeParameter: | ||
--- !u!1107 &6076655609511533933 | ||
AnimatorStateMachine: | ||
serializedVersion: 6 | ||
m_ObjectHideFlags: 1 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_Name: Base Layer | ||
m_ChildStates: | ||
- serializedVersion: 1 | ||
m_State: {fileID: 2579945315093262854} | ||
m_Position: {x: 40, y: 180, z: 0} | ||
- serializedVersion: 1 | ||
m_State: {fileID: 5912734319000174096} | ||
m_Position: {x: 40, y: 260, z: 0} | ||
m_ChildStateMachines: [] | ||
m_AnyStateTransitions: [] | ||
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: 640, y: 120, z: 0} | ||
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} | ||
m_DefaultState: {fileID: 2579945315093262854} | ||
--- !u!1101 &7679731052343355417 | ||
AnimatorStateTransition: | ||
m_ObjectHideFlags: 1 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_Name: | ||
m_Conditions: | ||
- m_ConditionMode: 2 | ||
m_ConditionEvent: isExiting | ||
m_EventTreshold: 0 | ||
m_DstStateMachine: {fileID: 0} | ||
m_DstState: {fileID: 2579945315093262854} | ||
m_Solo: 0 | ||
m_Mute: 0 | ||
m_IsExit: 0 | ||
serializedVersion: 3 | ||
m_TransitionDuration: 0.25 | ||
m_TransitionOffset: 0 | ||
m_ExitTime: 0.75 | ||
m_HasExitTime: 1 | ||
m_HasFixedDuration: 1 | ||
m_InterruptionSource: 0 | ||
m_OrderedInterruption: 1 | ||
m_CanTransitionToSelf: 1 |
8 changes: 8 additions & 0 deletions
8
Assets/Alexis/Animations & Animators/Achievement.controller.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
161 changes: 161 additions & 0 deletions
161
Assets/Alexis/Animations & Animators/Achievement_Entry.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,161 @@ | ||
%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: Achievement_Entry | ||
serializedVersion: 6 | ||
m_Legacy: 0 | ||
m_Compressed: 0 | ||
m_UseHighQualityCurve: 1 | ||
m_RotationCurves: [] | ||
m_CompressedRotationCurves: [] | ||
m_EulerCurves: [] | ||
m_PositionCurves: [] | ||
m_ScaleCurves: [] | ||
m_FloatCurves: | ||
- curve: | ||
serializedVersion: 2 | ||
m_Curve: | ||
- serializedVersion: 3 | ||
time: 0 | ||
value: 25 | ||
inSlope: 0 | ||
outSlope: 0 | ||
tangentMode: 136 | ||
weightedMode: 0 | ||
inWeight: 0 | ||
outWeight: 0 | ||
m_PreInfinity: 2 | ||
m_PostInfinity: 2 | ||
m_RotationOrder: 4 | ||
attribute: m_AnchoredPosition.x | ||
path: | ||
classID: 224 | ||
script: {fileID: 0} | ||
- curve: | ||
serializedVersion: 2 | ||
m_Curve: | ||
- serializedVersion: 3 | ||
time: 0 | ||
value: 175 | ||
inSlope: 0 | ||
outSlope: 0 | ||
tangentMode: 136 | ||
weightedMode: 0 | ||
inWeight: 0.33333334 | ||
outWeight: 0.33333334 | ||
- serializedVersion: 3 | ||
time: 1 | ||
value: -25 | ||
inSlope: 0 | ||
outSlope: 0 | ||
tangentMode: 136 | ||
weightedMode: 0 | ||
inWeight: 0.33333334 | ||
outWeight: 0.33333334 | ||
m_PreInfinity: 2 | ||
m_PostInfinity: 2 | ||
m_RotationOrder: 4 | ||
attribute: m_AnchoredPosition.y | ||
path: | ||
classID: 224 | ||
script: {fileID: 0} | ||
m_PPtrCurves: [] | ||
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: 538195251 | ||
script: {fileID: 0} | ||
typeID: 224 | ||
customType: 28 | ||
isPPtrCurve: 0 | ||
- serializedVersion: 2 | ||
path: 0 | ||
attribute: 1460864421 | ||
script: {fileID: 0} | ||
typeID: 224 | ||
customType: 28 | ||
isPPtrCurve: 0 | ||
pptrCurveMapping: [] | ||
m_AnimationClipSettings: | ||
serializedVersion: 2 | ||
m_AdditiveReferencePoseClip: {fileID: 0} | ||
m_AdditiveReferencePoseTime: 0 | ||
m_StartTime: 0 | ||
m_StopTime: 1 | ||
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: | ||
- curve: | ||
serializedVersion: 2 | ||
m_Curve: | ||
- serializedVersion: 3 | ||
time: 0 | ||
value: 25 | ||
inSlope: 0 | ||
outSlope: 0 | ||
tangentMode: 136 | ||
weightedMode: 0 | ||
inWeight: 0 | ||
outWeight: 0 | ||
m_PreInfinity: 2 | ||
m_PostInfinity: 2 | ||
m_RotationOrder: 4 | ||
attribute: m_AnchoredPosition.x | ||
path: | ||
classID: 224 | ||
script: {fileID: 0} | ||
- curve: | ||
serializedVersion: 2 | ||
m_Curve: | ||
- serializedVersion: 3 | ||
time: 0 | ||
value: 175 | ||
inSlope: 0 | ||
outSlope: 0 | ||
tangentMode: 136 | ||
weightedMode: 0 | ||
inWeight: 0.33333334 | ||
outWeight: 0.33333334 | ||
- serializedVersion: 3 | ||
time: 1 | ||
value: -25 | ||
inSlope: 0 | ||
outSlope: 0 | ||
tangentMode: 136 | ||
weightedMode: 0 | ||
inWeight: 0.33333334 | ||
outWeight: 0.33333334 | ||
m_PreInfinity: 2 | ||
m_PostInfinity: 2 | ||
m_RotationOrder: 4 | ||
attribute: m_AnchoredPosition.y | ||
path: | ||
classID: 224 | ||
script: {fileID: 0} | ||
m_EulerEditorCurves: [] | ||
m_HasGenericRootTransform: 0 | ||
m_HasMotionFloatCurves: 0 | ||
m_Events: [] |
8 changes: 8 additions & 0 deletions
8
Assets/Alexis/Animations & Animators/Achievement_Entry.anim.meta
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.