diff --git a/MuseumGame/Assets/Animations/Protagonist Midglide v1.anim b/MuseumGame/Assets/Animations/Protagonist Midglide v1.anim index 42f1ac8..5dd9ec9 100644 --- a/MuseumGame/Assets/Animations/Protagonist Midglide v1.anim +++ b/MuseumGame/Assets/Animations/Protagonist Midglide v1.anim @@ -17,21 +17,57 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -3788740418849675770, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - time: 0.083333336 + value: {fileID: -5597463155517250406, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - time: 0.16666667 + value: {fileID: -1303033693159990808, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - time: 0.25 + value: {fileID: -4688472952894644788, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - time: 0.33333334 + value: {fileID: -6134624303339524659, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - time: 0.41666666 + value: {fileID: 7280731910541982459, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - time: 0.5 + value: {fileID: 3737084431251897751, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - time: 0.5833333 + value: {fileID: 544941641197126602, guid: 8afa22575949247429baf284d0b599f1, 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: -3788740418849675770, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - {fileID: -5597463155517250406, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - {fileID: -1303033693159990808, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - {fileID: -4688472952894644788, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - {fileID: -6134624303339524659, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - {fileID: 7280731910541982459, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - {fileID: 3737084431251897751, guid: 8afa22575949247429baf284d0b599f1, type: 3} + - {fileID: 544941641197126602, guid: 8afa22575949247429baf284d0b599f1, 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 8a7a067..2cc273e 100644 --- a/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller +++ b/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller @@ -83,6 +83,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: + - {fileID: 3754640667882315008} - {fileID: -3874732199687805077} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} @@ -152,6 +153,33 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-1431828175096590247 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Gliding + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 2841470946671679569} + 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: c17dd10015f2ae34784c25696a28498a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-121783143131200048 AnimatorStateMachine: serializedVersion: 6 @@ -173,6 +201,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 3480931448333261977} m_Position: {x: 350, y: 70, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1431828175096590247} + m_Position: {x: 600, y: 110, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -180,7 +211,7 @@ AnimatorStateMachine: m_StateMachineBehaviours: [] m_AnyStatePosition: {x: -100, y: -10, z: 0} m_EntryPosition: {x: -100, y: 120, z: 0} - m_ExitPosition: {x: 730, y: 110, z: 0} + m_ExitPosition: {x: 890, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 3540272782171852713} --- !u!91 &9100000 @@ -210,6 +241,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: isGliding + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -304,6 +341,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &2841470946671679569 +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: isGliding + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3480931448333261977} + 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 &3480931448333261977 AnimatorState: serializedVersion: 6 @@ -382,6 +444,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &3754640667882315008 +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: isGliding + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1431828175096590247} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &4373299920423650963 AnimatorState: serializedVersion: 6 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index 6af411d..b253359 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -174,7 +174,7 @@ TilemapRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 553ad0684c8952c4d8e97539719ee7e9, type: 2} + - {fileID: 2100000, guid: 8a8b91fed9500704991dba49d5e1792f, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1840,8 +1840,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0000076294, y: -154.28} - m_SizeDelta: {x: 228.428, y: 191.734} + m_AnchoredPosition: {x: 0.00001049, y: -58.662914} + m_SizeDelta: {x: 613.1014, y: 161.198} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &355907461 MonoBehaviour: @@ -1856,14 +1856,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.96964854, g: 1, b: 0.44716978, a: 0.4392157} + m_Color: {r: 1, g: 1, b: 1, a: 0.4392157} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 1622af549545f1e4487371bb204ea114, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1915,8 +1915,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 72.077} - m_SizeDelta: {x: 164.21, y: 244.154} + m_AnchoredPosition: {x: -5.6, y: 78.615} + m_SizeDelta: {x: 166.1751, y: 157.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &430284684 MonoBehaviour: @@ -2202,15 +2202,15 @@ PrefabInstance: objectReference: {fileID: -3808752148845781986, guid: e03e538db736cbf4fba0318fc079a9e8, type: 3} - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalPosition.x - value: 0.04053074 + value: 0.02 objectReference: {fileID: 0} - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalPosition.y - value: -2.1 + value: -2.4 objectReference: {fileID: 0} - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalPosition.z @@ -2610,8 +2610,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 209.702, y: 174.179} + m_AnchoredPosition: {x: -0.0000019073, y: 0.00000047684} + m_SizeDelta: {x: 575.26, y: 145.74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1063858061 MonoBehaviour: @@ -3377,11 +3377,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} propertyPath: m_AnchoredPosition.x - value: -320.31006 + value: -316.5 objectReference: {fileID: 0} - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} propertyPath: m_AnchoredPosition.y - value: 152.17664 + value: 147.4 objectReference: {fileID: 0} - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3411,6 +3411,22 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6399273721761279948, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_SizeDelta.x + value: -94.287 + objectReference: {fileID: 0} + - target: {fileID: 6399273721761279948, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_SizeDelta.y + value: -62.1855 + objectReference: {fileID: 0} + - target: {fileID: 6399273721761279948, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_AnchoredPosition.x + value: 8.979 + objectReference: {fileID: 0} + - target: {fileID: 6399273721761279948, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_AnchoredPosition.y + value: -14.7696 + objectReference: {fileID: 0} - target: {fileID: 6644325902043065115, guid: 9add303577184004ab77878cb3cdcf57, type: 3} propertyPath: m_Name value: Health Bar diff --git a/MuseumGame/Assets/Sprites/Art Dialogue BOx.png b/MuseumGame/Assets/Sprites/Art Dialogue BOx.png new file mode 100644 index 0000000..cc44286 Binary files /dev/null and b/MuseumGame/Assets/Sprites/Art Dialogue BOx.png differ diff --git a/MuseumGame/Assets/Sprites/Art Dialogue BOx.png.meta b/MuseumGame/Assets/Sprites/Art Dialogue BOx.png.meta new file mode 100644 index 0000000..4a5b197 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Art Dialogue BOx.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 1622af549545f1e4487371bb204ea114 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: