Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24

ground layering
2024-02-04 02:02:59 +01:00 · 2024-02-04 00:12:16 +01:00 · 2024-02-04 00:09:00 +01:00 · 2024-02-04 00:08:25 +01:00 · 2024-02-04 00:08:11 +01:00 · 2024-02-03 23:51:18 +01:00
21 changed files with 100 additions and 266 deletions
--- a/Assets/Resources/Enemies/1/Enemy1V1.prefab
+++ b/Assets/Resources/Enemies/1/Enemy1V1.prefab
@ -257,19 +257,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/1/Enemy1V2.prefab
+++ b/Assets/Resources/Enemies/1/Enemy1V2.prefab
@ -172,19 +172,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: -4060921817738925561}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/1/Enemy1V3.prefab
+++ b/Assets/Resources/Enemies/1/Enemy1V3.prefab
@ -256,19 +256,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 1169561095041589923}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/2/Enemy2V1.prefab
+++ b/Assets/Resources/Enemies/2/Enemy2V1.prefab
@ -173,19 +173,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/2/Enemy2V2.prefab
+++ b/Assets/Resources/Enemies/2/Enemy2V2.prefab
@ -257,19 +257,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/2/Enemy2V3.prefab
+++ b/Assets/Resources/Enemies/2/Enemy2V3.prefab
@ -257,19 +257,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/3/Enemy3V1.prefab
+++ b/Assets/Resources/Enemies/3/Enemy3V1.prefab
@ -173,19 +173,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/3/Enemy3V2.prefab
+++ b/Assets/Resources/Enemies/3/Enemy3V2.prefab
@ -257,19 +257,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/3/Enemy3V3.prefab
+++ b/Assets/Resources/Enemies/3/Enemy3V3.prefab
@ -257,19 +257,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/4/Enemy4V1.prefab
+++ b/Assets/Resources/Enemies/4/Enemy4V1.prefab
@ -173,19 +173,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/4/Enemy4V2.prefab
+++ b/Assets/Resources/Enemies/4/Enemy4V2.prefab
@ -257,19 +257,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/4/Enemy4V3.prefab
+++ b/Assets/Resources/Enemies/4/Enemy4V3.prefab
@ -257,19 +257,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/5/Enemy5V1.prefab
+++ b/Assets/Resources/Enemies/5/Enemy5V1.prefab
@ -257,19 +257,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/5/Enemy5V2.prefab
+++ b/Assets/Resources/Enemies/5/Enemy5V2.prefab
@ -257,19 +257,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/5/Enemy5V3.prefab
+++ b/Assets/Resources/Enemies/5/Enemy5V3.prefab
@ -257,19 +257,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/6/Enemy6V1.prefab
+++ b/Assets/Resources/Enemies/6/Enemy6V1.prefab
@ -257,19 +257,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/6/Enemy6V2.prefab
+++ b/Assets/Resources/Enemies/6/Enemy6V2.prefab
@ -257,19 +257,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Resources/Enemies/6/Enemy6V3.prefab
+++ b/Assets/Resources/Enemies/6/Enemy6V3.prefab
@ -257,19 +257,7 @@ MonoBehaviour:
  maxHealth: 100
  OnHealthZero:
    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2938081276856164938}
-        m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp
-        m_MethodName: SimpleKill
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
  OnHealthChange:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Scenes/GameScene.unity
+++ b/Assets/Scenes/GameScene.unity
@ -2031,7 +2031,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 204031495618622841, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 205003529639557450, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
@ -2055,7 +2055,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 345417292443196300, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 370379603216613205, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -2063,7 +2063,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 420829549692533854, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 423948292859570140, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -2083,7 +2083,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 474291289778153799, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 518040811897931976, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -2187,15 +2187,15 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1188296123961061510, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1226867100941618726, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1248117058607517531, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1286736717778752383, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -2203,7 +2203,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1306166309550745882, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1312114729465446570, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -2211,7 +2211,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1314348416967425078, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1316546630264019081, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -2415,7 +2415,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2688326620934178760, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 2701565387734408324, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
@ -2439,11 +2439,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2777376881448082900, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 2843470166969266601, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 2882933229648693303, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -2451,7 +2451,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2920273978197248707, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 2942913567265352935, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
@ -2471,7 +2471,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2993179368871176222, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 2999611508190862279, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -2487,7 +2487,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3041378549263182524, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3074571989939982763, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -2531,7 +2531,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3462066938274630491, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3477295116748343974, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
@ -2611,7 +2611,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3950474771491911942, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3959017408888877880, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -2671,7 +2671,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4383944590839174126, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4416801612616111028, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -2847,7 +2847,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5986174645587177288, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 5986486668447781465, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
@ -2923,7 +2923,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 6472418518271119051, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 6492360292806616209, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -2995,7 +2995,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 6666471973930886002, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 6666663905502249404, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
@ -3043,7 +3043,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 6906933915959314052, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 6910653825163457375, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -3051,7 +3051,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 6962854702719475454, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7023027171542066455, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
@ -3115,7 +3115,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7431070287896591984, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7611708547693650912, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalScale.x
@ -3203,11 +3203,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8355842165208611031, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 8412560244844067422, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 8445413365583107412, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
@ -3259,7 +3259,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8563970499245821802, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 8564553704292495912, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
@ -3275,7 +3275,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8658297059646015289, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 8731356196972858425, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_LocalPosition.z
@ -3303,7 +3303,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8909691919785108070, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 8976660235134063690, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
@ -3351,7 +3351,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 9173635054939707328, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 9218726293146434581, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
      propertyPath: m_SortingOrder
@ -3936,13 +3936,25 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 480860136}
    m_Modifications:
+    - target: {fileID: 1542618083108825186, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
+      propertyPath: m_SortingOrder
+      value: -6
+      objectReference: {fileID: 0}
    - target: {fileID: 1675897312316268218, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
      propertyPath: m_Name
      value: Ground
      objectReference: {fileID: 0}
+    - target: {fileID: 2304728685345815097, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
+      propertyPath: m_SortingOrder
+      value: -6
+      objectReference: {fileID: 0}
+    - target: {fileID: 2860439650859292841, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
+      propertyPath: m_SortingOrder
+      value: -6
+      objectReference: {fileID: 0}
    - target: {fileID: 3862814901187971034, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 0
+      value: -0.1
      objectReference: {fileID: 0}
    - target: {fileID: 3862814901187971034, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
      propertyPath: m_LocalPosition.y
@ -3980,6 +3992,26 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 4095421378541226841, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
+      propertyPath: m_SortingOrder
+      value: -6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6295918847461186183, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
+      propertyPath: m_SortingOrder
+      value: -6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6548708967788885172, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
+      propertyPath: m_SortingOrder
+      value: -10
+      objectReference: {fileID: 0}
+    - target: {fileID: 6971216474781649168, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
+      propertyPath: m_SortingOrder
+      value: -6
+      objectReference: {fileID: 0}
+    - target: {fileID: 8733470461950675567, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
+      propertyPath: m_SortingOrder
+      value: -6
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/Scripts/Enemy/EnemyAnimationHandler.cs
+++ b/Assets/Scripts/Enemy/EnemyAnimationHandler.cs
@ -11,7 +11,23 @@ public class EnemyAnimationHandler : MonoBehaviour
        if (animator != animator.enabled)
            animator.enabled = true;

+        GetComponent<HealthComponent>().OnHealthZero.AddListener(EnemyDie);
    }
+    void EnemyDie()
+    {
+        StartCoroutine(AnimationDie());
+    }
+
+    IEnumerator AnimationDie()
+    {
+        Strangle();
+        yield return new WaitForSecondsRealtime(1f);
+        Die();
+        while (animator.GetCurrentAnimatorStateInfo(0).normalizedTime < 1f)
+            yield return new WaitForEndOfFrame();
+        Destroy(gameObject);
+    }
+
    public void Strangle()
    {
        animator.SetTrigger("Die");
@ -19,5 +35,6 @@ public class EnemyAnimationHandler : MonoBehaviour
    public void Die()
    {
        animator.SetTrigger("Die");
+
    }
 }
--- a/Assets/Scripts/Player/HealthComponent.cs
+++ b/Assets/Scripts/Player/HealthComponent.cs
@ -51,8 +51,9 @@ public class HealthComponent : MonoBehaviour, ISquezeDamageReceiver
        TakeDamage((int) Mathf.Round(squezeDamage * squezeDamageScalor));
    }

-    public void SimpleKill()
+    public void EnemyKill()
    {
+
        Destroy(gameObject);
    }
 }
Author	SHA1	Message	Date
kimrdd	6eb226b015	Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24	2024-02-04 02:02:59 +01:00
kimrdd	c009d76758	ground layering	2024-02-04 00:12:16 +01:00
kimrdd	03e3f62a2e	Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24	2024-02-04 00:09:00 +01:00
kimrdd	23c33488dd	enemy animations not done	2024-02-04 00:08:25 +01:00
kimrdd	1ad0336c54	Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24	2024-02-04 00:08:11 +01:00
kimrdd	3ce875f924	walls?	2024-02-03 23:51:18 +01:00