diff --git a/Assets/Prefabs/UI/HealthBar.prefab b/Assets/Prefabs/UI/HealthBar.prefab index 9a2012a..df7800f 100644 --- a/Assets/Prefabs/UI/HealthBar.prefab +++ b/Assets/Prefabs/UI/HealthBar.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -0.40000153, y: -0.40000153} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &664351549858138631 CanvasRenderer: @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa67237645a07df4fac5f01a5b8e8a13, type: 3} + m_Sprite: {fileID: 21300000, guid: e8c32afd966f185459f7826d08c25da9, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 @@ -105,6 +105,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 221465835851718647} + - {fileID: 8771868138971345888} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -128,3 +129,78 @@ MonoBehaviour: healthBarImg: {fileID: 7075700545869768638} healthLeftColor: {r: 1, g: 1, b: 1, a: 0} unusedHealth: {r: 1, g: 1, b: 1, a: 0} +--- !u!1 &7968169009781750056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8771868138971345888} + - component: {fileID: 2148534808472114157} + - component: {fileID: 8677082480860620629} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8771868138971345888 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7968169009781750056} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7656168731602766272} + 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} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2148534808472114157 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7968169009781750056} + m_CullTransparentMesh: 1 +--- !u!114 &8677082480860620629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7968169009781750056} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: fa67237645a07df4fac5f01a5b8e8a13, 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 diff --git a/Assets/Resources/Enemies/2/Enemy2V1.prefab b/Assets/Resources/Enemies/2/Enemy2V1.prefab index 750ba43..de93794 100644 --- a/Assets/Resources/Enemies/2/Enemy2V1.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V1.prefab @@ -121,6 +121,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 8407687426537136098} + - component: {fileID: 5347138904714296145} m_Layer: 0 m_Name: Enemy2V1 m_TagString: Untagged @@ -263,6 +264,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 0 +--- !u!70 &5347138904714296145 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0.15, y: 0} + m_Size: {x: 1.25, y: 2.25} + m_Direction: 0 --- !u!1 &7184157512170153992 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/2/Enemy2V2.prefab b/Assets/Resources/Enemies/2/Enemy2V2.prefab index 803ecd2..78cdbba 100644 --- a/Assets/Resources/Enemies/2/Enemy2V2.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V2.prefab @@ -205,6 +205,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 2239829156743597080} + - component: {fileID: 9116721273772261298} m_Layer: 0 m_Name: Enemy2V2 m_TagString: Untagged @@ -347,6 +348,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 0 +--- !u!70 &9116721273772261298 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0.15, y: 0} + m_Size: {x: 1.25, y: 2.25} + m_Direction: 0 --- !u!1001 &861944024263757089 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/2/Enemy2V3.prefab b/Assets/Resources/Enemies/2/Enemy2V3.prefab index 22e31a3..a1b7926 100644 --- a/Assets/Resources/Enemies/2/Enemy2V3.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V3.prefab @@ -205,6 +205,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 2593167518683313509} + - component: {fileID: 1597969697045467354} m_Layer: 0 m_Name: Enemy2V3 m_TagString: Untagged @@ -347,6 +348,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 0 +--- !u!70 &1597969697045467354 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0.15, y: 0} + m_Size: {x: 1.25, y: 2.25} + m_Direction: 0 --- !u!1001 &2911733727042986953 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/3/Enemy3V1.prefab b/Assets/Resources/Enemies/3/Enemy3V1.prefab index 40188c0..b5d5a02 100644 --- a/Assets/Resources/Enemies/3/Enemy3V1.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V1.prefab @@ -121,6 +121,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 5601190281078907372} + - component: {fileID: 5775148875117303771} m_Layer: 0 m_Name: Enemy3V1 m_TagString: Untagged @@ -263,6 +264,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 1 +--- !u!70 &5775148875117303771 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.25} + m_Size: {x: 2.03, y: 3.01} + m_Direction: 0 --- !u!1 &8726065711573869828 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/3/Enemy3V2.prefab b/Assets/Resources/Enemies/3/Enemy3V2.prefab index d300b1f..072073d 100644 --- a/Assets/Resources/Enemies/3/Enemy3V2.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V2.prefab @@ -205,6 +205,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 5537633588480359369} + - component: {fileID: 629574706924414947} m_Layer: 0 m_Name: Enemy3V2 m_TagString: Untagged @@ -347,6 +348,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 1 +--- !u!70 &629574706924414947 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.25} + m_Size: {x: 2.03, y: 3.01} + m_Direction: 0 --- !u!1001 &4591666118570224065 PrefabInstance: m_ObjectHideFlags: 0 @@ -363,6 +399,10 @@ PrefabInstance: propertyPath: m_Name value: HealthBar objectReference: {fileID: 0} + - target: {fileID: 7075700545869768638, guid: 0ea0f1215ba49f5448e8e8d60a899fe8, type: 3} + propertyPath: m_FillAmount + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7656168731602766272, guid: 0ea0f1215ba49f5448e8e8d60a899fe8, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/Assets/Resources/Enemies/3/Enemy3V3.prefab b/Assets/Resources/Enemies/3/Enemy3V3.prefab index 5079c90..0cab492 100644 --- a/Assets/Resources/Enemies/3/Enemy3V3.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V3.prefab @@ -205,6 +205,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 5342177024833758816} + - component: {fileID: 9180341162620792323} m_Layer: 0 m_Name: Enemy3V3 m_TagString: Untagged @@ -347,6 +348,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 1 +--- !u!70 &9180341162620792323 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.25} + m_Size: {x: 2.03, y: 3.01} + m_Direction: 0 --- !u!1001 &4814295387499624289 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/4/Enemy4V1.prefab b/Assets/Resources/Enemies/4/Enemy4V1.prefab index 30ba257..c652fd6 100644 --- a/Assets/Resources/Enemies/4/Enemy4V1.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V1.prefab @@ -121,6 +121,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 6703538002322560484} + - component: {fileID: 1593837753105570956} m_Layer: 0 m_Name: Enemy4V1 m_TagString: Untagged @@ -263,6 +264,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 1 +--- !u!70 &1593837753105570956 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: -0.5, y: 0} + m_Size: {x: 2.65, y: 3} + m_Direction: 0 --- !u!1 &8107784507586138233 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/4/Enemy4V2.prefab b/Assets/Resources/Enemies/4/Enemy4V2.prefab index 1c63fe5..611e25d 100644 --- a/Assets/Resources/Enemies/4/Enemy4V2.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V2.prefab @@ -205,6 +205,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 5189432348483020584} + - component: {fileID: 6992716262122209801} m_Layer: 0 m_Name: Enemy4V2 m_TagString: Untagged @@ -347,6 +348,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 1 +--- !u!70 &6992716262122209801 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: -0.5, y: 0} + m_Size: {x: 2.65, y: 3} + m_Direction: 0 --- !u!1001 &5086109831227315773 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/4/Enemy4V3.prefab b/Assets/Resources/Enemies/4/Enemy4V3.prefab index 3724f49..8918004 100644 --- a/Assets/Resources/Enemies/4/Enemy4V3.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V3.prefab @@ -205,6 +205,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 8229201628275188815} + - component: {fileID: 5275513863136233879} m_Layer: 0 m_Name: Enemy4V3 m_TagString: Untagged @@ -347,6 +348,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 1 +--- !u!70 &5275513863136233879 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: -0.5, y: 0} + m_Size: {x: 2.65, y: 3} + m_Direction: 0 --- !u!1001 &4352670561598918136 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/5/Enemy5V1.prefab b/Assets/Resources/Enemies/5/Enemy5V1.prefab index 41a6c7f..c871edf 100644 --- a/Assets/Resources/Enemies/5/Enemy5V1.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V1.prefab @@ -205,6 +205,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 17691115352120009} + - component: {fileID: 853766927484383816} m_Layer: 0 m_Name: Enemy5V1 m_TagString: Untagged @@ -347,6 +348,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 1 +--- !u!70 &853766927484383816 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_Size: {x: 2.5, y: 5.75} + m_Direction: 0 --- !u!1001 &1544961106352958877 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/5/Enemy5V2.prefab b/Assets/Resources/Enemies/5/Enemy5V2.prefab index b6cab3b..dd5a613 100644 --- a/Assets/Resources/Enemies/5/Enemy5V2.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V2.prefab @@ -205,6 +205,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 893626435943606516} + - component: {fileID: 1353826037353208613} m_Layer: 0 m_Name: Enemy5V2 m_TagString: Untagged @@ -347,6 +348,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 1 +--- !u!70 &1353826037353208613 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_Size: {x: 2.5, y: 5.75} + m_Direction: 0 --- !u!1001 &5603902875862274868 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/5/Enemy5V3.prefab b/Assets/Resources/Enemies/5/Enemy5V3.prefab index fd3a124..f2d71f2 100644 --- a/Assets/Resources/Enemies/5/Enemy5V3.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V3.prefab @@ -205,6 +205,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 2019234432969631736} + - component: {fileID: 1104779658182803384} m_Layer: 0 m_Name: Enemy5V3 m_TagString: Untagged @@ -347,6 +348,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 1 +--- !u!70 &1104779658182803384 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_Size: {x: 2.5, y: 5.75} + m_Direction: 0 --- !u!1001 &2018686273432440032 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/6/Enemy6V1.prefab b/Assets/Resources/Enemies/6/Enemy6V1.prefab index 4572567..f415033 100644 --- a/Assets/Resources/Enemies/6/Enemy6V1.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V1.prefab @@ -205,6 +205,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 4552190225719755244} + - component: {fileID: 7675421169139995944} m_Layer: 0 m_Name: Enemy6V1 m_TagString: Untagged @@ -347,6 +348,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 1 +--- !u!70 &7675421169139995944 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: -0.09, y: -0.17} + m_Size: {x: 1.66, y: 2.62} + m_Direction: 0 --- !u!1001 &412850958765099122 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/6/Enemy6V2.prefab b/Assets/Resources/Enemies/6/Enemy6V2.prefab index e0949a7..d09ecbf 100644 --- a/Assets/Resources/Enemies/6/Enemy6V2.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V2.prefab @@ -205,6 +205,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 7803025104266690665} + - component: {fileID: 4435590555684305438} m_Layer: 0 m_Name: Enemy6V2 m_TagString: Untagged @@ -347,6 +348,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 1 +--- !u!70 &4435590555684305438 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: -0.09, y: -0.17} + m_Size: {x: 1.66, y: 2.62} + m_Direction: 0 --- !u!1001 &8420911966130886246 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/6/Enemy6V3.prefab b/Assets/Resources/Enemies/6/Enemy6V3.prefab index 8bc6448..462dc29 100644 --- a/Assets/Resources/Enemies/6/Enemy6V3.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V3.prefab @@ -205,6 +205,7 @@ GameObject: - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 316906110964971930} + - component: {fileID: 3935275739920240744} m_Layer: 0 m_Name: Enemy6V3 m_TagString: Untagged @@ -347,6 +348,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: invert: 1 +--- !u!70 &3935275739920240744 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: -0.09, y: -0.17} + m_Size: {x: 1.66, y: 2.62} + m_Direction: 0 --- !u!1001 &7644200986374021475 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/PrefabTest.unity b/Assets/Scenes/PrefabTest.unity index 956653d..46b8c1d 100644 --- a/Assets/Scenes/PrefabTest.unity +++ b/Assets/Scenes/PrefabTest.unity @@ -830,63 +830,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} ---- !u!1001 &981379633 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalPosition.x - value: 8.718343 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalPosition.y - value: 0.3967054 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_Name - value: Enemy6V3 (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} --- !u!1001 &1063152536 PrefabInstance: m_ObjectHideFlags: 0 @@ -1434,5 +1377,4 @@ SceneRoots: - {fileID: 288771115} - {fileID: 29946015} - {fileID: 40791261} - - {fileID: 981379633} - {fileID: 1732151772} diff --git a/Assets/Scripts/Misc/HealthBar.cs b/Assets/Scripts/Misc/HealthBar.cs index 4c77735..425ff3e 100644 --- a/Assets/Scripts/Misc/HealthBar.cs +++ b/Assets/Scripts/Misc/HealthBar.cs @@ -25,7 +25,6 @@ public class HealthBar : MonoBehaviour private void UpdateHealthBar(int prevHealth, int newHealth) { float percent = ((float) newHealth) / ((float)attachedHealth.getMaxHealth()); - Debug.Log(percent); healthBarImg.fillAmount = percent; } } diff --git a/Assets/Sprites/HealthFull.png b/Assets/Sprites/HealthFull.png new file mode 100644 index 0000000..5a710af Binary files /dev/null and b/Assets/Sprites/HealthFull.png differ diff --git a/Assets/Sprites/HealthFull.png.meta b/Assets/Sprites/HealthFull.png.meta new file mode 100644 index 0000000..8557886 --- /dev/null +++ b/Assets/Sprites/HealthFull.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: e8c32afd966f185459f7826d08c25da9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: