From ec357740cb964fde5959003a329dabdae9932a76 Mon Sep 17 00:00:00 2001 From: MrGadget1024 <9826063+MrGadget1024@users.noreply.github.com> Date: Sun, 19 Nov 2023 10:13:22 -0500 Subject: [PATCH] fix(PhysicsSimulator): Consolidated to Common --- .../MirrorAdditiveLevelsSubLevel1.unity | 461 ++++++++---------- .../MirrorAdditiveLevelsSubLevel2.unity | 453 ++++++++--------- .../Scripts/PhysicsSimulator.cs | 40 -- .../Scripts/PhysicsSimulator.cs.meta | 11 - .../MirrorMultipleAdditiveScenesGame.unity | 182 +++++-- .../Examples/_Common/PhysicsSimulator.meta | 8 + .../PhysicsSimulator}/PhysicsSimulator.cs | 2 +- .../PhysicsSimulator.cs.meta | 0 .../PhysicsSimulator/PhysicsSimulator.prefab | 46 ++ .../PhysicsSimulator.prefab.meta | 7 + 10 files changed, 596 insertions(+), 614 deletions(-) delete mode 100644 Assets/Mirror/Examples/AdditiveLevels/Scripts/PhysicsSimulator.cs delete mode 100644 Assets/Mirror/Examples/AdditiveLevels/Scripts/PhysicsSimulator.cs.meta create mode 100644 Assets/Mirror/Examples/_Common/PhysicsSimulator.meta rename Assets/Mirror/Examples/{MultipleAdditiveScenes/Scripts => _Common/PhysicsSimulator}/PhysicsSimulator.cs (95%) rename Assets/Mirror/Examples/{MultipleAdditiveScenes/Scripts => _Common/PhysicsSimulator}/PhysicsSimulator.cs.meta (100%) create mode 100644 Assets/Mirror/Examples/_Common/PhysicsSimulator/PhysicsSimulator.prefab create mode 100644 Assets/Mirror/Examples/_Common/PhysicsSimulator/PhysicsSimulator.prefab.meta diff --git a/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel1.unity b/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel1.unity index 59e15e18e..3dd31401a 100644 --- a/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel1.unity +++ b/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel1.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.2312071, g: 0.2344121, b: 0.27077314, a: 1} + m_IndirectSpecularColor: {r: 0.043674428, g: 0.044857424, b: 0.059592403, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -97,15 +97,14 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000006, guid: 7868b86bff1943140826320e66c66468, - type: 2} + m_LightingDataAsset: {fileID: 112000006, guid: 7868b86bff1943140826320e66c66468, type: 2} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -118,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -165,6 +164,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 126437272} + serializedVersion: 2 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} @@ -173,7 +173,6 @@ Transform: - {fileID: 1373387508} - {fileID: 1445828407} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &472411619 GameObject: @@ -199,13 +198,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 472411619} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -6, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1518259679} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &472411621 MonoBehaviour: @@ -243,13 +242,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 493146027} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1518259679} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &493146029 MonoBehaviour: @@ -286,6 +285,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 939597736} + serializedVersion: 2 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} @@ -296,86 +296,75 @@ Transform: - {fileID: 2120764046} - {fileID: 1071886464} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1071886463 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 939597737} m_Modifications: - - target: {fileID: -1828993248307539358, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: -1828993248307539358, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: sceneId value: 656062201 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528418, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528418, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_Name value: Cube objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalPosition.x value: 7 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalPosition.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} --- !u!4 &1071886464 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + m_CorrespondingSourceObject: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} m_PrefabInstance: {fileID: 1071886463} m_PrefabAsset: {fileID: 0} --- !u!1 &1224119056 @@ -402,13 +391,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1224119056} + serializedVersion: 2 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: [] m_Father: {fileID: 1518259679} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1224119058 MonoBehaviour: @@ -427,85 +416,131 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 939597737} m_Modifications: - - target: {fileID: -1828993248307539358, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: -1828993248307539358, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: sceneId value: 3113436280 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528418, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528418, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_Name value: Cube objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalPosition.x value: -1 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalPosition.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} --- !u!4 &1294796099 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + m_CorrespondingSourceObject: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} m_PrefabInstance: {fileID: 1294796098} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1333422873 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581897434666803994, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_Name + value: PhysicsSimulator + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} --- !u!4 &1373387508 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + m_CorrespondingSourceObject: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} m_PrefabInstance: {fileID: 7582855648999245619} m_PrefabAsset: {fileID: 0} --- !u!1001 &1445828406 @@ -513,74 +548,65 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 126437274} m_Modifications: - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008055, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008055, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_Name value: Plane objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} --- !u!4 &1445828407 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + m_CorrespondingSourceObject: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} m_PrefabInstance: {fileID: 1445828406} m_PrefabAsset: {fileID: 0} --- !u!1 &1513281386 @@ -607,13 +633,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1513281386} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1518259679} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1513281388 MonoBehaviour: @@ -650,6 +676,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1518259678} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} @@ -660,130 +687,75 @@ Transform: - {fileID: 1513281387} - {fileID: 1224119057} m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1842934413 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1842934415} - - component: {fileID: 1842934414} - m_Layer: 0 - m_Name: PhysicsSimulator - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1842934414 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1842934413} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 472efbe031bc80a499ea2a1003ac7452, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1842934415 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1842934413} - 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: [] - m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2120764045 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 939597737} m_Modifications: - - target: {fileID: -1828993248307539358, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: -1828993248307539358, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: sceneId value: 3424948259 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528418, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528418, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_Name value: Cube objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalPosition.x value: 3 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalPosition.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} --- !u!4 &2120764046 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + m_CorrespondingSourceObject: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} m_PrefabInstance: {fileID: 2120764045} m_PrefabAsset: {fileID: 0} --- !u!1001 &1098173225757504847 @@ -791,178 +763,154 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalPosition.x value: -10 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalPosition.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalPosition.z value: 10 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622925, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622925, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_Name value: Portal objectReference: {fileID: 0} - - target: {fileID: 3141292696673982546, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 3141292696673982546, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: sceneId value: 1143465467 objectReference: {fileID: 0} - - target: {fileID: 3141292696673982546, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 3141292696673982546, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: serverOnly value: 0 objectReference: {fileID: 0} - - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: startPosition.x value: -5 objectReference: {fileID: 0} - - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: startPosition.y value: 1.1 objectReference: {fileID: 0} - - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: startPosition.z value: 10 objectReference: {fileID: 0} - - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: destinationScene value: Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel2.unity objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} --- !u!1001 &3181899219847070118 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 939597737} m_Modifications: - - target: {fileID: -1828993248307539358, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: -1828993248307539358, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: sceneId value: 3043478025 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528418, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528418, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_Name value: Cube objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalPosition.x value: -5 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalPosition.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + - target: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} --- !u!4 &3181899219847070119 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, - type: 3} + m_CorrespondingSourceObject: {fileID: 3181899219042528419, guid: 7c6a0a278eba11e44b9a86cd4da603df, type: 3} m_PrefabInstance: {fileID: 3181899219847070118} m_PrefabAsset: {fileID: 0} --- !u!1001 &7582855648999245619 @@ -970,67 +918,68 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 126437274} m_Modifications: - - target: {fileID: 7582855647636897216, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897216, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_Name value: StartPoint objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalPosition.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalPosition.z value: -10 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1333422873} + - {fileID: 126437274} + - {fileID: 939597737} + - {fileID: 1098173225757504847} + - {fileID: 1518259679} diff --git a/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel2.unity b/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel2.unity index f3358619a..4bd08123d 100644 --- a/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel2.unity +++ b/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel2.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.2312071, g: 0.2344121, b: 0.27077314, a: 1} + m_IndirectSpecularColor: {r: 0.043674428, g: 0.044857424, b: 0.059592403, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -97,15 +97,14 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000004, guid: 7868b86bff1943140826320e66c66468, - type: 2} + m_LightingDataAsset: {fileID: 112000004, guid: 7868b86bff1943140826320e66c66468, type: 2} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -118,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -129,183 +128,158 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalPosition.x value: 10 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalPosition.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalPosition.z value: -10 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1098173225717622925, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 1098173225717622925, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_Name value: Portal objectReference: {fileID: 0} - - target: {fileID: 3141292696673982546, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 3141292696673982546, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: sceneId value: 1073849646 objectReference: {fileID: 0} - - target: {fileID: 3141292696673982546, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 3141292696673982546, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: serverOnly value: 0 objectReference: {fileID: 0} - - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: originScene value: Assets/DungeonTest/Scenes/Level2.unity objectReference: {fileID: 0} - - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: startPosition.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: startPosition.y value: 1.1 objectReference: {fileID: 0} - - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: startPosition.z value: -10 objectReference: {fileID: 0} - - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} + - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: destinationScene value: Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel1.unity objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} --- !u!1001 &1071886463 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1514693545} m_Modifications: - - target: {fileID: -5172514306435102607, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: -5172514306435102607, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: sceneId value: 2068572849 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalPosition.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalPosition.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236743, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236743, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_Name value: Sphere objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} --- !u!4 &1071886464 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + m_CorrespondingSourceObject: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} m_PrefabInstance: {fileID: 1071886463} m_PrefabAsset: {fileID: 0} --- !u!1001 &1294796098 @@ -313,81 +287,128 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1514693545} m_Modifications: - - target: {fileID: -5172514306435102607, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: -5172514306435102607, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: sceneId value: 131067959 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalPosition.x value: -3 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalPosition.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236743, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236743, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_Name value: Sphere objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} --- !u!4 &1294796099 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + m_CorrespondingSourceObject: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} m_PrefabInstance: {fileID: 1294796098} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1333422873 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581897434666803994, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_Name + value: PhysicsSimulator + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} --- !u!1 &1514693544 GameObject: m_ObjectHideFlags: 0 @@ -411,6 +432,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1514693544} + serializedVersion: 2 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} @@ -421,51 +443,6 @@ Transform: - {fileID: 2120764046} - {fileID: 1071886464} m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1842934413 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1842934415} - - component: {fileID: 1842934414} - m_Layer: 0 - m_Name: PhysicsSimulator - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1842934414 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1842934413} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 472efbe031bc80a499ea2a1003ac7452, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1842934415 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1842934413} - 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: [] - m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1932534637 GameObject: @@ -508,6 +485,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1932534637} + serializedVersion: 2 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} @@ -516,81 +494,71 @@ Transform: - {fileID: 6358973573665600640} - {fileID: 1999985658} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1999985657 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1932534639} m_Modifications: - - target: {fileID: 7582855647636897216, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897216, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_Name value: StartPoint objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalPosition.x value: -5 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalPosition.z value: 10 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + - target: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} --- !u!4 &1999985658 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, - type: 3} + m_CorrespondingSourceObject: {fileID: 7582855647636897223, guid: 849c125c9d8094249b3c664da1cd143a, type: 3} m_PrefabInstance: {fileID: 1999985657} m_PrefabAsset: {fileID: 0} --- !u!1001 &2120764045 @@ -598,79 +566,69 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1514693545} m_Modifications: - - target: {fileID: -5172514306435102607, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: -5172514306435102607, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: sceneId value: 1581864539 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalPosition.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalPosition.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236743, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236743, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_Name value: Sphere objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} --- !u!4 &2120764046 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + m_CorrespondingSourceObject: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} m_PrefabInstance: {fileID: 2120764045} m_PrefabAsset: {fileID: 0} --- !u!1001 &2188792038635513489 @@ -678,79 +636,69 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1514693545} m_Modifications: - - target: {fileID: -5172514306435102607, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: -5172514306435102607, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: sceneId value: 3873206969 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalPosition.x value: -7 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalPosition.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2188792038427236743, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + - target: {fileID: 2188792038427236743, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} propertyPath: m_Name value: Sphere objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} --- !u!4 &2188792038635513490 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, - type: 3} + m_CorrespondingSourceObject: {fileID: 2188792038427236742, guid: e588080aa542be54d9ca9d5c734dc9ee, type: 3} m_PrefabInstance: {fileID: 2188792038635513489} m_PrefabAsset: {fileID: 0} --- !u!1001 &6358973573665600639 @@ -758,73 +706,72 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1932534639} m_Modifications: - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7349408984269008055, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + - target: {fileID: 7349408984269008055, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} propertyPath: m_Name value: Plane objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} --- !u!4 &6358973573665600640 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, - type: 3} + m_CorrespondingSourceObject: {fileID: 7349408984269008052, guid: 4fdcc4aa5c669b348a5954a92f5e8e89, type: 3} m_PrefabInstance: {fileID: 6358973573665600639} m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1333422873} + - {fileID: 1932534639} + - {fileID: 1514693545} + - {fileID: 571924470} diff --git a/Assets/Mirror/Examples/AdditiveLevels/Scripts/PhysicsSimulator.cs b/Assets/Mirror/Examples/AdditiveLevels/Scripts/PhysicsSimulator.cs deleted file mode 100644 index 7b0da7aa6..000000000 --- a/Assets/Mirror/Examples/AdditiveLevels/Scripts/PhysicsSimulator.cs +++ /dev/null @@ -1,40 +0,0 @@ -using UnityEngine; - -namespace Mirror.Examples.AdditiveLevels -{ - public class PhysicsSimulator : MonoBehaviour - { - PhysicsScene physicsScene; - PhysicsScene2D physicsScene2D; - - bool simulatePhysicsScene; - bool simulatePhysicsScene2D; - - void Awake() - { - if (NetworkServer.active) - { - physicsScene = gameObject.scene.GetPhysicsScene(); - simulatePhysicsScene = physicsScene.IsValid() && physicsScene != Physics.defaultPhysicsScene; - - physicsScene2D = gameObject.scene.GetPhysicsScene2D(); - simulatePhysicsScene2D = physicsScene2D.IsValid() && physicsScene2D != Physics2D.defaultPhysicsScene; - } - else - { - enabled = false; - } - } - - void FixedUpdate() - { - if (!NetworkServer.active) return; - - if (simulatePhysicsScene) - physicsScene.Simulate(Time.fixedDeltaTime); - - if (simulatePhysicsScene2D) - physicsScene2D.Simulate(Time.fixedDeltaTime); - } - } -} diff --git a/Assets/Mirror/Examples/AdditiveLevels/Scripts/PhysicsSimulator.cs.meta b/Assets/Mirror/Examples/AdditiveLevels/Scripts/PhysicsSimulator.cs.meta deleted file mode 100644 index b683f9a82..000000000 --- a/Assets/Mirror/Examples/AdditiveLevels/Scripts/PhysicsSimulator.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 472efbe031bc80a499ea2a1003ac7452 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/MirrorMultipleAdditiveScenesGame.unity b/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/MirrorMultipleAdditiveScenesGame.unity index 17eb202f8..5693f9e12 100644 --- a/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/MirrorMultipleAdditiveScenesGame.unity +++ b/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/MirrorMultipleAdditiveScenesGame.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -146,6 +146,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 473309615} + serializedVersion: 2 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} @@ -156,13 +157,13 @@ Transform: - {fileID: 2061474489} - {fileID: 1072549450} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &535961555 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 473309616} m_Modifications: - target: {fileID: -7012348765844800875, guid: a104de86221e66a48832c222471d4f1e, type: 3} @@ -231,6 +232,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: -8786580539857106334, guid: a104de86221e66a48832c222471d4f1e, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a104de86221e66a48832c222471d4f1e, type: 3} --- !u!4 &535961556 stripped Transform: @@ -242,6 +246,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 473309616} m_Modifications: - target: {fileID: -7012348765844800875, guid: a104de86221e66a48832c222471d4f1e, type: 3} @@ -310,6 +315,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: -8786580539857106334, guid: a104de86221e66a48832c222471d4f1e, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a104de86221e66a48832c222471d4f1e, type: 3} --- !u!4 &1069065321 stripped Transform: @@ -321,6 +329,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 473309616} m_Modifications: - target: {fileID: -7012348765844800875, guid: a104de86221e66a48832c222471d4f1e, type: 3} @@ -389,6 +398,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: -8786580539857106334, guid: a104de86221e66a48832c222471d4f1e, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a104de86221e66a48832c222471d4f1e, type: 3} --- !u!4 &1072549450 stripped Transform: @@ -427,9 +439,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1305256737} m_Material: {fileID: 13400000, guid: 2e179c076d5d0924dbf5a2de0630bdb1, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 10, y: 8, z: 0.1} m_Center: {x: 0, y: 4, z: 5} --- !u!65 &1305256739 @@ -440,9 +460,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1305256737} m_Material: {fileID: 13400000, guid: 2e179c076d5d0924dbf5a2de0630bdb1, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 10, y: 8, z: 0.1} m_Center: {x: 0, y: 4, z: -5} --- !u!65 &1305256740 @@ -453,9 +481,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1305256737} m_Material: {fileID: 13400000, guid: 2e179c076d5d0924dbf5a2de0630bdb1, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.1, y: 8, z: 10} m_Center: {x: 5, y: 4, z: 0} --- !u!65 &1305256741 @@ -466,9 +502,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1305256737} m_Material: {fileID: 13400000, guid: 2e179c076d5d0924dbf5a2de0630bdb1, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.1, y: 8, z: 10} m_Center: {x: -5, y: 4, z: 0} --- !u!23 &1305256742 @@ -521,9 +565,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1305256737} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -542,13 +594,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1305256737} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 4, y: 1, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1305256746 MonoBehaviour: @@ -567,55 +619,12 @@ MonoBehaviour: serverOnly: 0 visible: 0 hasSpawned: 0 ---- !u!1 &1713236906 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1713236908} - - component: {fileID: 1713236907} - m_Layer: 0 - m_Name: PhysicsSimulator - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1713236907 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1713236906} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 78e3051d2c03f27429276d8a55a6d15c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1713236908 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1713236906} - 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: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2061474488 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 473309616} m_Modifications: - target: {fileID: -7012348765844800875, guid: a104de86221e66a48832c222471d4f1e, type: 3} @@ -684,9 +693,76 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: -8786580539857106334, guid: a104de86221e66a48832c222471d4f1e, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a104de86221e66a48832c222471d4f1e, type: 3} --- !u!4 &2061474489 stripped Transform: m_CorrespondingSourceObject: {fileID: 5513112217680897778, guid: a104de86221e66a48832c222471d4f1e, type: 3} m_PrefabInstance: {fileID: 2061474488} m_PrefabAsset: {fileID: 0} +--- !u!1001 &743218413121761650 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440985591853936351, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581897434666803994, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} + propertyPath: m_Name + value: PhysicsSimulator + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 99d75386017b4ba44ad1482ee7938f5a, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1305256745} + - {fileID: 743218413121761650} + - {fileID: 473309616} diff --git a/Assets/Mirror/Examples/_Common/PhysicsSimulator.meta b/Assets/Mirror/Examples/_Common/PhysicsSimulator.meta new file mode 100644 index 000000000..24e046d05 --- /dev/null +++ b/Assets/Mirror/Examples/_Common/PhysicsSimulator.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 884ea91b35a345443a0320cea07aad68 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PhysicsSimulator.cs b/Assets/Mirror/Examples/_Common/PhysicsSimulator/PhysicsSimulator.cs similarity index 95% rename from Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PhysicsSimulator.cs rename to Assets/Mirror/Examples/_Common/PhysicsSimulator/PhysicsSimulator.cs index 86008a77e..f19da78bc 100644 --- a/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PhysicsSimulator.cs +++ b/Assets/Mirror/Examples/_Common/PhysicsSimulator/PhysicsSimulator.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Mirror.Examples.MultipleAdditiveScenes +namespace Mirror.Examples.Common { public class PhysicsSimulator : MonoBehaviour { diff --git a/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PhysicsSimulator.cs.meta b/Assets/Mirror/Examples/_Common/PhysicsSimulator/PhysicsSimulator.cs.meta similarity index 100% rename from Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PhysicsSimulator.cs.meta rename to Assets/Mirror/Examples/_Common/PhysicsSimulator/PhysicsSimulator.cs.meta diff --git a/Assets/Mirror/Examples/_Common/PhysicsSimulator/PhysicsSimulator.prefab b/Assets/Mirror/Examples/_Common/PhysicsSimulator/PhysicsSimulator.prefab new file mode 100644 index 000000000..1b0d62da6 --- /dev/null +++ b/Assets/Mirror/Examples/_Common/PhysicsSimulator/PhysicsSimulator.prefab @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2581897434666803994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 440985591853936351} + - component: {fileID: 3973927562887465373} + m_Layer: 0 + m_Name: PhysicsSimulator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &440985591853936351 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2581897434666803994} + serializedVersion: 2 + 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: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3973927562887465373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2581897434666803994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 78e3051d2c03f27429276d8a55a6d15c, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Mirror/Examples/_Common/PhysicsSimulator/PhysicsSimulator.prefab.meta b/Assets/Mirror/Examples/_Common/PhysicsSimulator/PhysicsSimulator.prefab.meta new file mode 100644 index 000000000..910d59808 --- /dev/null +++ b/Assets/Mirror/Examples/_Common/PhysicsSimulator/PhysicsSimulator.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 99d75386017b4ba44ad1482ee7938f5a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: