From dbbc22065d16cd88f174f058be60dc0a89deb183 Mon Sep 17 00:00:00 2001 From: Spencer Date: Wed, 21 Apr 2021 10:13:13 -0500 Subject: [PATCH] Health Bar Updated --- MuseumGame/Assets/Prefabs/Health Bar.prefab | 164 +++++++++--------- .../Assets/Scenes/DemoLevels/Spawn.unity | 20 ++- MuseumGame/Assets/Scripts/movement.cs | 2 +- .../Assets/Sprites/Health Bar Container.png | Bin 0 -> 3594 bytes .../Sprites/Health Bar Container.png.meta | 96 ++++++++++ 5 files changed, 195 insertions(+), 87 deletions(-) create mode 100644 MuseumGame/Assets/Sprites/Health Bar Container.png create mode 100644 MuseumGame/Assets/Sprites/Health Bar Container.png.meta 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 0000000000000000000000000000000000000000..61fa27ab026dbf675b964775d85ab0cabba47d9b GIT binary patch literal 3594 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 d6Aq`;8R;1+f}>&wE0G@zz|#D