diff --git a/Assets/Desert/Assets/Materials/Desert Floor.mat b/Assets/Desert/Assets/Materials/Desert Floor.mat index e0bb3b7..a25fd21 100644 --- a/Assets/Desert/Assets/Materials/Desert Floor.mat +++ b/Assets/Desert/Assets/Materials/Desert Floor.mat @@ -86,6 +86,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 diff --git a/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab b/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab index fd34be6..8593fb2 100644 --- a/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab +++ b/Assets/Desert/Assets/Modules/Portal/Desert Portal Exit.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &506243319273626502 +--- !u!1 &692885643716694355 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,158 +8,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8079730491061412845} - - component: {fileID: 884126343611003350} - - component: {fileID: 974784683793812549} - m_Layer: 7 - m_Name: Collider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8079730491061412845 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 506243319273626502} - 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: 534778217790596785} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &884126343611003350 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 506243319273626502} - 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: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 1373837989805601541, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} ---- !u!114 &974784683793812549 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 506243319273626502} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bcd51a92199746578f25ab67160cc13d, type: 3} - m_Name: - m_EditorClassIdentifier: - portal: {fileID: 3171802695548060926} ---- !u!1 &698537097821251252 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7833101140158502987} - - component: {fileID: 2716330164156348363} - - component: {fileID: 3566871879873967933} - m_Layer: 0 - m_Name: Surface - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7833101140158502987 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 698537097821251252} - 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: 534778217790596785} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2716330164156348363 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 698537097821251252} - m_Mesh: {fileID: -6535995738390492784, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} ---- !u!23 &3566871879873967933 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 698537097821251252} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a288552730b15c74699e69df4ca2e532, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &873761378697362443 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 534778217790596785} + - component: {fileID: 7147726913666778841} m_Layer: 0 m_Name: Portal m_TagString: Untagged @@ -167,27 +16,27 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &534778217790596785 +--- !u!4 &7147726913666778841 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 873761378697362443} + m_GameObject: {fileID: 692885643716694355} m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8079730491061412845} - - {fileID: 5583485013713733061} - - {fileID: 7833101140158502987} - - {fileID: 5827649297122452190} - - {fileID: 2075043192862140148} - m_Father: {fileID: 6713443008366400661} + - {fileID: 4829050170106150531} + - {fileID: 8984482798508789121} + - {fileID: 4724628749822797811} + - {fileID: 2904023758929266508} + - {fileID: 8080754438967713432} + m_Father: {fileID: 5709573715699328820} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!1 &1604096967460232748 +--- !u!1 &2956742473242309810 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -195,146 +44,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5583485013713733061} - - component: {fileID: 1184410134851835457} - - component: {fileID: 3208325555222820191} - - component: {fileID: 8986701432981899850} - m_Layer: 0 - m_Name: Frame - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5583485013713733061 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1604096967460232748} - 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: 534778217790596785} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1184410134851835457 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1604096967460232748} - m_Mesh: {fileID: -8872235206753815164, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} ---- !u!23 &3208325555222820191 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1604096967460232748} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: f8e1f11710a5e6d439d170b75393d0f2, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &8986701432981899850 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1604096967460232748} - 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: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -3143222921109102288, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} ---- !u!1 &2892577287002708294 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2075043192862140148} - m_Layer: 0 - m_Name: Portal Edge - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2075043192862140148 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2892577287002708294} - m_LocalRotation: {x: 0.00000026341777, y: -0.7071068, z: -0.7071068, w: 0.00000026341777} - m_LocalPosition: {x: -0.5, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 534778217790596785} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180} ---- !u!1 &5635962022185625128 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2246995198243242195} - - component: {fileID: 381431206272786088} - - component: {fileID: 3171802695548060926} + - component: {fileID: 9212560043793041154} + - component: {fileID: 3344629353743447288} + - component: {fileID: 1047274803835009197} m_Layer: 7 m_Name: Desert Portal Exit m_TagString: Untagged @@ -342,43 +54,43 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2246995198243242195 +--- !u!4 &9212560043793041154 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5635962022185625128} + m_GameObject: {fileID: 2956742473242309810} 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: 6713443008366400661} + - {fileID: 5709573715699328820} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &381431206272786088 +--- !u!114 &3344629353743447288 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5635962022185625128} + m_GameObject: {fileID: 2956742473242309810} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 17de1e2991b64847bceea06f966f0560, type: 3} m_Name: m_EditorClassIdentifier: color: {r: 8, g: 3.5137255, b: 0, a: 1} - emissionRenderer: {fileID: 3208325555222820191} ---- !u!114 &3171802695548060926 + emissionRenderer: {fileID: 4937930574110528582} +--- !u!114 &1047274803835009197 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5635962022185625128} + m_GameObject: {fileID: 2956742473242309810} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 20837d5efd544d3eb07657f581cb76d2, type: 3} @@ -387,9 +99,9 @@ MonoBehaviour: size: {x: 2, y: 1} linkedPortal: {fileID: 0} minNearClipPlane: 0.0001 - screen: {fileID: 4213373133551198729} - portalTransform: {fileID: 2075043192862140148} ---- !u!1 &7834511528252864296 + screen: {fileID: 844969720899552114} + portalTransform: {fileID: 8080754438967713432} +--- !u!1 &3701970131638747585 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -397,46 +109,46 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5827649297122452190} - - component: {fileID: 8369793365696928931} - - component: {fileID: 4213373133551198729} - m_Layer: 0 + - component: {fileID: 2904023758929266508} + - component: {fileID: 4343155170703372635} + - component: {fileID: 844969720899552114} + m_Layer: 7 m_Name: Screen m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!4 &5827649297122452190 +--- !u!4 &2904023758929266508 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7834511528252864296} + m_GameObject: {fileID: 3701970131638747585} 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: 534778217790596785} + m_Father: {fileID: 7147726913666778841} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8369793365696928931 +--- !u!33 &4343155170703372635 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7834511528252864296} + m_GameObject: {fileID: 3701970131638747585} m_Mesh: {fileID: -6535995738390492784, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} ---- !u!23 &4213373133551198729 +--- !u!23 &844969720899552114 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7834511528252864296} + m_GameObject: {fileID: 3701970131638747585} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -472,7 +184,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &8849014083961458004 +--- !u!1 &3801488564566342271 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -480,7 +192,264 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6713443008366400661} + - component: {fileID: 4724628749822797811} + - component: {fileID: 756120883950848336} + - component: {fileID: 5216870577976565197} + m_Layer: 9 + m_Name: Surface + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4724628749822797811 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3801488564566342271} + 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: 7147726913666778841} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &756120883950848336 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3801488564566342271} + m_Mesh: {fileID: -6535995738390492784, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} +--- !u!23 &5216870577976565197 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3801488564566342271} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a288552730b15c74699e69df4ca2e532, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3810401464886095034 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8984482798508789121} + - component: {fileID: 8835486934674523336} + - component: {fileID: 4937930574110528582} + - component: {fileID: 3379533221164645615} + m_Layer: 0 + m_Name: Frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8984482798508789121 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3810401464886095034} + 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: 7147726913666778841} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8835486934674523336 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3810401464886095034} + m_Mesh: {fileID: -8872235206753815164, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} +--- !u!23 &4937930574110528582 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3810401464886095034} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f8e1f11710a5e6d439d170b75393d0f2, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &3379533221164645615 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3810401464886095034} + 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: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -3143222921109102288, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} +--- !u!1 &5922104288360195844 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4829050170106150531} + - component: {fileID: 7314462896026850188} + - component: {fileID: 444799748029472969} + m_Layer: 7 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4829050170106150531 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5922104288360195844} + 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: 7147726913666778841} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &7314462896026850188 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5922104288360195844} + 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: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 1373837989805601541, guid: a888d535ef5e563418cb8711b9de7c16, type: 3} +--- !u!114 &444799748029472969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5922104288360195844} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bcd51a92199746578f25ab67160cc13d, type: 3} + m_Name: + m_EditorClassIdentifier: + portal: {fileID: 1047274803835009197} +--- !u!1 &8458413232787400471 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5709573715699328820} m_Layer: 0 m_Name: Origin m_TagString: Untagged @@ -488,19 +457,50 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6713443008366400661 +--- !u!4 &5709573715699328820 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8849014083961458004} + m_GameObject: {fileID: 8458413232787400471} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: 0, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 534778217790596785} - m_Father: {fileID: 2246995198243242195} + - {fileID: 7147726913666778841} + m_Father: {fileID: 9212560043793041154} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &9093302644436404973 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8080754438967713432} + m_Layer: 0 + m_Name: Portal Edge + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8080754438967713432 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9093302644436404973} + m_LocalRotation: {x: 0.00000026341777, y: -0.7071068, z: -0.7071068, w: 0.00000026341777} + m_LocalPosition: {x: -0.5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7147726913666778841} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180} diff --git a/Assets/Portal/Runtime/RenderPortalCameras.cs b/Assets/Portal/Runtime/RenderPortalCameras.cs index b54629f..1c76118 100644 --- a/Assets/Portal/Runtime/RenderPortalCameras.cs +++ b/Assets/Portal/Runtime/RenderPortalCameras.cs @@ -32,7 +32,7 @@ namespace EscapeRoomEngine.Portal.Runtime _layers = layers; _passType = passType; - renderPassEvent = passType == PassType.Opaque ? RenderPassEvent.AfterRenderingOpaques : RenderPassEvent.BeforeRenderingTransparents; + renderPassEvent = passType == PassType.Opaque ? RenderPassEvent.AfterRenderingOpaques : RenderPassEvent.AfterRenderingSkybox; _renderStateBlock = new RenderStateBlock(RenderStateMask.Nothing); // set stencil diff --git a/Assets/Scenes/StencilPortalScene.unity b/Assets/Scenes/StencilPortalScene.unity index c107eb0..fc11d25 100644 --- a/Assets/Scenes/StencilPortalScene.unity +++ b/Assets/Scenes/StencilPortalScene.unity @@ -150,7 +150,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 68436370} m_LocalRotation: {x: -0.59612375, y: 0.2328053, z: -0.27952477, w: 0.7157543} - m_LocalPosition: {x: 0.185, y: 0.466, z: 1.238} + m_LocalPosition: {x: 0.185, y: 0.466, z: 1.983} m_LocalScale: {x: 0.22218, y: 0.22218, z: 0.22218} m_ConstrainProportionsScale: 0 m_Children: [] @@ -400,7 +400,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 146660170} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.0000029504295} m_LocalPosition: {x: 0, y: 1000, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -408,12 +408,11 @@ Transform: - {fileID: 1693880135} - {fileID: 917470766} - {fileID: 2080419195} - - {fileID: 401507591} - - {fileID: 436562107} + - {fileID: 678233819060036795} - {fileID: 1018930799} m_Father: {fileID: 612192276} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} --- !u!1 &230809357 GameObject: m_ObjectHideFlags: 0 @@ -530,6 +529,24 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 259858787} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &301645432 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + m_PrefabInstance: {fileID: 406346569} + m_PrefabAsset: {fileID: 0} +--- !u!114 &301645433 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1047274803835009197, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + m_PrefabInstance: {fileID: 406346569} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 20837d5efd544d3eb07657f581cb76d2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &348369381 PrefabInstance: m_ObjectHideFlags: 0 @@ -566,27 +583,27 @@ PrefabInstance: - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_LocalPosition.z - value: -1.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.0000023841856 objectReference: {fileID: 0} - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} @@ -596,7 +613,7 @@ PrefabInstance: - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -180 objectReference: {fileID: 0} - target: {fileID: 6854256364732531326, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} @@ -613,35 +630,40 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6854256365667908692, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.203 + objectReference: {fileID: 0} - target: {fileID: 6854256365667908692, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_LocalPosition.y - value: 1.8 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6854256365667908692, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_LocalPosition.z - value: 0.79 + value: -0.4 objectReference: {fileID: 0} - target: {fileID: 6854256365667908692, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_LocalRotation.w - value: 0 + value: 0.9970738 objectReference: {fileID: 0} - target: {fileID: 6854256365667908692, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6854256365667908692, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_LocalRotation.y - value: -1 + value: -0.0764453 objectReference: {fileID: 0} - target: {fileID: 6854256365667908692, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6854256365667908692, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} @@ -651,119 +673,141 @@ PrefabInstance: - target: {fileID: 6854256365667908692, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -180 + value: -8.769 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} ---- !u!1 &401507590 -GameObject: +--- !u!1001 &406346569 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 401507591} - - component: {fileID: 401507594} - - component: {fileID: 401507593} - - component: {fileID: 401507592} - m_Layer: 0 - m_Name: Floor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!4 &401507591 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 401507590} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.5} - m_LocalScale: {x: 0.2, y: 1, z: 0.5} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 146660171} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &401507592 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 401507590} - 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: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &401507593 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 401507590} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &401507594 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 401507590} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 612192276} + m_Modifications: + - target: {fileID: 1047274803835009197, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: linkedPortal + value: + objectReference: {fileID: 1221768614} + - target: {fileID: 2246995198243242195, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalPosition.y + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalPosition.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.000004008412 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3171802695548060926, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: linkedPortal + value: + objectReference: {fileID: 1221768614} + - target: {fileID: 3701970131638747585, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5635962022185625128, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_Name + value: Desert Portal Exit + objectReference: {fileID: 0} + - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalPosition.y + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalPosition.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.0000029504295 + objectReference: {fileID: 0} + - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 07cea580d9888d24c84d8d62747839ad, type: 3} --- !u!1 &410087039 GameObject: m_ObjectHideFlags: 0 @@ -851,14 +895,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 410087039} - m_LocalRotation: {x: 0.20288053, y: -0.45803615, z: 0.09526207, w: 0.86021364} + m_LocalRotation: {x: -0.21630344, y: 0.30228284, z: -0.058720406, w: -0.9264933} m_LocalPosition: {x: 0, y: 3, 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: 25.869, y: -56.389, z: -1.399} + m_LocalEulerAnglesHint: {x: 25.869, y: -396.461, z: -1.399} --- !u!114 &410087042 MonoBehaviour: m_ObjectHideFlags: 0 @@ -882,111 +926,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 3 ---- !u!1 &436562106 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 436562107} - - component: {fileID: 436562110} - - component: {fileID: 436562109} - - component: {fileID: 436562108} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &436562107 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 436562106} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 2} - m_LocalScale: {x: 2, y: 0.05, z: 0.05} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 146660171} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &436562108 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 436562106} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &436562109 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 436562106} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &436562110 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 436562106} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &603545547 GameObject: m_ObjectHideFlags: 0 @@ -1094,123 +1033,17 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 612192275} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1541557705} - - {fileID: 1933565652} + - {fileID: 1221768615} + - {fileID: 301645432} - {fileID: 1453220877} - {fileID: 146660171} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &613329380 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 613329381} - - component: {fileID: 613329384} - - component: {fileID: 613329383} - - component: {fileID: 613329382} - m_Layer: 0 - m_Name: Floor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!4 &613329381 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613329380} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.5} - m_LocalScale: {x: 0.2, y: 1, z: 0.5} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1453220877} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &613329382 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613329380} - 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: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &613329383 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613329380} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &613329384 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613329380} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -1287,7 +1120,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 893649493} m_LocalRotation: {x: -0, y: -0, z: 0.080624446, w: 0.9967446} - m_LocalPosition: {x: 0.193, y: 0.475, z: 1.936} + m_LocalPosition: {x: 0.193, y: 0.475, z: 2.386} m_LocalScale: {x: 0.22218, y: 0.22218, z: 0.22218} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1314,7 +1147,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 7f259a434905b1b48a8984e5a62a84d2, type: 2} + - {fileID: 2100000, guid: 7f45dac0366d7f541a5a3b1b30fc9a31, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1455,12 +1288,108 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1792298466} + - {fileID: 2103197609} - {fileID: 68436371} - {fileID: 893649494} m_Father: {fileID: 146660171} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1221768613 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 612192276} + m_Modifications: + - target: {fileID: 2246995198243242195, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + propertyPath: m_LocalPosition.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 2246995198243242195, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3392592227672293041, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + propertyPath: linkedPortal + value: + objectReference: {fileID: 301645433} + - target: {fileID: 5635962022185625128, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + propertyPath: m_Name + value: Desert Portal Entrance + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0f721fa68edd220438bc7bbbe6ede885, type: 3} +--- !u!114 &1221768614 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3392592227672293041, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + m_PrefabInstance: {fileID: 1221768613} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 20837d5efd544d3eb07657f581cb76d2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1221768615 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2246995198243242195, guid: 0f721fa68edd220438bc7bbbe6ede885, + type: 3} + m_PrefabInstance: {fileID: 1221768613} + m_PrefabAsset: {fileID: 0} --- !u!1 &1338880437 GameObject: m_ObjectHideFlags: 0 @@ -1487,7 +1416,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1338880437} m_LocalRotation: {x: -0.5140753, y: 0.08534964, z: 0.15125602, w: 0.83997846} - m_LocalPosition: {x: 0.203, y: 0.692, z: -0.997} + m_LocalPosition: {x: 0.203, y: 0.692, z: -1.2969999} m_LocalScale: {x: 0.22218, y: 0.22218, z: 0.22218} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1570,7 +1499,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1451317368} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.193, y: 0.475, z: -1.499} + m_LocalPosition: {x: 0.193, y: 0.475, z: -1.823} m_LocalScale: {x: 0.22218, y: 0.22218, z: 0.22218} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1651,133 +1580,18 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1453220876} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 603545548} - {fileID: 1681740148} - {fileID: 259858788} - - {fileID: 613329381} + - {fileID: 7249302941990131652} - {fileID: 230809358} m_Father: {fileID: 612192276} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1541557704 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 612192276} - m_Modifications: - - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} - propertyPath: linkedPortal - value: - objectReference: {fileID: 1933565653} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_RootOrder - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.0000029504295 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalRotation.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2443429395130904898, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2713893991261817724, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5366957160841664999, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5635962022185625128, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_Name - value: Portal In - objectReference: {fileID: 0} - - target: {fileID: 7965773041589933745, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 94d63268ac1ac034d8c0af72dd04a346, type: 2} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} ---- !u!4 &1541557705 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - m_PrefabInstance: {fileID: 1541557704} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1541557706 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - m_PrefabInstance: {fileID: 1541557704} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ae59cddbf8fa37549bb38b1039feeb34, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1568048333 GameObject: m_ObjectHideFlags: 0 @@ -2021,194 +1835,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1693880134} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1792298465 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1792298466} - - component: {fileID: 1792298468} - - component: {fileID: 1792298467} - m_Layer: 0 - m_Name: Capsule - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!4 &1792298466 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1792298465} - m_LocalRotation: {x: -0.15125628, y: -0.8399784, z: -0.51407516, w: 0.08535009} - m_LocalPosition: {x: -0.203, y: 0.6920166, z: 0.9970002} - m_LocalScale: {x: 0.22218, y: 0.22218005, z: 0.22218002} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1018930799} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: -62.803, y: -1.521, z: 21.344} ---- !u!23 &1792298467 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1792298465} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 93b04c4f28fa9dc4e9014c610a57f954, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1792298468 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1792298465} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &1933565651 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 612192276} - m_Modifications: - - target: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} - propertyPath: linkedPortal - value: - objectReference: {fileID: 1541557706} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_RootOrder - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalPosition.y - value: 1000 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalPosition.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.00000044703478 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalRotation.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -180 - objectReference: {fileID: 0} - - target: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2713893991261817724, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5635962022185625128, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_Name - value: Portal Out - objectReference: {fileID: 0} - - target: {fileID: 7965773041589933745, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 46455800cc2ce524c92336599f5ec772, type: 2} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c50e7df1078c96f46bc6825f7e422fb7, type: 3} ---- !u!4 &1933565652 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2246995198243242195, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - m_PrefabInstance: {fileID: 1933565651} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1933565653 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1249363658, guid: c50e7df1078c96f46bc6825f7e422fb7, - type: 3} - m_PrefabInstance: {fileID: 1933565651} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ae59cddbf8fa37549bb38b1039feeb34, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &2080419194 GameObject: m_ObjectHideFlags: 0 @@ -2235,7 +1861,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2080419194} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.114, y: 0.642, z: 2.3390002} + m_LocalPosition: {x: 0.114, y: 0.642, z: 2.735} m_LocalScale: {x: 0.13379, y: 0.13379, z: 0.13379} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2292,3 +1918,252 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2080419194} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2103197608 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2103197609} + - component: {fileID: 2103197611} + - component: {fileID: 2103197610} + m_Layer: 0 + m_Name: Capsule (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &2103197609 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103197608} + m_LocalRotation: {x: 0.1512545, y: 0.8399787, z: 0.5140757, w: -0.08534716} + m_LocalPosition: {x: -0.20300883, y: 0.692, z: 1.4969988} + m_LocalScale: {x: 0.22217996, y: 0.22218001, z: 0.22217998} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1018930799} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: -62.803, y: -1.521, z: 21.344} +--- !u!23 &2103197610 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103197608} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 93b04c4f28fa9dc4e9014c610a57f954, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2103197611 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103197608} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &153758713462308353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 678233819060036795} + - component: {fileID: 4523383715173624606} + - component: {fileID: 1811219783801446356} + m_Layer: 0 + m_Name: Desert Floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &678233819060036795 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153758713462308353} + m_LocalRotation: {x: -0.000002075732, y: 0.7071068, z: 0.7071068, w: 0.000002075732} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.09999998, y: 0.10000002, z: 0.10000002} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 146660171} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!23 &1811219783801446356 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153758713462308353} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: e754492879cc0db4fa31c48e5d57ea8c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &4523383715173624606 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153758713462308353} + m_Mesh: {fileID: -462981019419857548, guid: 3a11a6b6fc0ad1a429fa098c08e2c361, type: 3} +--- !u!33 &5995813975962097761 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8057329177851088254} + m_Mesh: {fileID: -462981019419857548, guid: 3a11a6b6fc0ad1a429fa098c08e2c361, type: 3} +--- !u!4 &7249302941990131652 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8057329177851088254} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1453220877} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!1 &8057329177851088254 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7249302941990131652} + - component: {fileID: 5995813975962097761} + - component: {fileID: 8417683187699543211} + m_Layer: 0 + m_Name: Desert Floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!23 &8417683187699543211 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8057329177851088254} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: e754492879cc0db4fa31c48e5d57ea8c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Test Assets/Materials/Holo Test A.mat b/Assets/Test Assets/Materials/Holo Test A.mat index 11e2807..52f54e9 100644 --- a/Assets/Test Assets/Materials/Holo Test A.mat +++ b/Assets/Test Assets/Materials/Holo Test A.mat @@ -121,7 +121,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 8, g: 3.5137255, b: 0, a: 1} + - _Color: {r: 7.999999, g: 0, b: 0.07995986, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _FresnelColor: {r: 8, g: 3.5137255, b: 0, a: 1} - _Fresnel_Color: {r: 8, g: 3.5137255, b: 0, a: 1} diff --git a/Assets/Test Assets/Materials/Holo Test B.mat b/Assets/Test Assets/Materials/Holo Test B.mat index 4246ff6..04b4c04 100644 --- a/Assets/Test Assets/Materials/Holo Test B.mat +++ b/Assets/Test Assets/Materials/Holo Test B.mat @@ -121,9 +121,9 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 7.999999, g: 0, b: 2.22282, a: 1} + - _Color: {r: 0.09875487, g: 7.999999, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _FresnelColor: {r: 7.999999, g: 0, b: 1.8809087, a: 1} + - _FresnelColor: {r: 0, g: 0.5245628, b: 7.999999, a: 1} - _Fresnel_Color: {r: 8, g: 3.5137255, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 095f288..8a35e9a 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,12 +5,15 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/Scenes/EscapeRoomEngine.unity guid: 99c9720ab356a0642a771bea13969a05 - enabled: 0 path: Assets/Scenes/ImpossibleSpaces.unity guid: 682c1d7d6103f0b44ba4e2e1bfd2114d + - enabled: 1 + path: Assets/Scenes/StencilPortalScene.unity + guid: 56077ec5fbc90b04985e5cfae1891968 m_configObjects: com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 5038e8a8e7bee0a44a0c2892bcbf360e, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 26a325f..c34e986 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 25 + serializedVersion: 26 productGUID: b368a972d2b31304b8a0cc9ae2876edc AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -246,6 +246,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 @@ -623,7 +624,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -665,6 +665,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64