undo the prefab nesting I just did

Mattshark89 · Feb 5, 2024 · d8b711a · d8b711a
1 parent a5cc3bc
commit d8b711a
Show file tree

Hide file tree

Showing 2 changed files with 90 additions and 97 deletions.
diff --git a/Packages/com.mattshark.openflight/Runtime/Development Scene.unity b/Packages/com.mattshark.openflight/Runtime/Development Scene.unity
@@ -2544,6 +2544,81 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 2029970652}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &278957826
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7650233290849937204, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+      propertyPath: serializationData.Prefab
+      value: 
+      objectReference: {fileID: 7650233290849937204, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+    - target: {fileID: 8671630162616761239, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+        type: 3}
+      propertyPath: m_Name
+      value: OpenFlightPlayerObjectPool
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0c7e30f270fff3348b6aa81d34cf70b7, type: 3}
 --- !u!1 &279011480 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1326149179545448374, guid: c3e16ceaf4929fe4cbed69e31989189c,
@@ -5598,7 +5673,7 @@ Transform:
   m_Children:
   - {fileID: 1330013382}
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &579860797
 PrefabInstance:
@@ -6072,7 +6147,7 @@ Transform:
   m_Children:
   - {fileID: 1394868996}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &628506925 stripped
 GameObject:
@@ -6841,7 +6916,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &701410021
 PrefabInstance:
@@ -9463,7 +9538,7 @@ Transform:
   m_Children:
   - {fileID: 602561006}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1043326402 stripped
 GameObject:
@@ -10440,7 +10515,7 @@ Transform:
   - {fileID: 1587704067}
   - {fileID: 1622495276}
   m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1200710212 stripped
 GameObject:
@@ -17800,7 +17875,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1459756160 stripped
 GameObject:
@@ -27028,7 +27103,7 @@ Transform:
   m_LocalScale: {x: 1000, y: 1000, z: 1000}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1704855382
 PrefabInstance:
@@ -29866,7 +29941,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1 &2020782140 stripped
 GameObject:
@@ -34908,7 +34983,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2066566874 stripped
 GameObject:

diff --git a/Packages/com.mattshark.openflight/Runtime/OpenFlight.prefab b/Packages/com.mattshark.openflight/Runtime/OpenFlight.prefab
@@ -768,7 +768,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4190905665779482795}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1762385151465300334
 MonoBehaviour:
@@ -1143,7 +1143,6 @@ Transform:
   - {fileID: 3409456301046135676}
   - {fileID: 4608301053287770956}
   - {fileID: 390745881517100987}
-  - {fileID: 6515391228854177200}
   - {fileID: 4895602198922709238}
   - {fileID: 1704161488425875414}
   - {fileID: 7515417092119910431}
@@ -1859,7 +1858,7 @@ Transform:
   - {fileID: 4510788060926668793}
   - {fileID: 4040298170384878950}
   m_Father: {fileID: 4190905665779482795}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &6405410659339929893
 MonoBehaviour:
@@ -5305,7 +5304,7 @@ PrefabInstance:
     - target: {fileID: 6124323177475442875, guid: 47f89c3bc94a83e4b9c05f6f43ee2ef8,
         type: 3}
       propertyPath: m_RootOrder
-      value: 10
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 6124323177475442875, guid: 47f89c3bc94a83e4b9c05f6f43ee2ef8,
         type: 3}
@@ -7240,96 +7239,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6bab25885c10e93429dac677eab33119, type: 3}
---- !u!4 &6815070140577137645 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6bab25885c10e93429dac677eab33119,
-    type: 3}
-  m_PrefabInstance: {fileID: 6420241161822512134}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6185745232576420183 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 6bab25885c10e93429dac677eab33119,
     type: 3}
   m_PrefabInstance: {fileID: 6420241161822512134}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &8881453803980945400
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 4190905665779482795}
-    m_Modifications:
-    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7650233290849937204, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-      propertyPath: serializationData.Prefab
-      value: 
-      objectReference: {fileID: 7650233290849937204, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-    - target: {fileID: 8671630162616761239, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
-        type: 3}
-      propertyPath: m_Name
-      value: OpenFlightPlayerObjectPool
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 0c7e30f270fff3348b6aa81d34cf70b7, type: 3}
---- !u!4 &6515391228854177200 stripped
+--- !u!4 &6815070140577137645 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 2389743308707461704, guid: 0c7e30f270fff3348b6aa81d34cf70b7,
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6bab25885c10e93429dac677eab33119,
     type: 3}
-  m_PrefabInstance: {fileID: 8881453803980945400}
+  m_PrefabInstance: {fileID: 6420241161822512134}
   m_PrefabAsset: {fileID: 0}