diff --git a/MuseumGame/Assets/Animations/Canvas.controller.meta b/MuseumGame/Assets/Animations/Canvas.controller.meta new file mode 100644 index 0000000..27abbf0 --- /dev/null +++ b/MuseumGame/Assets/Animations/Canvas.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9c49cc23ab6ad5140bd44a28378877ee +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Animations/Protagonist Idle.anim b/MuseumGame/Assets/Animations/Protagonist Idle.anim index d3cc49e..2470df0 100644 --- a/MuseumGame/Assets/Animations/Protagonist Idle.anim +++ b/MuseumGame/Assets/Animations/Protagonist Idle.anim @@ -17,21 +17,57 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -2144373788310312413, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - time: 0.083333336 + value: {fileID: 4842739590913806068, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - time: 0.16666667 + value: {fileID: 8040400591142469610, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - time: 0.25 + value: {fileID: -4686549727531618400, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - time: 0.33333334 + value: {fileID: -8247872170833017174, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - time: 0.41666666 + value: {fileID: -915340342232657548, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - time: 0.5 + value: {fileID: 8433492481283023670, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - time: 0.5833333 + value: {fileID: -1912509637634623933, guid: 1729f180fd26be543921d7aeaed5bddb, 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: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -2144373788310312413, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - {fileID: 4842739590913806068, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - {fileID: 8040400591142469610, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - {fileID: -4686549727531618400, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - {fileID: -8247872170833017174, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - {fileID: -915340342232657548, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - {fileID: 8433492481283023670, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} + - {fileID: -1912509637634623933, guid: 1729f180fd26be543921d7aeaed5bddb, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.6666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller b/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller index df59b56..c805ea6 100644 --- a/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller +++ b/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller @@ -10,8 +10,11 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: 4373299920423650963} - m_Position: {x: 200, y: 0, z: 0} + m_State: {fileID: 3540272782171852713} + m_Position: {x: 310, y: 70, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1993482041157533796} + m_Position: {x: 540, y: 190, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -21,7 +24,7 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 4373299920423650963} + m_DefaultState: {fileID: 3540272782171852713} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -30,7 +33,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Protagonist Run Cycle serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: horizontal + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -44,6 +53,136 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &115730911151771965 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: horizontal + m_EventTreshold: -0.01 + - m_ConditionMode: 4 + m_ConditionEvent: horizontal + m_EventTreshold: 0.01 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3540272782171852713} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1993482041157533796 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Run + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 115730911151771965} + 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: 6b3961fa7e2cf4b08a137897f56e70f9, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &2082251644078919551 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: horizontal + m_EventTreshold: 0.01 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1993482041157533796} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &3540272782171852713 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 2082251644078919551} + - {fileID: 7586001531458560171} + 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: b2cd2eb24c5138146b9a1160ca4eb09e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &3676899656485171977 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1993482041157533796} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &4373299920423650963 AnimatorState: serializedVersion: 6 @@ -70,3 +209,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &7586001531458560171 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: horizontal + m_EventTreshold: -0.01 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1993482041157533796} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png b/MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png new file mode 100644 index 0000000..3451632 Binary files /dev/null and b/MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png differ diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png b/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png new file mode 100644 index 0000000..7d025f1 Binary files /dev/null and b/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png differ diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png b/MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png new file mode 100644 index 0000000..f2de6af Binary files /dev/null and b/MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png differ