Merge pull request #95 from EuleMitKeule/develop

fix: hotfix
EuleMitKeule · Nov 30, 2022 · d8b662d · d8b662d
2 parents ed9ffb1 + 4550d68
commit d8b662d
Show file tree

Hide file tree

Showing 14 changed files with 726 additions and 491 deletions.
diff --git a/TanksOnAPlain/Assets/Prefabs/Chunks/chunk_9.prefab b/TanksOnAPlain/Assets/Prefabs/Chunks/chunk_9.prefab
diff --git a/TanksOnAPlain/Assets/Prefabs/PowerUps/powerup_max_health.prefab b/TanksOnAPlain/Assets/Prefabs/PowerUps/powerup_max_health.prefab
@@ -17,24 +17,20 @@ PrefabInstance:
       objectReference: {fileID: 1797848102740532900, guid: b72762d7ea434154d8aab014f955da1d, type: 3}
     - target: {fileID: 1797848102740532900, guid: b72762d7ea434154d8aab014f955da1d, type: 3}
       propertyPath: serializationData.PrefabModifications.Array.size
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1797848102740532900, guid: b72762d7ea434154d8aab014f955da1d, type: 3}
       propertyPath: serializationData.PrefabModifications.Array.data[0]
       value: '"path":"PowerUpAsset","value":$eref:0'
       objectReference: {fileID: 0}
-    - target: {fileID: 1797848102740532900, guid: b72762d7ea434154d8aab014f955da1d, type: 3}
-      propertyPath: serializationData.ReferencedUnityObjects.Array.data[0]
-      value: 
-      objectReference: {fileID: 11400000, guid: d3ed7aaaedc3c98478ad10d2db099e8f, type: 2}
     - target: {fileID: 1797848102740532900, guid: b72762d7ea434154d8aab014f955da1d, type: 3}
       propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1797848102740532900, guid: b72762d7ea434154d8aab014f955da1d, type: 3}
       propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0]
       value: 
-      objectReference: {fileID: 11400000, guid: d3ed7aaaedc3c98478ad10d2db099e8f, type: 2}
+      objectReference: {fileID: 11400000, guid: c158dc5e8149ab741b5bf4f89ce25271, type: 2}
     - target: {fileID: 2639209785973192634, guid: b72762d7ea434154d8aab014f955da1d, type: 3}
       propertyPath: m_Name
       value: powerup_max_health

diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_attack_cooldown.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_attack_cooldown.prefab
@@ -179,6 +179,22 @@ PrefabInstance:
       propertyPath: serializationData.Prefab
       value: 
       objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.data[0]
+      value: '"path":"ExplosionPrefab","value":$eref:0'
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0]
+      value: 
+      objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3}
     - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
       propertyPath: serializationData.Prefab
       value: 

diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_base.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_base.prefab
@@ -1180,7 +1180,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 1904067099
   m_SortingLayer: 13
-  m_SortingOrder: 1
+  m_SortingOrder: 0
   m_Sprite: {fileID: -1837112578, guid: 493fa09564f0f994aafb3d5bf7c7e8d2, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_damage.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_damage.prefab
@@ -171,6 +171,22 @@ PrefabInstance:
       propertyPath: serializationData.Prefab
       value: 
       objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.data[0]
+      value: '"path":"ExplosionPrefab","value":$eref:0'
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0]
+      value: 
+      objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3}
     - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
       propertyPath: serializationData.Prefab
       value: 

diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_life_steal.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_life_steal.prefab
@@ -179,6 +179,22 @@ PrefabInstance:
       propertyPath: serializationData.Prefab
       value: 
       objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.data[0]
+      value: '"path":"ExplosionPrefab","value":$eref:0'
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0]
+      value: 
+      objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3}
     - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
       propertyPath: serializationData.Prefab
       value: 

diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_magnet.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_magnet.prefab
@@ -175,6 +175,26 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: -1037328344, guid: 4bb96e39a9daa4843afd7d748df107c1, type: 3}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.Prefab
+      value: 
+      objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.data[0]
+      value: '"path":"ExplosionPrefab","value":$eref:0'
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0]
+      value: 
+      objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3}
     - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
       propertyPath: serializationData.Prefab
       value: 

diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_max_health.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_max_health.prefab
@@ -195,6 +195,22 @@ PrefabInstance:
       propertyPath: serializationData.Prefab
       value: 
       objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.data[0]
+      value: '"path":"ExplosionPrefab","value":$eref:0'
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0]
+      value: 
+      objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3}
     - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
       propertyPath: serializationData.Prefab
       value: 

diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_projectile_speed.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_projectile_speed.prefab
@@ -179,6 +179,22 @@ PrefabInstance:
       propertyPath: serializationData.Prefab
       value: 
       objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.data[0]
+      value: '"path":"ExplosionPrefab","value":$eref:0'
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0]
+      value: 
+      objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3}
     - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
       propertyPath: serializationData.Prefab
       value: 

diff --git a/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_ricochet.prefab b/TanksOnAPlain/Assets/Prefabs/Tanks/tank_enemy_ricochet.prefab
@@ -175,6 +175,26 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: -773796276, guid: 93863b3a51967164c88f0ce201344566, type: 3}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.Prefab
+      value: 
+      objectReference: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModifications.Array.data[0]
+      value: '"path":"ExplosionPrefab","value":$eref:0'
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6191052965639404691, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
+      propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0]
+      value: 
+      objectReference: {fileID: 6831792592313576337, guid: e125cbf240259ad40a90a5e27716fb95, type: 3}
     - target: {fileID: 7126493908852175553, guid: 5d31a3a8ae7432146976ea27c1ba0b14, type: 3}
       propertyPath: serializationData.Prefab
       value: