diff --git a/Assets/Prefabs/Hat.prefab b/Assets/Prefabs/Hat.prefab index 99188ed..c3c8d70 100644 --- a/Assets/Prefabs/Hat.prefab +++ b/Assets/Prefabs/Hat.prefab @@ -10,13 +10,9 @@ GameObject: m_Component: - component: {fileID: 6861526869211200335} - component: {fileID: 3351150559660980987} - - component: {fileID: 6777189711670888815} - - component: {fileID: 1791438097729106167} - - component: {fileID: 7626737292457961804} - - component: {fileID: 3725260721666293610} - m_Layer: 10 + m_Layer: 0 m_Name: Hat - m_TagString: Hat + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -92,103 +88,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!61 &6777189711670888815 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1390105522820025619} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!50 &1791438097729106167 -Rigidbody2D: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1390105522820025619} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0 - m_GravityScale: 4 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 1 - m_SleepingMode: 1 - m_CollisionDetection: 1 - m_Constraints: 0 ---- !u!114 &7626737292457961804 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1390105522820025619} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1803a208ca94f44a189bf03342859d36, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &3725260721666293610 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1390105522820025619} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 34a52816a1c62984ea622bbf50849c68, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1727924107928680002 GameObject: m_ObjectHideFlags: 0 @@ -367,6 +266,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1803a208ca94f44a189bf03342859d36, type: 3} m_Name: m_EditorClassIdentifier: + initialSubhatPosition: {x: 0, y: 0} --- !u!114 &7583491847306130808 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Game/HealthBarManager.cs b/Assets/Scripts/Game/HealthBarManager.cs index c9d70bf..858c95a 100644 --- a/Assets/Scripts/Game/HealthBarManager.cs +++ b/Assets/Scripts/Game/HealthBarManager.cs @@ -42,8 +42,8 @@ public class HealthBarManager : MonoBehaviour // Subscribe to the player's death and respawn events var damageable = player.GetComponent(); - damageable.OnPlayerDeath += HandlePlayerDeath; - damageable.OnPlayerRespawn += HandlePlayerRespawn; + //damageable.OnPlayerDeath += HandlePlayerDeath; + //damageable.OnPlayerRespawn += HandlePlayerRespawn; } } } @@ -86,8 +86,8 @@ public class HealthBarManager : MonoBehaviour { if (player != null && player.TryGetComponent(out var damageable)) { - damageable.OnPlayerDeath -= HandlePlayerDeath; - damageable.OnPlayerRespawn -= HandlePlayerRespawn; + //damageable.OnPlayerDeath -= HandlePlayerDeath; + //damageable.OnPlayerRespawn -= HandlePlayerRespawn; } } }