diff --git a/MuseumGame/Assets/Prefabs/Health Bar.prefab b/MuseumGame/Assets/Prefabs/Health Bar.prefab new file mode 100644 index 0000000..1e16b52 --- /dev/null +++ b/MuseumGame/Assets/Prefabs/Health Bar.prefab @@ -0,0 +1,256 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5620319316466037508 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1368171855319713387} + - component: {fileID: 168955570455097902} + - component: {fileID: 4652026051309531375} + m_Layer: 5 + m_Name: Health Bar Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1368171855319713387 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5620319316466037508} + 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: 1 + 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_SizeDelta: {x: -0.000061035156, y: 0.008026123} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &168955570455097902 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5620319316466037508} + m_CullTransparentMesh: 1 +--- !u!114 &4652026051309531375 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5620319316466037508} + 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: 1, g: 1, b: 1, 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: 21300000, guid: e7616b9589457624ebcb913f70460c08, type: 3} + 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 &6644325902043065115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 675858816841602993} + - component: {fileID: 3455161703679244629} + m_Layer: 5 + m_Name: Health Bar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &675858816841602993 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6644325902043065115} + 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: + - {fileID: 5580089204029252219} + - {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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3455161703679244629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6644325902043065115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b9240bd39bca87438df56c58d013245, type: 3} + m_Name: + m_EditorClassIdentifier: + healthBar: {fileID: 0} + playerHealth: {fileID: 0} +--- !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} + - component: {fileID: 9777625961378152} + 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: 1, y: 1} + m_AnchoredPosition: {x: -0.13819885, 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 +--- !u!114 &9777625961378152 +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: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 0 + m_TargetGraphic: {fileID: 850314679749370762} + m_FillRect: {fileID: 0} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] diff --git a/MuseumGame/Assets/Prefabs/Health Bar.prefab.meta b/MuseumGame/Assets/Prefabs/Health Bar.prefab.meta new file mode 100644 index 0000000..4d26a22 --- /dev/null +++ b/MuseumGame/Assets/Prefabs/Health Bar.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9add303577184004ab77878cb3cdcf57 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Prefabs/Player.prefab b/MuseumGame/Assets/Prefabs/Player.prefab index 6393f7f..7282f8e 100644 --- a/MuseumGame/Assets/Prefabs/Player.prefab +++ b/MuseumGame/Assets/Prefabs/Player.prefab @@ -14,9 +14,10 @@ GameObject: - component: {fileID: 374150667840124764} - component: {fileID: 374150667840124768} - component: {fileID: 874665671871151636} + - component: {fileID: -5793387185563800375} m_Layer: 0 m_Name: Player - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -172,3 +173,18 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &-5793387185563800375 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374150667840124763} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffee4966dfcdd6d47a1adad953d9df93, type: 3} + m_Name: + m_EditorClassIdentifier: + currentHealth: 0 + maxHealth: 100 + healthBar: {fileID: 0} diff --git a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity index 81eaa29..c1aec26 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity @@ -3059,6 +3059,26 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} +--- !u!1 &1409295858 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 374150667840124763, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + m_PrefabInstance: {fileID: 1409295857} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1409295859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1409295858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffee4966dfcdd6d47a1adad953d9df93, type: 3} + m_Name: + m_EditorClassIdentifier: + currentHealth: 0 + maxHealth: 100 + healthBar: {fileID: 1816726937924081071} --- !u!1 &1589924979 GameObject: m_ObjectHideFlags: 0 @@ -3141,6 +3161,72 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1820824023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1820824026} + - component: {fileID: 1820824025} + - component: {fileID: 1820824024} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1820824024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1820824023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1820824025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1820824023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1820824026 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1820824023} + 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: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1935037035 GameObject: m_ObjectHideFlags: 0 @@ -3595,3 +3681,283 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &2127634117 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2127634121} + - component: {fileID: 2127634120} + - component: {fileID: 2127634119} + - component: {fileID: 2127634118} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2127634118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2127634117} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &2127634119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2127634117} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &2127634120 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2127634117} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &2127634121 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2127634117} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1816726937924081068} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1001 &1816726937924081067 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2127634121} + m_Modifications: + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_SizeDelta.x + value: 288.818 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_SizeDelta.y + value: 39.586 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_AnchoredPosition.x + value: -302.12598 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_AnchoredPosition.y + value: 163.001 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6644325902043065115, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + propertyPath: m_Name + value: Health Bar + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9add303577184004ab77878cb3cdcf57, type: 3} +--- !u!224 &1816726937924081068 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + m_PrefabInstance: {fileID: 1816726937924081067} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1816726937924081069 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7324259024582420636, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + m_PrefabInstance: {fileID: 1816726937924081067} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1816726937924081070 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 850314679749370762, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + m_PrefabInstance: {fileID: 1816726937924081067} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1816726937924081069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1816726937924081071 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3455161703679244629, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + m_PrefabInstance: {fileID: 1816726937924081067} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b9240bd39bca87438df56c58d013245, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1816726937924081072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1816726937924081069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 0 + m_TargetGraphic: {fileID: 1816726937924081070} + m_FillRect: {fileID: 0} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] diff --git a/MuseumGame/Assets/Scripts/Health.cs b/MuseumGame/Assets/Scripts/Health.cs new file mode 100644 index 0000000..4da9854 --- /dev/null +++ b/MuseumGame/Assets/Scripts/Health.cs @@ -0,0 +1,40 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Health : MonoBehaviour +{ + public int currentHealth = 0; + public int maxHealth = 100; + + public HealthBarCustom healthBar; + + void OnTriggerEnter2D(Collider2D collider2D) + { + + } + + // Start is called before the first frame update + void Start() + { + currentHealth = maxHealth; + } + + // Update is called once per frame + void Update() + { + if(Input.GetKeyDown(KeyCode.Space)) + { + DamagePlayer(10); + } + + + + } + + public void DamagePlayer(int damage) + { + currentHealth -= damage; + healthBar.SetHealth(currentHealth); + } +} diff --git a/MuseumGame/Assets/Scripts/Health.cs.meta b/MuseumGame/Assets/Scripts/Health.cs.meta new file mode 100644 index 0000000..99eb8cf --- /dev/null +++ b/MuseumGame/Assets/Scripts/Health.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ffee4966dfcdd6d47a1adad953d9df93 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Scripts/HealthBarCustom.cs b/MuseumGame/Assets/Scripts/HealthBarCustom.cs new file mode 100644 index 0000000..b6d8c02 --- /dev/null +++ b/MuseumGame/Assets/Scripts/HealthBarCustom.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class HealthBarCustom : MonoBehaviour +{ + public Slider healthBar; + public Health playerHealth; + + // Start is called before the first frame update + void Start() + { + playerHealth = GameObject.FindGameObjectWithTag("Player").GetComponent(); + healthBar = GetComponent(); + healthBar.maxValue = playerHealth.maxHealth; + healthBar.value = playerHealth.maxHealth; + } + + // Update is called once per frame + void Update() + { + + } + + public void SetHealth(int hp) + { + healthBar.value = hp; + } +} diff --git a/MuseumGame/Assets/Scripts/HealthBarCustom.cs.meta b/MuseumGame/Assets/Scripts/HealthBarCustom.cs.meta new file mode 100644 index 0000000..3f318c1 --- /dev/null +++ b/MuseumGame/Assets/Scripts/HealthBarCustom.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6b9240bd39bca87438df56c58d013245 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Sprites/Health-Bar.png b/MuseumGame/Assets/Sprites/Health-Bar.png new file mode 100644 index 0000000..517f5b0 Binary files /dev/null and b/MuseumGame/Assets/Sprites/Health-Bar.png differ diff --git a/MuseumGame/Assets/Sprites/Health-Bar.png.meta b/MuseumGame/Assets/Sprites/Health-Bar.png.meta new file mode 100644 index 0000000..1f948d1 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Health-Bar.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: e7616b9589457624ebcb913f70460c08 +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: diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 52756a5..1cbf25d 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,31 +6,31 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620d183eedcc312ee7eb78fce9332b25 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620d183eedd43b2fe7f578fce9332b25 flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c6c001f1c1d3823272b7e38271427fb + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e52637edea78fce9332b25 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c6b1505032b292926237e38271427fb flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620d183eedd43b2fe7f578fce9332b25 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e52637edea78fce9332b25 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b