From 643e03192a8f7ce806bb6e62e9557edfed91556b Mon Sep 17 00:00:00 2001 From: milan Date: Mon, 19 Dec 2022 15:13:40 +0100 Subject: [PATCH] prepare for stencil portals --- Assets/Engine/Runtime/Editor/EngineEditor.cs | 14 +- Assets/Portal/Assets/Prefabs/Portal.prefab | 29 +- Assets/Scenes/PortalScene.unity | 1256 ++++++++++++----- Assets/URP/URP-Balanced-Renderer.asset | 76 - Assets/URP/URP-Balanced-Renderer.asset.meta | 8 - Assets/URP/URP-Balanced.asset | 83 -- Assets/URP/URP-Balanced.asset.meta | 8 - Assets/URP/URP-Performant-Renderer.asset | 52 - Assets/URP/URP-Performant-Renderer.asset.meta | 8 - Assets/URP/URP-Performant.asset | 83 -- Assets/URP/URP-Performant.asset.meta | 8 - ProjectSettings/QualitySettings.asset | 123 +- 12 files changed, 955 insertions(+), 793 deletions(-) delete mode 100644 Assets/URP/URP-Balanced-Renderer.asset delete mode 100644 Assets/URP/URP-Balanced-Renderer.asset.meta delete mode 100644 Assets/URP/URP-Balanced.asset delete mode 100644 Assets/URP/URP-Balanced.asset.meta delete mode 100644 Assets/URP/URP-Performant-Renderer.asset delete mode 100644 Assets/URP/URP-Performant-Renderer.asset.meta delete mode 100644 Assets/URP/URP-Performant.asset delete mode 100644 Assets/URP/URP-Performant.asset.meta diff --git a/Assets/Engine/Runtime/Editor/EngineEditor.cs b/Assets/Engine/Runtime/Editor/EngineEditor.cs index 17db950..3db326e 100644 --- a/Assets/Engine/Runtime/Editor/EngineEditor.cs +++ b/Assets/Engine/Runtime/Editor/EngineEditor.cs @@ -41,7 +41,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor private void PassToNextRoom() { - if (EditorApplication.isPlaying) + if (Engine.Instance && EditorApplication.isPlaying) { Engine.Instance.CurrentRoom.Match(some: room => room.EnterRoom()); UpdateUI(); @@ -50,7 +50,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor private void SkipCurrentRoom() { - if (EditorApplication.isPlaying) + if (Engine.Instance && EditorApplication.isPlaying) { Engine.Instance.CurrentRoom.Match(some: room => room.SkipRoom()); UpdateUI(); @@ -59,7 +59,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor private void SkipAndPass() { - if (EditorApplication.isPlaying) + if (Engine.Instance && EditorApplication.isPlaying) { Engine.Instance.CurrentRoom.Match(some: room => room.SkipRoom()); Engine.Instance.CurrentRoom.Match(some: room => room.EnterRoom()); @@ -69,7 +69,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor private void UpdateUI() { - if (EditorApplication.isPlaying) + if (Engine.Instance && EditorApplication.isPlaying) { if (!_registeredUpdateEvent) { @@ -82,9 +82,9 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor _registeredUpdateEvent = false; } - _passToNextRoomButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance.NumberOfRooms > 1); - _skipCurrentRoomButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance.NumberOfRooms > 0); - _skipAndPassButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance.NumberOfRooms > 0); + _passToNextRoomButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance && Engine.Instance.NumberOfRooms > 1); + _skipCurrentRoomButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance && Engine.Instance.NumberOfRooms > 0); + _skipAndPassButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance && Engine.Instance.NumberOfRooms > 0); } } #endif diff --git a/Assets/Portal/Assets/Prefabs/Portal.prefab b/Assets/Portal/Assets/Prefabs/Portal.prefab index b54245f..69b3ba5 100644 --- a/Assets/Portal/Assets/Prefabs/Portal.prefab +++ b/Assets/Portal/Assets/Prefabs/Portal.prefab @@ -117,7 +117,7 @@ Transform: - {fileID: 9135323956734471646} - {fileID: 2398425302420252226} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1249363658 MonoBehaviour: @@ -143,9 +143,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5635962022185625128} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 3, z: 0.3} m_Center: {x: 0, y: 1.5, z: -0.15} --- !u!1 &7398326895463990628 @@ -189,16 +197,24 @@ Camera: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7398326895463990628} - m_Enabled: 0 + m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -255,6 +271,9 @@ MonoBehaviour: m_Dithering: 0 m_ClearDepth: 1 m_AllowXRRendering: 0 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 @@ -265,7 +284,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7398326895463990628} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ad60e3973ab83f3468637a06970d7f1f, type: 3} m_Name: diff --git a/Assets/Scenes/PortalScene.unity b/Assets/Scenes/PortalScene.unity index 78a74d8..e38326c 100644 --- a/Assets/Scenes/PortalScene.unity +++ b/Assets/Scenes/PortalScene.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 1 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_SkyboxMaterial: {fileID: 2100000, guid: b543b13595b5be247a0ef19ffdc5344b, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0.13511999, g: 0.18402225, b: 0.29053703, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -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: @@ -197,9 +197,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 19506325} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &19506328 @@ -294,9 +302,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 24840298} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &24840301 @@ -405,6 +421,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -465,6 +482,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -508,10 +529,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 26967491} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -525,9 +557,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 26967491} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &26967496 @@ -594,6 +634,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &32502420 @@ -652,6 +693,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -712,6 +754,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -755,10 +801,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 32502420} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -772,9 +829,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 32502420} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &32502425 @@ -841,6 +906,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &52010740 @@ -871,14 +937,13 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1169383893} - {fileID: 7295752538729181700} - {fileID: 596805195} - {fileID: 2061968364} - {fileID: 1363513912} - {fileID: 24840299} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &97555788 GameObject: @@ -936,6 +1001,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -996,6 +1062,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -1039,10 +1109,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 97555788} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -1056,9 +1137,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 97555788} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &97555793 @@ -1125,6 +1214,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &145371954 @@ -1183,6 +1273,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -1243,6 +1334,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -1286,10 +1381,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 145371954} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -1303,9 +1409,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 145371954} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &145371959 @@ -1372,6 +1486,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &148891875 @@ -1471,6 +1586,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -1531,6 +1647,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -1574,10 +1694,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 161783873} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -1591,9 +1722,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 161783873} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &161783878 @@ -1660,6 +1799,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &194084196 @@ -1694,37 +1834,6 @@ Transform: m_Father: {fileID: 2090091855} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: -240, z: 45} ---- !u!1 &195513901 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 195513902} - m_Layer: 0 - m_Name: Left Eye - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &195513902 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 195513901} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.035, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1199088360} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &198120012 GameObject: m_ObjectHideFlags: 0 @@ -1865,9 +1974,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 239445758} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &239445761 @@ -1962,9 +2079,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 261257756} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &261257759 @@ -2049,7 +2174,7 @@ Transform: - {fileID: 1497564844} - {fileID: 1424415512} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &392765145 GameObject: @@ -2176,7 +2301,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &410087042 MonoBehaviour: @@ -2190,14 +2315,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 + m_Version: 2 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 + m_RenderingLayers: 1 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 --- !u!1 &416847800 GameObject: m_ObjectHideFlags: 0 @@ -2254,6 +2382,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -2314,6 +2443,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -2357,10 +2490,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 416847800} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -2374,9 +2518,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 416847800} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &416847805 @@ -2443,6 +2595,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &430115637 @@ -2501,6 +2654,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -2561,6 +2715,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -2604,10 +2762,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 430115637} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -2621,9 +2790,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 430115637} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &430115642 @@ -2690,6 +2867,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &446284063 @@ -2766,9 +2944,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 469448746} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &469448749 @@ -2895,9 +3081,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 533988748} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &533988751 @@ -2955,6 +3149,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 52010741} m_Modifications: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} @@ -2964,7 +3159,7 @@ PrefabInstance: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: camera value: - objectReference: {fileID: 1199088357} + objectReference: {fileID: 0} - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: linkedPortal value: @@ -2972,7 +3167,7 @@ PrefabInstance: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: playerCamera value: - objectReference: {fileID: 1199088357} + objectReference: {fileID: 0} - target: {fileID: 1889810494552553078, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: m_Materials.Array.data[0] @@ -3054,6 +3249,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: aee171c2a9e1c9d43b3f93b3cfc61500, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} --- !u!114 &596805194 stripped MonoBehaviour: @@ -3129,6 +3327,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -3189,6 +3388,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -3232,10 +3435,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 602343002} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -3249,9 +3463,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 602343002} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &602343007 @@ -3318,6 +3540,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &624687953 @@ -3394,9 +3617,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 649178244} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &649178247 @@ -3505,6 +3736,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -3565,6 +3797,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -3608,10 +3844,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 658745510} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -3625,9 +3872,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 658745510} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &658745515 @@ -3694,6 +3949,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &702415672 @@ -3752,6 +4008,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -3812,6 +4069,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -3855,10 +4116,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 702415672} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -3872,9 +4144,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 702415672} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &702415677 @@ -3941,6 +4221,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &742607676 @@ -4031,6 +4312,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -4091,6 +4373,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -4134,10 +4420,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 744571901} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -4151,9 +4448,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 744571901} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &744571906 @@ -4220,6 +4525,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &778138609 @@ -4278,6 +4584,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -4338,6 +4645,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -4381,10 +4692,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 778138609} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -4398,9 +4720,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 778138609} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &778138614 @@ -4467,39 +4797,9 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} ---- !u!1 &817509150 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 817509151} - m_Layer: 0 - m_Name: Right Eye - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &817509151 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 817509150} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.035, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1199088360} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -4547,7 +4847,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &873914415 GameObject: @@ -4591,9 +4891,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 873914415} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &873914418 @@ -4746,6 +5054,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -4806,6 +5115,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -4849,10 +5162,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1004214774} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -4866,9 +5190,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1004214774} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1004214779 @@ -4935,6 +5267,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &1023639977 @@ -4993,6 +5326,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -5053,6 +5387,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -5096,10 +5434,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1023639977} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -5113,9 +5462,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1023639977} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1023639982 @@ -5182,40 +5539,9 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} ---- !u!1 &1169383892 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1169383893} - m_Layer: 0 - m_Name: Test Camera Offset - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1169383893 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1169383892} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1199088360} - m_Father: {fileID: 52010741} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1186837739 GameObject: m_ObjectHideFlags: 0 @@ -5272,6 +5598,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -5332,6 +5659,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -5375,10 +5706,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1186837739} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -5392,9 +5734,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1186837739} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1186837744 @@ -5461,192 +5811,9 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} ---- !u!1 &1199088356 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1199088360} - - component: {fileID: 1199088357} - - component: {fileID: 1199088359} - - component: {fileID: 1199088358} - - component: {fileID: 1199088361} - - component: {fileID: 1199088362} - - component: {fileID: 1199088363} - - component: {fileID: 1199088364} - m_Layer: 6 - m_Name: Test Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!20 &1199088357 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199088356} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.01 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!114 &1199088358 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199088356} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 ---- !u!81 &1199088359 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199088356} - m_Enabled: 1 ---- !u!4 &1199088360 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199088356} - m_LocalRotation: {x: 0.0697579, y: -0, z: -0, w: 0.99756396} - m_LocalPosition: {x: 0, y: 1.193, z: -2.275} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 195513902} - - {fileID: 817509151} - m_Father: {fileID: 1169383893} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 8, y: 0, z: 0} ---- !u!114 &1199088361 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199088356} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b2ceb62217b416743baa8beee7109cfb, type: 3} - m_Name: - m_EditorClassIdentifier: - camera: {fileID: 1199088357} - leftEye: {fileID: 195513902} - rightEye: {fileID: 817509151} ---- !u!114 &1199088362 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199088356} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1bacec3b1d81cef43972d5dfc26a467b, type: 3} - m_Name: - m_EditorClassIdentifier: - traveller: {fileID: 1169383893} - hasClone: 0 - entrySide: 0 - clone: {fileID: 0} ---- !u!135 &1199088363 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199088356} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.05 - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &1199088364 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199088356} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!1 &1205088332 GameObject: m_ObjectHideFlags: 0 @@ -5689,9 +5856,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1205088332} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1205088335 @@ -5744,11 +5919,58 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1205088332} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1263611607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1263611609} + - component: {fileID: 1263611608} + m_Layer: 0 + m_Name: Logger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1263611608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263611607} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: debf8d65bda642bc938a94c7639e01a4, type: 3} + m_Name: + m_EditorClassIdentifier: + loggingEnabled: 0 + typeFilter: 0000000008000000 +--- !u!4 &1263611609 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263611607} + 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 &1281318074 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 289664351} m_Modifications: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} @@ -5766,7 +5988,7 @@ PrefabInstance: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: playerCamera value: - objectReference: {fileID: 1199088357} + objectReference: {fileID: 0} - target: {fileID: 1889810494552553078, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: m_Materials.Array.data[0] @@ -5848,6 +6070,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 041825dc2cc50844f9aa0075a3004bb1, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} --- !u!4 &1281318075 stripped Transform: @@ -5909,9 +6134,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1363513911} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1363513914 @@ -6020,6 +6253,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -6080,6 +6314,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -6123,10 +6361,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1392299501} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -6140,9 +6389,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1392299501} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1392299506 @@ -6209,6 +6466,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &1418800929 @@ -6253,9 +6511,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1418800929} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1418800932 @@ -6383,9 +6649,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1426330753} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1426330756 @@ -6544,9 +6818,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1448661973} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1448661976 @@ -6641,9 +6923,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1453630224} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1453630227 @@ -6752,6 +7042,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -6812,6 +7103,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -6855,10 +7150,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1476751928} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -6872,9 +7178,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1476751928} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1476751933 @@ -6941,6 +7255,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &1484624115 @@ -6977,7 +7292,7 @@ Transform: - {fileID: 1810053610} - {fileID: 231947856} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &1497564843 GameObject: @@ -7071,9 +7386,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1497564843} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 0.99999994} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1498523233 @@ -7118,9 +7441,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1498523233} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1498523236 @@ -7229,6 +7560,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -7289,6 +7621,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -7332,10 +7668,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1506186632} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -7349,9 +7696,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1506186632} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1506186637 @@ -7418,6 +7773,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1001 &1530025130 @@ -7425,6 +7781,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1484624116} m_Modifications: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} @@ -7442,7 +7799,7 @@ PrefabInstance: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: playerCamera value: - objectReference: {fileID: 1199088357} + objectReference: {fileID: 0} - target: {fileID: 1889810494552553078, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: m_Materials.Array.data[0] @@ -7524,6 +7881,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 77bc07f7cc54e29458b9bc01aabc5603, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} --- !u!4 &1530025131 stripped Transform: @@ -7631,6 +7991,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -7691,6 +8052,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -7734,10 +8099,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669445995} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -7751,9 +8127,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1669445995} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1669446000 @@ -7820,6 +8204,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &1719908310 @@ -7864,9 +8249,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1719908310} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1719908313 @@ -8011,9 +8404,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1810053609} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 0.99999994} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1866207601 @@ -8072,6 +8473,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -8132,6 +8534,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -8175,10 +8581,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1866207601} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -8192,9 +8609,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1866207601} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1866207606 @@ -8261,6 +8686,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &1882294794 @@ -8319,6 +8745,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -8379,6 +8806,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -8422,10 +8853,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1882294794} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -8439,9 +8881,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1882294794} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1882294799 @@ -8508,6 +8958,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1 &1891845681 @@ -8566,6 +9017,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -8626,6 +9078,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -8669,10 +9125,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1891845681} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -8736,9 +9203,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1891845681} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &1891845689 @@ -8755,6 +9230,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1001 &1892725130 @@ -8762,6 +9238,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1484624116} m_Modifications: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} @@ -8779,7 +9256,7 @@ PrefabInstance: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: playerCamera value: - objectReference: {fileID: 1199088357} + objectReference: {fileID: 0} - target: {fileID: 1889810494552553078, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: m_Materials.Array.data[0] @@ -8861,6 +9338,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 77bc07f7cc54e29458b9bc01aabc5603, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} --- !u!4 &1892725131 stripped Transform: @@ -9004,9 +9484,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2061968363} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 0.99999994} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2090091854 @@ -9108,6 +9596,7 @@ MonoBehaviour: m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -9168,6 +9657,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 m_AttachEaseInTime: 0.15 m_MovementType: 0 m_VelocityDamping: 1 @@ -9211,10 +9704,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2123804751} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -9228,9 +9732,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2123804751} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &2123804756 @@ -9297,6 +9809,7 @@ MonoBehaviour: m_EditorClassIdentifier: traveller: {fileID: 0} hasClone: 1 + player: 0 entrySide: 0 clone: {fileID: 0} --- !u!1001 &2144623425 @@ -9304,6 +9817,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1484624116} m_Modifications: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} @@ -9321,7 +9835,7 @@ PrefabInstance: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: playerCamera value: - objectReference: {fileID: 1199088357} + objectReference: {fileID: 0} - target: {fileID: 1889810494552553078, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: m_Materials.Array.data[0] @@ -9403,6 +9917,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 77bc07f7cc54e29458b9bc01aabc5603, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} --- !u!114 &2144623426 stripped MonoBehaviour: @@ -9427,6 +9944,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 419816427646908932, guid: c84e0198f66a41b4294f6e8e585192a4, @@ -9437,7 +9955,7 @@ PrefabInstance: - target: {fileID: 419816427646908934, guid: c84e0198f66a41b4294f6e8e585192a4, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 419816427646908934, guid: c84e0198f66a41b4294f6e8e585192a4, type: 3} @@ -9489,13 +10007,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3784117403828992829, guid: c84e0198f66a41b4294f6e8e585192a4, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c84e0198f66a41b4294f6e8e585192a4, type: 3} --- !u!1001 &7295752538729181699 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 52010741} m_Modifications: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} @@ -9505,7 +10032,7 @@ PrefabInstance: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: camera value: - objectReference: {fileID: 1199088357} + objectReference: {fileID: 0} - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: linkedPortal value: @@ -9513,7 +10040,7 @@ PrefabInstance: - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: playerCamera value: - objectReference: {fileID: 1199088357} + objectReference: {fileID: 0} - target: {fileID: 1889810494552553078, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} propertyPath: m_Materials.Array.data[0] @@ -9595,6 +10122,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: aee171c2a9e1c9d43b3f93b3cfc61500, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} --- !u!4 &7295752538729181700 stripped Transform: diff --git a/Assets/URP/URP-Balanced-Renderer.asset b/Assets/URP/URP-Balanced-Renderer.asset deleted file mode 100644 index 20bd4d4..0000000 --- a/Assets/URP/URP-Balanced-Renderer.asset +++ /dev/null @@ -1,76 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-1878332245247344467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3} - m_Name: SSAO - m_EditorClassIdentifier: - m_Active: 1 - m_Shader: {fileID: 0} - m_Settings: - Downsample: 1 - AfterOpaque: 0 - Source: 0 - NormalSamples: 0 - Intensity: 0.5 - DirectLightingStrength: 0.25 - Radius: 0.25 - SampleCount: 4 ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} - m_Name: URP-Balanced-Renderer - m_EditorClassIdentifier: - debugShaders: - debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, - type: 3} - m_RendererFeatures: - - {fileID: -1878332245247344467} - m_RendererFeatureMap: adc0de57c6d2eee5 - m_UseNativeRenderPass: 0 - postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} - shaders: - blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} - copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - screenSpaceShadowPS: {fileID: 0} - samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} - fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} - materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 0} - coreBlitColorAndDepthPS: {fileID: 0} - cameraMotionVector: {fileID: 0} - objectMotionVector: {fileID: 0} - m_OpaqueLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_TransparentLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_DefaultStencilState: - overrideStencilState: 0 - stencilReference: 0 - stencilCompareFunction: 8 - passOperation: 2 - failOperation: 0 - zFailOperation: 0 - m_ShadowTransparentReceive: 1 - m_RenderingMode: 0 - m_DepthPrimingMode: 0 - m_AccurateGbufferNormals: 0 - m_ClusteredRendering: 0 - m_TileSize: 32 diff --git a/Assets/URP/URP-Balanced-Renderer.asset.meta b/Assets/URP/URP-Balanced-Renderer.asset.meta deleted file mode 100644 index 8fa7f17..0000000 --- a/Assets/URP/URP-Balanced-Renderer.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e634585d5c4544dd297acaee93dc2beb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/URP/URP-Balanced.asset b/Assets/URP/URP-Balanced.asset deleted file mode 100644 index cf14a5c..0000000 --- a/Assets/URP/URP-Balanced.asset +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} - m_Name: URP-Balanced - m_EditorClassIdentifier: - k_AssetVersion: 11 - k_AssetPreviousVersion: 11 - m_RendererType: 1 - m_RendererData: {fileID: 0} - m_RendererDataList: - - {fileID: 11400000, guid: e634585d5c4544dd297acaee93dc2beb, type: 2} - m_DefaultRendererIndex: 0 - m_RequireDepthTexture: 0 - m_RequireOpaqueTexture: 0 - m_OpaqueDownsampling: 1 - m_SupportsTerrainHoles: 1 - m_SupportsHDR: 1 - m_HDRColorBufferPrecision: 0 - m_MSAA: 1 - m_RenderScale: 1 - m_UpscalingFilter: 0 - m_FsrOverrideSharpness: 0 - m_FsrSharpness: 0.92 - m_EnableLODCrossFade: 1 - m_LODCrossFadeDitheringType: 1 - m_MainLightRenderingMode: 1 - m_MainLightShadowsSupported: 1 - m_MainLightShadowmapResolution: 1024 - m_AdditionalLightsRenderingMode: 1 - m_AdditionalLightsPerObjectLimit: 2 - m_AdditionalLightShadowsSupported: 0 - m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 128 - m_AdditionalLightsShadowResolutionTierMedium: 256 - m_AdditionalLightsShadowResolutionTierHigh: 512 - m_ReflectionProbeBlending: 0 - m_ReflectionProbeBoxProjection: 0 - m_ShadowDistance: 50 - m_ShadowCascadeCount: 1 - m_Cascade2Split: 0.25 - m_Cascade3Split: {x: 0.1, y: 0.3} - m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} - m_CascadeBorder: 0.1 - m_ShadowDepthBias: 1 - m_ShadowNormalBias: 1 - m_AnyShadowsSupported: 1 - m_SoftShadowsSupported: 1 - m_ConservativeEnclosingSphere: 0 - m_NumIterationsEnclosingSphere: 64 - m_AdditionalLightsCookieResolution: 512 - m_AdditionalLightsCookieFormat: 1 - m_UseSRPBatcher: 1 - m_SupportsDynamicBatching: 0 - m_MixedLightingSupported: 1 - m_SupportsLightCookies: 1 - m_SupportsLightLayers: 0 - m_DebugLevel: 0 - m_StoreActionsOptimization: 0 - m_EnableRenderGraph: 0 - m_UseAdaptivePerformance: 1 - m_ColorGradingMode: 0 - m_ColorGradingLutSize: 32 - m_UseFastSRGBLinearConversion: 0 - m_ShadowType: 1 - m_LocalShadowsSupported: 0 - m_LocalShadowsAtlasResolution: 256 - m_MaxPixelLights: 0 - m_ShadowAtlasResolution: 256 - m_VolumeFrameworkUpdateMode: 0 - m_Textures: - blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} - bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} - m_ShaderVariantLogLevel: 0 - m_ShadowCascades: 0 diff --git a/Assets/URP/URP-Balanced.asset.meta b/Assets/URP/URP-Balanced.asset.meta deleted file mode 100644 index f524db0..0000000 --- a/Assets/URP/URP-Balanced.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e1260c1148f6143b28bae5ace5e9c5d1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/URP/URP-Performant-Renderer.asset b/Assets/URP/URP-Performant-Renderer.asset deleted file mode 100644 index 56c53f0..0000000 --- a/Assets/URP/URP-Performant-Renderer.asset +++ /dev/null @@ -1,52 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} - m_Name: URP-Performant-Renderer - m_EditorClassIdentifier: - debugShaders: - debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, - type: 3} - m_RendererFeatures: [] - m_RendererFeatureMap: - m_UseNativeRenderPass: 0 - postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} - shaders: - blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} - copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - screenSpaceShadowPS: {fileID: 0} - samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} - fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} - materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 0} - coreBlitColorAndDepthPS: {fileID: 0} - cameraMotionVector: {fileID: 0} - objectMotionVector: {fileID: 0} - m_OpaqueLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_TransparentLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_DefaultStencilState: - overrideStencilState: 0 - stencilReference: 0 - stencilCompareFunction: 8 - passOperation: 2 - failOperation: 0 - zFailOperation: 0 - m_ShadowTransparentReceive: 1 - m_RenderingMode: 0 - m_DepthPrimingMode: 0 - m_AccurateGbufferNormals: 0 - m_ClusteredRendering: 0 - m_TileSize: 32 diff --git a/Assets/URP/URP-Performant-Renderer.asset.meta b/Assets/URP/URP-Performant-Renderer.asset.meta deleted file mode 100644 index 912ff60..0000000 --- a/Assets/URP/URP-Performant-Renderer.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 707360a9c581a4bd7aa53bfeb1429f71 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/URP/URP-Performant.asset b/Assets/URP/URP-Performant.asset deleted file mode 100644 index 9b7d2e0..0000000 --- a/Assets/URP/URP-Performant.asset +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} - m_Name: URP-Performant - m_EditorClassIdentifier: - k_AssetVersion: 11 - k_AssetPreviousVersion: 11 - m_RendererType: 1 - m_RendererData: {fileID: 0} - m_RendererDataList: - - {fileID: 11400000, guid: 707360a9c581a4bd7aa53bfeb1429f71, type: 2} - m_DefaultRendererIndex: 0 - m_RequireDepthTexture: 0 - m_RequireOpaqueTexture: 0 - m_OpaqueDownsampling: 1 - m_SupportsTerrainHoles: 1 - m_SupportsHDR: 0 - m_HDRColorBufferPrecision: 0 - m_MSAA: 1 - m_RenderScale: 1 - m_UpscalingFilter: 0 - m_FsrOverrideSharpness: 0 - m_FsrSharpness: 0.92 - m_EnableLODCrossFade: 1 - m_LODCrossFadeDitheringType: 1 - m_MainLightRenderingMode: 1 - m_MainLightShadowsSupported: 0 - m_MainLightShadowmapResolution: 1024 - m_AdditionalLightsRenderingMode: 0 - m_AdditionalLightsPerObjectLimit: 4 - m_AdditionalLightShadowsSupported: 0 - m_AdditionalLightsShadowmapResolution: 512 - m_AdditionalLightsShadowResolutionTierLow: 128 - m_AdditionalLightsShadowResolutionTierMedium: 256 - m_AdditionalLightsShadowResolutionTierHigh: 512 - m_ReflectionProbeBlending: 0 - m_ReflectionProbeBoxProjection: 0 - m_ShadowDistance: 50 - m_ShadowCascadeCount: 1 - m_Cascade2Split: 0.25 - m_Cascade3Split: {x: 0.1, y: 0.3} - m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} - m_CascadeBorder: 0.1 - m_ShadowDepthBias: 1 - m_ShadowNormalBias: 1 - m_AnyShadowsSupported: 1 - m_SoftShadowsSupported: 0 - m_ConservativeEnclosingSphere: 0 - m_NumIterationsEnclosingSphere: 64 - m_AdditionalLightsCookieResolution: 2048 - m_AdditionalLightsCookieFormat: 3 - m_UseSRPBatcher: 1 - m_SupportsDynamicBatching: 0 - m_MixedLightingSupported: 1 - m_SupportsLightCookies: 1 - m_SupportsLightLayers: 0 - m_DebugLevel: 0 - m_StoreActionsOptimization: 0 - m_EnableRenderGraph: 0 - m_UseAdaptivePerformance: 1 - m_ColorGradingMode: 0 - m_ColorGradingLutSize: 16 - m_UseFastSRGBLinearConversion: 0 - m_ShadowType: 1 - m_LocalShadowsSupported: 0 - m_LocalShadowsAtlasResolution: 256 - m_MaxPixelLights: 0 - m_ShadowAtlasResolution: 256 - m_VolumeFrameworkUpdateMode: 0 - m_Textures: - blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} - bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} - m_ShaderVariantLogLevel: 0 - m_ShadowCascades: 0 diff --git a/Assets/URP/URP-Performant.asset.meta b/Assets/URP/URP-Performant.asset.meta deleted file mode 100644 index 264c9c5..0000000 --- a/Assets/URP/URP-Performant.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d0e2fc18fe036412f8223b3b3d9ad574 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 6238eb7..cd19172 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,83 +4,9 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 2 + m_CurrentQuality: 0 m_QualitySettings: - - serializedVersion: 2 - name: Performant - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 2 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.4 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 4 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: d0e2fc18fe036412f8223b3b3d9ad574, - type: 2} - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Balanced - pixelLightCount: 1 - shadows: 1 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - skinWeights: 4 - textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 1 - lodBias: 1 - maximumLODLevel: 0 - streamingMipmapsActive: 0 - streamingMipmapsAddAllCameras: 1 - streamingMipmapsMemoryBudget: 512 - streamingMipmapsRenderersPerFrame: 512 - streamingMipmapsMaxLevelReduction: 2 - streamingMipmapsMaxFileIORequests: 1024 - particleRaycastBudget: 64 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - asyncUploadPersistentBuffer: 1 - resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: e1260c1148f6143b28bae5ace5e9c5d1, - type: 2} - excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: High Fidelity pixelLightCount: 2 shadows: 2 @@ -93,16 +19,19 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 skinWeights: 255 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 antiAliasing: 4 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 1 lodBias: 2 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -116,21 +45,31 @@ QualitySettings: resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 11400000, guid: 7b7fd9122c28c4d15b667c7040e3b3fd, type: 2} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] + m_TextureMipmapLimitGroupNames: [] m_PerPlatformDefaultQuality: - Android: 1 - CloudRendering: 2 - Lumin: 2 - GameCoreScarlett: 2 - GameCoreXboxOne: 2 - Nintendo Switch: 2 - PS4: 2 - PS5: 2 + Android: 0 + CloudRendering: 0 + GameCoreScarlett: 0 + GameCoreXboxOne: 0 + Lumin: 0 + Nintendo Switch: 0 + PS4: 0 + PS5: 0 Server: 0 - Stadia: 2 - Standalone: 2 - WebGL: 1 - Windows Store Apps: 2 - XboxOne: 2 - iPhone: 1 - tvOS: 1 + Stadia: 0 + Standalone: 0 + WebGL: 0 + Windows Store Apps: 0 + XboxOne: 0 + iPhone: 0 + tvOS: 0