Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it

24c814f0 · Christopher Benes · ed9c1211 · 3480a93a · 24c814f0 · 24c814f0
Commit 24c814f0 authored Mar 29, 2019 by Christopher Benes
--- a/Assets/_Game/Data/Player Data/PlayerState.asset
+++ b/Assets/_Game/Data/Player Data/PlayerState.asset
@@ -12,17 +12,17 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 353b156b7c59b1c45a8767d7500b31fb, type: 3}
  m_Name: PlayerState
  m_EditorClassIdentifier: 
-  currentInfusedElement: 0
+  currentInfusedElement: 2
  currentMoveState:
-    jumpForce: 15
+    jumpForce: 10
    smoothing: 0.03
    airControl: 1
    canSwim: 1
-    moveSpeed: 30
+    moveSpeed: 20
    maxJumpCount: 1
    mass: 1
    gravity: 3
  movementStates: {fileID: 11400000, guid: c757aad6925b37a46b916f609fa9012b, type: 2}
  onElementInfused: {fileID: 11400000, guid: 7e5b80a8353af1846a878c3a997bdb4a, type: 2}
  onChargeChange: {fileID: 11400000, guid: 6ec6544f645a9d1458383b111fcaf8b6, type: 2}
-  charges: 0
+  charges: 1
--- a/Assets/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab
+++ b/Assets/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab
@@ -143,3 +143,4 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  destroyTime: 3
  pushFactor: 5
+  pushEnemyFactor: 1000
--- a/Assets/_Game/Prefabs/Enemies/Erd-Gegner.prefab
+++ b/Assets/_Game/Prefabs/Enemies/Erd-Gegner.prefab
@@ -48,7 +48,7 @@ Rigidbody2D:
  m_Simulated: 1
  m_UseFullKinematicContacts: 0
  m_UseAutoMass: 0
-  m_Mass: 10000
+  m_Mass: 1
  m_LinearDrag: 5
  m_AngularDrag: 0.05
  m_GravityScale: 5

--- a/Assets/_Game/Prefabs/Enemies/Feuer-Gegner.prefab
+++ b/Assets/_Game/Prefabs/Enemies/Feuer-Gegner.prefab
@@ -15,6 +15,7 @@ GameObject:
  - component: {fileID: 5627041003248903908}
  - component: {fileID: 8217090596470256212}
  - component: {fileID: 820980056}
+  - component: {fileID: 4551173074651665413}
  m_Layer: 14
  m_Name: Feuer-Gegner
  m_TagString: Fire
@@ -49,7 +50,7 @@ Rigidbody2D:
  m_Simulated: 1
  m_UseFullKinematicContacts: 0
  m_UseAutoMass: 0
-  m_Mass: 10000
+  m_Mass: 1
  m_LinearDrag: 5
  m_AngularDrag: 0.05
  m_GravityScale: 3
@@ -177,6 +178,24 @@ Animator:
  m_HasTransformHierarchy: 1
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &4551173074651665413
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1634356314439590}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c0ce2eb523274b6fa61fccbf0227d85, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MaxLife: 1
+  LostLife:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!1 &8738143122139646636
 GameObject:
  m_ObjectHideFlags: 0

--- a/Assets/_Game/Prefabs/Enemies/Wasser-Gegner.prefab
+++ b/Assets/_Game/Prefabs/Enemies/Wasser-Gegner.prefab
@@ -50,7 +50,7 @@ Rigidbody2D:
  m_Simulated: 1
  m_UseFullKinematicContacts: 0
  m_UseAutoMass: 0
-  m_Mass: 10
+  m_Mass: 1
  m_LinearDrag: 5
  m_AngularDrag: 0.05
  m_GravityScale: 5

--- a/Assets/_Game/Prefabs/Enemies/Wind-Gegner.prefab
+++ b/Assets/_Game/Prefabs/Enemies/Wind-Gegner.prefab
@@ -51,7 +51,7 @@ Rigidbody2D:
  m_Simulated: 1
  m_UseFullKinematicContacts: 0
  m_UseAutoMass: 0
-  m_Mass: 3
+  m_Mass: 1
  m_LinearDrag: 5
  m_AngularDrag: 0.05
  m_GravityScale: 0

--- a/Assets/_Game/Prefabs/HUD.prefab
+++ b/Assets/_Game/Prefabs/HUD.prefab
--- a/Assets/_Game/Prefabs/PauseMenu.prefab
+++ b/Assets/_Game/Prefabs/PauseMenu.prefab
--- a/Assets/_Game/Scenes/MainLevel-Isa.unity
+++ b/Assets/_Game/Scenes/MainLevel-Isa.unity
--- a/Assets/_Game/Scenes/MainLevel-Isa.unity.meta
+++ b/Assets/_Game/Scenes/MainLevel-Isa.unity.meta
+fileFormatVersion: 2
+guid: b7bf4d880d42d444f8da98c29b8ee5ec
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Scenes/MainLevel-Michi_Isa.unity
+++ b/Assets/_Game/Scenes/MainLevel-Michi_Isa.unity
--- a/Assets/_Game/Scenes/MainLevel-Michi_Isa.unity.meta
+++ b/Assets/_Game/Scenes/MainLevel-Michi_Isa.unity.meta
+fileFormatVersion: 2
+guid: a557c41513022e744831753cb4ad512f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Game/Scenes/MainLevel_Isa.unity
+++ b/Assets/_Game/Scenes/MainLevel_Isa.unity
@@ -1494,129 +1494,6 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 13
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &641165127
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 8474030530107407617, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_Name
-      value: Minimap
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 21
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 574052652, guid: d15c6360ddc5f6d45994b7a8ad351996, type: 3}
-      propertyPath: player
-      value: 
-      objectReference: {fileID: 435083157}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d15c6360ddc5f6d45994b7a8ad351996, type: 3}
 --- !u!1001 &674588446
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -2749,6 +2626,11 @@ PrefabInstance:
      propertyPath: m_Pivot.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2362585430913481208, guid: 35f9d08058ae666458aadeaeab77cf00,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 35f9d08058ae666458aadeaeab77cf00, type: 3}
 --- !u!1001 &1020248502
@@ -2801,7 +2683,7 @@ PrefabInstance:
    - target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
        type: 3}
      propertyPath: m_RootOrder
-      value: 22
+      value: 21
      objectReference: {fileID: 0}
    - target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
        type: 3}
@@ -2868,6 +2750,11 @@ PrefabInstance:
      propertyPath: m_Pivot.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2362585432661986845, guid: 50a0ddec8ac259c46a58a6b5324a759d,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 50a0ddec8ac259c46a58a6b5324a759d, type: 3}
 --- !u!1 &1025537126

--- a/Assets/_Game/Scenes/Pick_Up_Test_Scene.unity
+++ b/Assets/_Game/Scenes/Pick_Up_Test_Scene.unity
@@ -209,10 +209,10 @@ Transform:
  m_GameObject: {fileID: 5004504}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 30, y: 1, z: 1}
+  m_LocalScale: {x: 60, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!61 &5004508
 BoxCollider2D:
@@ -260,7 +260,7 @@ PrefabInstance:
    - target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 1
+      value: 1.5
      objectReference: {fileID: 0}
    - target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
        type: 3}
@@ -290,7 +290,7 @@ PrefabInstance:
    - target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
        type: 3}
      propertyPath: m_RootOrder
-      value: 6
+      value: 7
      objectReference: {fileID: 0}
    - target: {fileID: 1430575287304331681, guid: e79fbf1855fce6e4387f467f1fb65960,
        type: 3}
@@ -329,7 +329,7 @@ PrefabInstance:
    - target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 1
+      value: 1.5
      objectReference: {fileID: 0}
    - target: {fileID: 8746327460217138312, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1,
        type: 3}
@@ -378,6 +378,37 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1, type: 3}
+--- !u!1 &460248754 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 52145075018362288, guid: 2e3528907311e438dab0d393127aa332,
+    type: 3}
+  m_PrefabInstance: {fileID: 671048602}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &460248755
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 460248754}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 375b65aa2cf684af6978a76db238f875, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!4 &460248767 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
+    type: 3}
+  m_PrefabInstance: {fileID: 671048602}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &531909445
 GameObject:
  m_ObjectHideFlags: 0
@@ -389,6 +420,7 @@ GameObject:
  - component: {fileID: 531909448}
  - component: {fileID: 531909447}
  - component: {fileID: 531909446}
+  - component: {fileID: 531909449}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
@@ -454,12 +486,85 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 531909445}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -15}
+  m_LocalPosition: {x: 0, y: 1.5, z: -15}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &531909449
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 531909445}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 53e622d25d5bf8b45be54c49c309108d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  target: {fileID: 460248767}
+  smoothSpeed: 0.5
+  lookAt: 0
+  maxDistance: 5
+--- !u!1001 &603530904
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1634356314439590, guid: f73431649cac0ba4b9385829c74919c0, type: 3}
+      propertyPath: m_Name
+      value: Erd-Gegner
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: f73431649cac0ba4b9385829c74919c0, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -13.216415
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: f73431649cac0ba4b9385829c74919c0, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 8.193205
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: f73431649cac0ba4b9385829c74919c0, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: f73431649cac0ba4b9385829c74919c0, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: f73431649cac0ba4b9385829c74919c0, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: f73431649cac0ba4b9385829c74919c0, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: f73431649cac0ba4b9385829c74919c0, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: f73431649cac0ba4b9385829c74919c0, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: f73431649cac0ba4b9385829c74919c0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: f73431649cac0ba4b9385829c74919c0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: f73431649cac0ba4b9385829c74919c0, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f73431649cac0ba4b9385829c74919c0, type: 3}
 --- !u!1001 &632712955
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -480,7 +585,7 @@ PrefabInstance:
    - target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 1
+      value: 1.5
      objectReference: {fileID: 0}
    - target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
        type: 3}
@@ -510,7 +615,7 @@ PrefabInstance:
    - target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
        type: 3}
      propertyPath: m_RootOrder
-      value: 5
+      value: 6
      objectReference: {fileID: 0}
    - target: {fileID: 3969804830442744035, guid: 599519593b27fd2448e33dcb9f69045b,
        type: 3}
@@ -579,7 +684,7 @@ PrefabInstance:
    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
        type: 3}
      propertyPath: m_RootOrder
-      value: 8
+      value: 9
      objectReference: {fileID: 0}
    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
        type: 3}
@@ -602,6 +707,11 @@ PrefabInstance:
      value: 
      objectReference: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639,
        type: 2}
+    - target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_WhatIsGround.m_Bits
+      value: 33280
+      objectReference: {fileID: 0}
    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
      propertyPath: m_Enabled
      value: 0
@@ -622,8 +732,66 @@ PrefabInstance:
      propertyPath: m_Enabled
      value: 0
      objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 8997061578198512906, guid: 2e3528907311e438dab0d393127aa332, type: 3}
  m_SourcePrefab: {fileID: 100100000, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+--- !u!1001 &925786129
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1634356314439590, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3}
+      propertyPath: m_Name
+      value: Feuer-Gegner
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 8.810621
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 7.323715
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738352637052488, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 436bce950d0b3f4499ca6ffc2704906a, type: 3}
 --- !u!1001 &1343459453
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -644,7 +812,7 @@ PrefabInstance:
    - target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 1
+      value: 1.5
      objectReference: {fileID: 0}
    - target: {fileID: 5794390821522793468, guid: 4512b8eb550115443bbba2ecd59a960c,
        type: 3}
@@ -693,148 +861,6 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 4512b8eb550115443bbba2ecd59a960c, type: 3}
--- !u!1 &1644657071
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1644657076}
-  - component: {fileID: 1644657075}
-  - component: {fileID: 1644657073}
-  - component: {fileID: 1644657072}
-  - component: {fileID: 1644657074}