Merge remote-tracking branch 'origin/master'

2022-11-22 16:53:28 +01:00 · 2022-11-22 16:53:28 +01:00 · 2294ff44d3
parent 660f5f4c59 cea400e45c
commit 2294ff44d3
1 changed files with 146 additions and 58 deletions
--- a/Assets/Assets/00_Scenes/02_ControlRoom.unity
+++ b/Assets/Assets/00_Scenes/02_ControlRoom.unity
@ -123,63 +123,6 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
--- !u!1001 &656384519
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: 4416c4f31807e45bc97ed8f1b2b0a090, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 4416c4f31807e45bc97ed8f1b2b0a090, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 4.3494425
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 4416c4f31807e45bc97ed8f1b2b0a090, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 4416c4f31807e45bc97ed8f1b2b0a090, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -0.2948451
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 4416c4f31807e45bc97ed8f1b2b0a090, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 4416c4f31807e45bc97ed8f1b2b0a090, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 4416c4f31807e45bc97ed8f1b2b0a090, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 4416c4f31807e45bc97ed8f1b2b0a090, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 4416c4f31807e45bc97ed8f1b2b0a090, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 4416c4f31807e45bc97ed8f1b2b0a090, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 4416c4f31807e45bc97ed8f1b2b0a090, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: 4416c4f31807e45bc97ed8f1b2b0a090, type: 3}
-      propertyPath: m_Name
-      value: main_room
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 4416c4f31807e45bc97ed8f1b2b0a090, type: 3}
 --- !u!1 &705507993
 GameObject:
  m_ObjectHideFlags: 0
@ -295,6 +238,68 @@ MonoBehaviour:
  m_ShadowLayerMask: 1
  m_LightCookieSize: {x: 1, y: 1}
  m_LightCookieOffset: {x: 0, y: 0}
+--- !u!1001 &1717823798
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 3.5982351
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.028167892
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1.5664964
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+      propertyPath: m_Name
+      value: control_room_main
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+--- !u!4 &1717823799 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}
+  m_PrefabInstance: {fileID: 1717823798}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1829176653
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -394,5 +399,88 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2085957539
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2085957540}
+  - component: {fileID: 2085957542}
+  - component: {fileID: 2085957541}
+  m_Layer: 0
+  m_Name: Plane (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2085957540
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2085957539}
+  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: -0, y: 5.96, z: -0}
+  m_LocalScale: {x: 1391.6984, y: 1391.6984, z: 1391.6984}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1717823799}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!23 &2085957541
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2085957539}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &2085957542
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2085957539}
+  m_Mesh: {fileID: -462981019419857548, guid: d2749c4f9998c43d89120e8eb66936ec, type: 3}