diff --git a/MuseumGame/Assets/Prefabs/Health Bar.prefab b/MuseumGame/Assets/Prefabs/Health Bar.prefab index aee837b..890373a 100644 --- a/MuseumGame/Assets/Prefabs/Health Bar.prefab +++ b/MuseumGame/Assets/Prefabs/Health Bar.prefab @@ -1,5 +1,80 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &4934557773967215895 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6399273721761279948} + - component: {fileID: 1325313975960411300} + - component: {fileID: 4492074139089152360} + m_Layer: 5 + m_Name: Health Bar Contents + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6399273721761279948 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4934557773967215895} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 675858816841602993} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 8.119286, y: -13.4925995} + m_SizeDelta: {x: -91.7664, y: -58.7767} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1325313975960411300 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4934557773967215895} + m_CullTransparentMesh: 1 +--- !u!114 &4492074139089152360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4934557773967215895} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.32156864, g: 0.5568628, b: 0.37647063, a: 1} + 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_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5620319316466037508 GameObject: m_ObjectHideFlags: 0 @@ -34,7 +109,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.0035190582} + m_AnchoredPosition: {x: 0, y: 0.0035171509} m_SizeDelta: {x: -0.000061035156, y: 0.008026123} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &168955570455097902 @@ -65,7 +140,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e7616b9589457624ebcb913f70460c08, type: 3} + m_Sprite: {fileID: 21300000, guid: 0baf141c7bf59f842804909beec3127f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -104,15 +179,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5580089204029252219} + - {fileID: 6399273721761279948} - {fileID: 1368171855319713387} m_Father: {fileID: 0} m_RootOrder: 0 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: -302.12598, y: 163.001} - m_SizeDelta: {x: 288.818, y: 39.586} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 294.406, y: 73.1144} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3455161703679244629 MonoBehaviour: @@ -169,88 +244,13 @@ MonoBehaviour: m_DisabledTrigger: Disabled m_Interactable: 0 m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 5580089204029252219} + m_FillRect: {fileID: 6399273721761279948} m_HandleRect: {fileID: 0} m_Direction: 0 m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 0 + m_Value: 1 m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &7324259024582420636 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5580089204029252219} - - component: {fileID: 5167738560477840757} - - component: {fileID: 850314679749370762} - m_Layer: 5 - m_Name: Health Bar Contents - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5580089204029252219 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7324259024582420636} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 675858816841602993} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -0.13821411, y: 0.2765007} - m_SizeDelta: {x: -8.5712, y: -4.9768} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5167738560477840757 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7324259024582420636} - m_CullTransparentMesh: 1 ---- !u!114 &850314679749370762 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7324259024582420636} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9622642, g: 0.27687788, b: 0.27687788, a: 1} - 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_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index ca00990..914b29c 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -3329,11 +3329,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} propertyPath: m_SizeDelta.x - value: 288.818 + value: 307.5778 objectReference: {fileID: 0} - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} propertyPath: m_SizeDelta.y - value: 39.586 + value: 77.6795 objectReference: {fileID: 0} - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} propertyPath: m_LocalScale.x @@ -3377,11 +3377,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} propertyPath: m_AnchoredPosition.x - value: -265 + value: -320.31006 objectReference: {fileID: 0} - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} propertyPath: m_AnchoredPosition.y - value: 127 + value: 152.17664 objectReference: {fileID: 0} - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3396,6 +3396,18 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 5580089204029252219, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5580089204029252219, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6399273721761279948, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6399273721761279948, guid: 9add303577184004ab77878cb3cdcf57, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} diff --git a/MuseumGame/Assets/Scripts/movement.cs b/MuseumGame/Assets/Scripts/movement.cs index ea75dde..9dd1d6b 100644 --- a/MuseumGame/Assets/Scripts/movement.cs +++ b/MuseumGame/Assets/Scripts/movement.cs @@ -134,7 +134,7 @@ public class movement : MonoBehaviour { if (!isGrounded) { - animator.SetBool("isGrounde", false); + animator.SetBool("isGrounded", false); animator.SetFloat("velocityY", 1 * Mathf.Sign(rb2d.velocity.y)); } if (isGrounded) diff --git a/MuseumGame/Assets/Sprites/Health Bar Container.png b/MuseumGame/Assets/Sprites/Health Bar Container.png new file mode 100644 index 0000000..61fa27a Binary files /dev/null and b/MuseumGame/Assets/Sprites/Health Bar Container.png differ diff --git a/MuseumGame/Assets/Sprites/Health Bar Container.png.meta b/MuseumGame/Assets/Sprites/Health Bar Container.png.meta new file mode 100644 index 0000000..7689118 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Health Bar Container.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 0baf141c7bf59f842804909beec3127f +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: