fix1

2026-08-20 11:35:03 +02:00
parent 2604185ce4
commit 1db2ec9a94
7 changed files with 185 additions and 2 deletions
@@ -2090,6 +2090,127 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
  m_PrefabInstance: {fileID: 79145418}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+=======
+--- !u!1001 &3100000001
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 666541161848099966, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 515
+      objectReference: {fileID: 0}
+    - target: {fileID: 666541161848099966, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 666541161848099966, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 120
+      objectReference: {fileID: 0}
+    - target: {fileID: 8869766472872964854, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+      propertyPath: m_Name
+      value: Test Geisel 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8869766472872964854, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+      propertyPath: m_TagString
+      value: Untagged
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 180122570269065527, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+    - {fileID: 180122570269065528, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+    - {fileID: 180122570269065529, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 3184574949717094923, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 3100000003}
+  m_SourcePrefab: {fileID: 100100000, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+--- !u!1 &3100000002 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3184574949717094923, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+  m_PrefabInstance: {fileID: 3100000001}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &3100000003
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3100000002}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62ea7866e4d846e2b5d207c6a3ec8afa, type: 3}
+  m_Name:
+  m_EditorClassIdentifier: Assembly-CSharp::HostageRescue
+  rescueDistance: 3
+  escapeDistance: 15
+  runSpeed: 5
+--- !u!1001 &3100000011
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 666541161848099966, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 500
+      objectReference: {fileID: 0}
+    - target: {fileID: 666541161848099966, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 666541161848099966, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 130
+      objectReference: {fileID: 0}
+    - target: {fileID: 8869766472872964854, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+      propertyPath: m_Name
+      value: Test Geisel 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8869766472872964854, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+      propertyPath: m_TagString
+      value: Untagged
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 180122570269065527, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+    - {fileID: 180122570269065528, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+    - {fileID: 180122570269065529, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 3184574949717094923, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 3100000013}
+  m_SourcePrefab: {fileID: 100100000, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+--- !u!1 &3100000012 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3184574949717094923, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
+  m_PrefabInstance: {fileID: 3100000011}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &3100000013
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3100000012}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62ea7866e4d846e2b5d207c6a3ec8afa, type: 3}
+  m_Name:
+  m_EditorClassIdentifier: Assembly-CSharp::HostageRescue
+  rescueDistance: 3
+  escapeDistance: 15
+  runSpeed: 5
+>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
  m_ObjectHideFlags: 0
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 053b45c74c5f27248b1fa23c2f2c241f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: