correctly delete old rooms

2022-12-07 15:41:00 +01:00
parent 4f886fc0b1
commit d36d33ca96
23 changed files with 222 additions and 242 deletions
--- a/Assets/Desert/Assets/Prefabs/Desert
+++ b/Assets/Desert/Assets/Prefabs/Desert
@@ -32,38 +32,6 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7280908611734617658
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 895589781461088420}
-  m_Layer: 0
-  m_Name: Desert Scale
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 2147483647
-  m_IsActive: 1
--- !u!4 &895589781461088420
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7280908611734617658}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 1
-  m_Children:
-  - {fileID: 574765980742794756}
-  m_Father: {fileID: 7933998900790106032}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8236754837553209924
 GameObject:
  m_ObjectHideFlags: 0
@@ -92,84 +60,108 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 895589781461088420}
+  - {fileID: 8825350056022503906}
  m_Father: {fileID: 7626240558108670521}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2434868707875363028
+--- !u!1001 &9075677266218620425
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
    serializedVersion: 2
-    m_TransformParent: {fileID: 895589781461088420}
+    m_TransformParent: {fileID: 7933998900790106032}
    m_Modifications:
-    - target: {fileID: 100443119660398373, guid: cc21a746bc450c74b8ecfc78f142849a,
-        type: 3}
-      propertyPath: m_Name
-      value: Desert Floor Tile
-      objectReference: {fileID: 0}
-    - target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
+    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
        type: 3}
      propertyPath: m_RootOrder
-      value: 0
+      value: -1
      objectReference: {fileID: 0}
-    - target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
+    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
        type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
+    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
        type: 3}
      propertyPath: m_LocalPosition.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
+    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
        type: 3}
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
+    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
        type: 3}
      propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.7071067
      objectReference: {fileID: 0}
-    - target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
+    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
        type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0.7071068
      objectReference: {fileID: 0}
-    - target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
+    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
        type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
-    - target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
+    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
        type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
-    - target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
+    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
+    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
+    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: -7511558181221131132, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: e754492879cc0db4fa31c48e5d57ea8c, type: 2}
+    - target: {fileID: 919132149155446097, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
+        type: 3}
+      propertyPath: m_Name
+      value: Desert Floor
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_AddedGameObjects: []
-  m_SourcePrefab: {fileID: 100100000, guid: cc21a746bc450c74b8ecfc78f142849a, type: 3}
--- !u!4 &574765980742794756 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2752718264336852688, guid: cc21a746bc450c74b8ecfc78f142849a,
+  m_SourcePrefab: {fileID: 100100000, guid: 3a11a6b6fc0ad1a429fa098c08e2c361, type: 3}
+--- !u!1 &8156618926076308312 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
    type: 3}
-  m_PrefabInstance: {fileID: 2434868707875363028}
+  m_PrefabInstance: {fileID: 9075677266218620425}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1902631214646309221
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8156618926076308312}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 496991ba2bf54e1e854a171f18180c54, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  objectToDisable: {fileID: 5743657079028767629}
+--- !u!4 &8825350056022503906 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
+    type: 3}
+  m_PrefabInstance: {fileID: 9075677266218620425}
  m_PrefabAsset: {fileID: 0}
--- a/Assets/Desert/Assets/Prefabs/Desert
+++ b/Assets/Desert/Assets/Prefabs/Desert
@@ -1,114 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1 &100443119660398373
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2752718264336852688}
-  m_Layer: 0
-  m_Name: Desert Floor Tile
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &2752718264336852688
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 100443119660398373}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6607789105031014710}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &6645391460334866141
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 2752718264336852688}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071067
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -7511558181221131132, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-        type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: e754492879cc0db4fa31c48e5d57ea8c, type: 2}
-    - target: {fileID: 919132149155446097, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-        type: 3}
-      propertyPath: m_Name
-      value: Desert Floor
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 3a11a6b6fc0ad1a429fa098c08e2c361, type: 3}
--- !u!4 &6607789105031014710 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3a11a6b6fc0ad1a429fa098c08e2c361,
-    type: 3}
-  m_PrefabInstance: {fileID: 6645391460334866141}
-  m_PrefabAsset: {fileID: 0}
--- a/Assets/Desert/Assets/Prefabs/Desert
+++ b/Assets/Desert/Assets/Prefabs/Desert
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: cc21a746bc450c74b8ecfc78f142849a
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: