diff --git a/Assets/Mirror/Examples/AdditiveLevels/Prefabs/Portal.prefab b/Assets/Mirror/Examples/AdditiveLevels/Prefabs/Portal.prefab index b14fc6620..2439e0433 100644 --- a/Assets/Mirror/Examples/AdditiveLevels/Prefabs/Portal.prefab +++ b/Assets/Mirror/Examples/AdditiveLevels/Prefabs/Portal.prefab @@ -130,7 +130,7 @@ MonoBehaviour: syncMode: 0 syncInterval: 0.1 destinationScene: - startPosition: {x: 0, y: 0, z: 0} + startPosition: {x: 0, y: 1.02, z: 0} label: {fileID: 8197110483235692531} labelText: --- !u!1 &5961932215084527574 diff --git a/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel1.unity b/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel1.unity index 4969b4cac..e2a6ffab3 100644 --- a/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel1.unity +++ b/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel1.unity @@ -197,7 +197,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 472411619} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6, y: 0, z: 0} + m_LocalPosition: {x: -6, y: 1.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1518259679} @@ -240,7 +240,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 493146027} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -9, y: 0, z: 0} + m_LocalPosition: {x: -9, y: 1.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1518259679} @@ -397,7 +397,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1224119056} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 1.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1518259679} @@ -670,7 +670,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1513281386} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3, y: 0, z: 0} + m_LocalPosition: {x: -3, y: 1.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1518259679} @@ -712,7 +712,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1518259678} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.1, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 493146028} @@ -872,23 +872,13 @@ PrefabInstance: - target: {fileID: 3141292696673982546, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: sceneId - value: 1143465467 - objectReference: {fileID: 0} - - target: {fileID: 3141292696673982546, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} - propertyPath: serverOnly - value: 0 + value: 182638750 objectReference: {fileID: 0} - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: startPosition.x value: -5 objectReference: {fileID: 0} - - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} - propertyPath: startPosition.y - value: 1.1 - objectReference: {fileID: 0} - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: startPosition.z diff --git a/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel2.unity b/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel2.unity index 524a2c662..f9e7a7542 100644 --- a/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel2.unity +++ b/Assets/Mirror/Examples/AdditiveLevels/Scenes/MirrorAdditiveLevelsSubLevel2.unity @@ -132,7 +132,7 @@ PrefabInstance: - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1098173225717622921, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} @@ -199,21 +199,11 @@ PrefabInstance: propertyPath: serverOnly value: 0 objectReference: {fileID: 0} - - 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} propertyPath: startPosition.x value: 5 objectReference: {fileID: 0} - - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, - type: 3} - propertyPath: startPosition.y - value: 1.1 - objectReference: {fileID: 0} - target: {fileID: 5948271423698091598, guid: c624c75494b4d7d4086b9212f897e56a, type: 3} propertyPath: startPosition.z diff --git a/Assets/Mirror/Examples/AdditiveScenes/Scenes/MirrorAdditiveScenesMain.unity b/Assets/Mirror/Examples/AdditiveScenes/Scenes/MirrorAdditiveScenesMain.unity index 605075633..6c6731705 100644 --- a/Assets/Mirror/Examples/AdditiveScenes/Scenes/MirrorAdditiveScenesMain.unity +++ b/Assets/Mirror/Examples/AdditiveScenes/Scenes/MirrorAdditiveScenesMain.unity @@ -406,7 +406,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 178547537} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 1.08, z: 20} + m_LocalPosition: {x: 0, y: 1.02, z: 20} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1172568542} @@ -696,7 +696,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 652875644} m_LocalRotation: {x: 0, y: 0.7071068, z: -0, w: -0.7071068} - m_LocalPosition: {x: 20, y: 1.08, z: 0} + m_LocalPosition: {x: 20, y: 1.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1172568542} @@ -739,7 +739,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 691846569} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.08, z: -20} + m_LocalPosition: {x: 0, y: 1.02, z: -20} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1172568542} @@ -1842,8 +1842,6 @@ MonoBehaviour: headlessStartMode: 1 editorAutoStart: 0 sendRate: 30 - autoStartServerBuild: 0 - autoConnectClientBuild: 0 offlineScene: onlineScene: offlineSceneLoadDelay: 0 @@ -2065,7 +2063,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1816951099} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -20, y: 1.08, z: 0} + m_LocalPosition: {x: -20, y: 1.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1172568542} diff --git a/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/MirrorMultipleAdditiveScenesMain.unity b/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/MirrorMultipleAdditiveScenesMain.unity index 2a2b70490..0fadfba5e 100644 --- a/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/MirrorMultipleAdditiveScenesMain.unity +++ b/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/MirrorMultipleAdditiveScenesMain.unity @@ -259,8 +259,6 @@ MonoBehaviour: headlessStartMode: 1 editorAutoStart: 0 sendRate: 60 - autoStartServerBuild: 0 - autoConnectClientBuild: 0 offlineScene: onlineScene: offlineSceneLoadDelay: 0 @@ -363,7 +361,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 204334129} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -15} + m_LocalPosition: {x: 0, y: 1.02, z: -15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -406,7 +404,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 263230754} m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} - m_LocalPosition: {x: -15, y: 0, z: -15} + m_LocalPosition: {x: -15, y: 1.02, z: -15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -449,7 +447,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 290557149} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -15, y: 0, z: 0} + m_LocalPosition: {x: -15, y: 1.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -584,7 +582,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 733367779} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 15} + m_LocalPosition: {x: 0, y: 1.02, z: 15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -627,7 +625,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 990635329} m_LocalRotation: {x: 0, y: 0.92387956, z: 0, w: 0.38268343} - m_LocalPosition: {x: -15, y: 0, z: 15} + m_LocalPosition: {x: -15, y: 1.02, z: 15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -735,7 +733,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1445635739} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 2, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 733367780} @@ -774,7 +772,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1760045336} m_LocalRotation: {x: 0, y: 0.3826836, z: -0, w: -0.92387944} - m_LocalPosition: {x: 15, y: 0, z: -15} + m_LocalPosition: {x: 15, y: 1.02, z: -15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -817,7 +815,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1975674812} m_LocalRotation: {x: 0, y: 0.7071068, z: -0, w: -0.7071068} - m_LocalPosition: {x: 15, y: 0, z: 0} + m_LocalPosition: {x: 15, y: 1.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -860,7 +858,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2127619491} m_LocalRotation: {x: 0, y: 0.9238796, z: -0, w: -0.38268325} - m_LocalPosition: {x: 15, y: 0, z: 15} + m_LocalPosition: {x: 15, y: 1.02, z: 15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} diff --git a/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame.unity b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame.unity index 070f14b3e..78d6dd6c2 100644 --- a/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame.unity +++ b/Assets/Mirror/Examples/Room/Scenes/MirrorRoomGame.unity @@ -239,7 +239,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 204334129} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -15} + m_LocalPosition: {x: 0, y: 1.02, z: -15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -282,7 +282,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 263230754} m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} - m_LocalPosition: {x: -15, y: 0, z: -15} + m_LocalPosition: {x: -15, y: 1.02, z: -15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -391,7 +391,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 290557149} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -15, y: 0, z: 0} + m_LocalPosition: {x: -15, y: 1.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -434,7 +434,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 733367779} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 15} + m_LocalPosition: {x: 0, y: 1.02, z: 15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -477,7 +477,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 990635329} m_LocalRotation: {x: 0, y: 0.92387956, z: 0, w: 0.38268343} - m_LocalPosition: {x: -15, y: 0, z: 15} + m_LocalPosition: {x: -15, y: 1.02, z: 15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -743,7 +743,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1445635739} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.08, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 733367780} @@ -782,7 +782,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1760045336} m_LocalRotation: {x: 0, y: 0.3826836, z: -0, w: -0.92387944} - m_LocalPosition: {x: 15, y: 0, z: -15} + m_LocalPosition: {x: 15, y: 1.02, z: -15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -825,7 +825,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1975674812} m_LocalRotation: {x: 0, y: 0.7071068, z: -0, w: -0.7071068} - m_LocalPosition: {x: 15, y: 0, z: 0} + m_LocalPosition: {x: 15, y: 1.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} @@ -868,7 +868,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2127619491} m_LocalRotation: {x: 0, y: 0.9238796, z: -0, w: -0.38268325} - m_LocalPosition: {x: 15, y: 0, z: 15} + m_LocalPosition: {x: 15, y: 1.02, z: 15} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1445635740} diff --git a/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto.unity b/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto.unity index d32ef0bae..de050b13b 100644 --- a/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto.unity +++ b/Assets/Mirror/Examples/TankTheftAuto/MirrorTankTheftAuto.unity @@ -147,7 +147,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 12226146} m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} - m_LocalPosition: {x: -14, y: 2, z: -14} + m_LocalPosition: {x: -14, y: 1.02, z: -14} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4239341309712137294} @@ -282,7 +282,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 386825728} m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} - m_LocalPosition: {x: 14, y: 2, z: -14} + m_LocalPosition: {x: 14, y: 1.02, z: -14} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4239341309712137294} @@ -390,7 +390,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 781619875} m_LocalRotation: {x: 0, y: 0.92387956, z: 0, w: 0.38268343} - m_LocalPosition: {x: -14, y: 2, z: 14} + m_LocalPosition: {x: -14, y: 1.02, z: 14} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4239341309712137294} @@ -583,7 +583,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1695890598} m_LocalRotation: {x: 0, y: -0.92387956, z: 0, w: 0.38268343} - m_LocalPosition: {x: 14, y: 2, z: 14} + m_LocalPosition: {x: 14, y: 1.02, z: 14} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4239341309712137294} diff --git a/Assets/Mirror/Examples/Tanks/Scenes/MirrorTanks.unity b/Assets/Mirror/Examples/Tanks/Scenes/MirrorTanks.unity index 138cdcf72..ccab030e2 100644 --- a/Assets/Mirror/Examples/Tanks/Scenes/MirrorTanks.unity +++ b/Assets/Mirror/Examples/Tanks/Scenes/MirrorTanks.unity @@ -238,7 +238,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 251893064} m_LocalRotation: {x: 0, y: -0.92387956, z: 0, w: 0.38268343} - m_LocalPosition: {x: 14, y: 0, z: 14} + m_LocalPosition: {x: 14, y: 0.4, z: 14} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -281,7 +281,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 535739935} m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} - m_LocalPosition: {x: 14, y: 0, z: -14} + m_LocalPosition: {x: 14, y: 0.4, z: -14} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -558,7 +558,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1458789072} m_LocalRotation: {x: 0, y: 0.92387956, z: 0, w: 0.38268343} - m_LocalPosition: {x: -14, y: 0, z: 14} + m_LocalPosition: {x: -14, y: 0.4, z: 14} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -601,7 +601,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1501912662} m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} - m_LocalPosition: {x: -14, y: 0, z: -14} + m_LocalPosition: {x: -14, y: 0.4, z: -14} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0}