diff --git a/Assets/_Materials/Portals/PortalMat.mat b/Assets/_Materials/Portals/PortalMat.mat index 4f738d1..fd452e3 100644 --- a/Assets/_Materials/Portals/PortalMat.mat +++ b/Assets/_Materials/Portals/PortalMat.mat @@ -111,7 +111,7 @@ Material: - _DstBlend: 0 - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - - _FadeColorBlend: 0.004822666 + - _FadeColorBlend: 0.004828562 - _ForceEye: 0 - _GlossMapScale: 0 - _Glossiness: 0 diff --git a/Assets/_Scenes/TestSceneMeta Offline.unity b/Assets/_Scenes/TestSceneMeta Offline.unity index 31d73aa..b3ea4d2 100644 --- a/Assets/_Scenes/TestSceneMeta Offline.unity +++ b/Assets/_Scenes/TestSceneMeta Offline.unity @@ -942,6 +942,148 @@ SkinnedMeshRenderer: m_Center: {x: 0, y: 0, z: 0.0065302965} m_Extent: {x: 0.007695117, y: 0.0076951184, z: 0.01916013} m_DirtyAABB: 0 +--- !u!21 &73400054 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PortalMat (for Surface) + m_Shader: {fileID: -6465566751694194690, guid: a47a55574e258ae4f97fad14d64ff151, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Albedo: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TexLeft: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TexRight: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlbedoAlpha: 1 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _FadeColorBlend: 0.004822666 + - _ForceEye: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + - _flipY: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FadeColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _Tiling_And_Offset: {r: 1, g: 1, b: 0, a: 0} + - _WorldDir: {r: 0, g: 0, b: 0, a: 0} + - _WorldPos: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &79922869 GameObject: m_ObjectHideFlags: 0 @@ -1482,7 +1624,8 @@ GameObject: - component: {fileID: 132541273} - component: {fileID: 132541272} - component: {fileID: 132541271} - m_Layer: 5 + - component: {fileID: 132541275} + m_Layer: 3 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -1572,6 +1715,34 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 1.291} m_SizeDelta: {x: 1920, y: 970} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &132541275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 132541270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee10491ef6d5d1d49a270cf6b09bdc19, type: 3} + m_Name: + m_EditorClassIdentifier: + _enableMipmapping: 0 + _dynamicResolution: 1 + _redrawResolutionThreshold: 2147483647 + rectTransform: {fileID: 132541274} + maxTextureSize: 2048 + manualRedraw: 0 + renderInterval: 1 + renderIntervalFrameOffset: 0 + expensive: 0 + layer: 5 + opacity: 2 + shape: 0 + curveRadius: 1 + overlapMask: 0 + overlayType: 1 + _overlayEnabled: 1 --- !u!1 &146626124 GameObject: m_ObjectHideFlags: 0 @@ -1719,7 +1890,7 @@ PrefabInstance: type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 931022156} + objectReference: {fileID: 1180764756} - target: {fileID: 7698898345407554876, guid: 80f01f07be8048f4582821772419a545, type: 3} propertyPath: portalableObjects.Array.size @@ -2748,7 +2919,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 24, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 1, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -2861,7 +3032,7 @@ PrefabInstance: type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1804689573} + objectReference: {fileID: 73400054} - target: {fileID: 7698898345407554876, guid: 80f01f07be8048f4582821772419a545, type: 3} propertyPath: portalableObjects.Array.size @@ -3406,7 +3577,7 @@ PrefabInstance: type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 664835596} + objectReference: {fileID: 1049683634} - target: {fileID: 7698898345407554876, guid: 80f01f07be8048f4582821772419a545, type: 3} propertyPath: portalableObjects.Array.size @@ -3587,6 +3758,16 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3377982977004440378, guid: 3142c30d660087344b257296a1412929, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3891164988522972496, guid: 3142c30d660087344b257296a1412929, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3929587631668608861, guid: 3142c30d660087344b257296a1412929, type: 3} propertyPath: m_Enabled @@ -3612,6 +3793,11 @@ PrefabInstance: propertyPath: InScenePlacedSourceGlobalObjectIdHash value: 3825524928 objectReference: {fileID: 0} + - target: {fileID: 5404716255858496303, guid: 3142c30d660087344b257296a1412929, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5608899073262725710, guid: 3142c30d660087344b257296a1412929, type: 3} propertyPath: m_LocalPosition.x @@ -3667,6 +3853,16 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 8443327144756293032, guid: 3142c30d660087344b257296a1412929, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8662653588712963138, guid: 3142c30d660087344b257296a1412929, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 8665242768629559206, guid: 3142c30d660087344b257296a1412929, type: 3} propertyPath: _leftHand @@ -3706,7 +3902,51 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 1916961364} + - targetCorrespondingSourceObject: {fileID: 5404716255858496303, guid: 3142c30d660087344b257296a1412929, + type: 3} + insertIndex: -1 + addedObject: {fileID: 518047937} m_SourcePrefab: {fileID: 100100000, guid: 3142c30d660087344b257296a1412929, type: 3} +--- !u!224 &518047935 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6578041647230589531, guid: 3142c30d660087344b257296a1412929, + type: 3} + m_PrefabInstance: {fileID: 518047934} + m_PrefabAsset: {fileID: 0} +--- !u!1 &518047936 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5404716255858496303, guid: 3142c30d660087344b257296a1412929, + type: 3} + m_PrefabInstance: {fileID: 518047934} + m_PrefabAsset: {fileID: 0} +--- !u!114 &518047937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 518047936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee10491ef6d5d1d49a270cf6b09bdc19, type: 3} + m_Name: + m_EditorClassIdentifier: + _enableMipmapping: 0 + _dynamicResolution: 1 + _redrawResolutionThreshold: 2147483647 + rectTransform: {fileID: 518047935} + maxTextureSize: 2048 + manualRedraw: 0 + renderInterval: 1 + renderIntervalFrameOffset: 0 + expensive: 0 + layer: 5 + opacity: 2 + shape: 0 + curveRadius: 1 + overlapMask: 0 + overlayType: 1 + _overlayEnabled: 1 --- !u!4 &518047938 stripped Transform: m_CorrespondingSourceObject: {fileID: 4000921689473202953, guid: 3142c30d660087344b257296a1412929, @@ -4210,6 +4450,148 @@ Transform: m_Children: [] m_Father: {fileID: 1704555133} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &597148020 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PortalMat (for Surface) + m_Shader: {fileID: -6465566751694194690, guid: a47a55574e258ae4f97fad14d64ff151, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Albedo: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TexLeft: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TexRight: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlbedoAlpha: 1 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _FadeColorBlend: 0.004822666 + - _ForceEye: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + - _flipY: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FadeColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _Tiling_And_Offset: {r: 1, g: 1, b: 0, a: 0} + - _WorldDir: {r: 0, g: 0, b: 0, a: 0} + - _WorldPos: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &627188485 GameObject: m_ObjectHideFlags: 0 @@ -4541,6 +4923,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2982427928412138657, guid: 114dd0e59d4d3744d995722c429f5f25, + type: 3} + propertyPath: disableEyeAnchorCameras + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2982427928412138657, guid: 114dd0e59d4d3744d995722c429f5f25, + type: 3} + propertyPath: useFixedUpdateForTracking + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2982427928412138667, guid: 114dd0e59d4d3744d995722c429f5f25, type: 3} propertyPath: requestScenePermissionOnStartup @@ -4719,148 +5111,6 @@ MonoBehaviour: RigidbodiesToPortal: [] childCloneRenderers: [] ClonePositionToClosestPortal: {fileID: 0} ---- !u!21 &664835596 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: PortalMat (for Surface) - m_Shader: {fileID: -6465566751694194690, guid: a47a55574e258ae4f97fad14d64ff151, - type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _Albedo: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TexLeft: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TexRight: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlbedoAlpha: 1 - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _FadeColorBlend: 1 - - _ForceEye: 0 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueControl: 0 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - - _flipY: 1 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _FadeColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - - _Tiling_And_Offset: {r: 1, g: 1, b: 0, a: 0} - - _WorldDir: {r: 0, g: 0, b: 0, a: 0} - - _WorldPos: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &671655369 GameObject: m_ObjectHideFlags: 0 @@ -6424,148 +6674,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &855363496 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: PortalMat (for Surface) - m_Shader: {fileID: -6465566751694194690, guid: a47a55574e258ae4f97fad14d64ff151, - type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _Albedo: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TexLeft: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TexRight: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlbedoAlpha: 1 - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _FadeColorBlend: 0.0048309676 - - _ForceEye: 0 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueControl: 0 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - - _flipY: 0 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _FadeColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - - _Tiling_And_Offset: {r: 1, g: 1, b: 0, a: 0} - - _WorldDir: {r: 0, g: 0, b: 0, a: 0} - - _WorldPos: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &858212093 GameObject: m_ObjectHideFlags: 0 @@ -7281,148 +7389,6 @@ MonoBehaviour: installationRoutineCheckpoint: _installationRoutineId: _installationVariants: [] ---- !u!21 &931022156 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: PortalMat (for Surface) - m_Shader: {fileID: -6465566751694194690, guid: a47a55574e258ae4f97fad14d64ff151, - type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _Albedo: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TexLeft: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TexRight: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlbedoAlpha: 1 - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _FadeColorBlend: 0.004822666 - - _ForceEye: 0 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueControl: 0 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - - _flipY: 0 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _FadeColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - - _Tiling_And_Offset: {r: 1, g: 1, b: 0, a: 0} - - _WorldDir: {r: 0, g: 0, b: 0, a: 0} - - _WorldPos: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &974288639 GameObject: m_ObjectHideFlags: 0 @@ -7604,6 +7570,148 @@ Transform: m_Children: [] m_Father: {fileID: 1354637779} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &1049683634 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PortalMat (for Surface) + m_Shader: {fileID: -6465566751694194690, guid: a47a55574e258ae4f97fad14d64ff151, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Albedo: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TexLeft: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TexRight: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlbedoAlpha: 1 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _FadeColorBlend: 0.004822666 + - _ForceEye: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + - _flipY: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FadeColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _Tiling_And_Offset: {r: 1, g: 1, b: 0, a: 0} + - _WorldDir: {r: 0, g: 0, b: 0, a: 0} + - _WorldPos: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &1057078644 GameObject: m_ObjectHideFlags: 0 @@ -8583,7 +8691,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 1, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -8953,6 +9061,148 @@ MonoBehaviour: m_EditorClassIdentifier: _hmd: {fileID: 1355135457} _hand: {fileID: 20471329} +--- !u!21 &1180764756 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PortalMat (for Surface) + m_Shader: {fileID: -6465566751694194690, guid: a47a55574e258ae4f97fad14d64ff151, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Albedo: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TexLeft: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TexRight: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlbedoAlpha: 1 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _FadeColorBlend: 0.004822666 + - _ForceEye: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + - _flipY: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FadeColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _Tiling_And_Offset: {r: 1, g: 1, b: 0, a: 0} + - _WorldDir: {r: 0, g: 0, b: 0, a: 0} + - _WorldPos: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &1181391876 GameObject: m_ObjectHideFlags: 0 @@ -14005,148 +14255,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 7.8999996, y: 0, z: 7.5} m_Center: {x: 0, y: 0, z: 0} ---- !u!21 &1804689573 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: PortalMat (for Surface) - m_Shader: {fileID: -6465566751694194690, guid: a47a55574e258ae4f97fad14d64ff151, - type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _Albedo: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TexLeft: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TexRight: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlbedoAlpha: 1 - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _FadeColorBlend: 0.004822666 - - _ForceEye: 0 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueControl: 0 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - - _flipY: 0 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _FadeColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - - _Tiling_And_Offset: {r: 1, g: 1, b: 0, a: 0} - - _WorldDir: {r: 0, g: 0, b: 0, a: 0} - - _WorldPos: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &1808853395 GameObject: m_ObjectHideFlags: 0 @@ -14469,14 +14577,14 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1721178603} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7e933e81d3c20c74ea6fdc708a67e3a5, type: 3} m_Name: m_EditorClassIdentifier: _monoscopic: 0 _sharpenType: 0 - _enableDynamicResolution: 0 + _enableDynamicResolution: 1 minDynamicResolutionScale: 1 maxDynamicResolutionScale: 1 quest2MinDynamicResolutionScale: 0.7 @@ -14525,8 +14633,8 @@ MonoBehaviour: shouldBoundaryVisibilityBeSuppressed: 0 requestBodyTrackingPermissionOnStartup: 0 requestFaceTrackingPermissionOnStartup: 0 - requestEyeTrackingPermissionOnStartup: 0 - requestScenePermissionOnStartup: 0 + requestEyeTrackingPermissionOnStartup: 1 + requestScenePermissionOnStartup: 1 requestRecordAudioPermissionOnStartup: 0 _localDimming: 1 _trackingOriginType: 1 @@ -15258,9 +15366,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: acfd4230ec07a824b980e2dd17ca8031, type: 3} m_Name: m_EditorClassIdentifier: - test: 0 SceneId: SampleRate: 0.05 + BatchSize: 10 + FlushInterval: 2 TrackedObjects: - {fileID: 1277379687} - {fileID: 177755780} @@ -15268,7 +15377,6 @@ MonoBehaviour: - {fileID: 656166929} - {fileID: 426030643} - {fileID: 1141936317} - _isRecording: 0 --- !u!4 &2089505614 Transform: m_ObjectHideFlags: 0 @@ -15580,7 +15688,7 @@ GameObject: - component: {fileID: 2145881149} - component: {fileID: 2145881151} - component: {fileID: 2145881150} - m_Layer: 5 + m_Layer: 3 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -15732,7 +15840,7 @@ PrefabInstance: type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 855363496} + objectReference: {fileID: 597148020} - target: {fileID: 7698898345407554876, guid: 80f01f07be8048f4582821772419a545, type: 3} propertyPath: portalableObjects.Array.size diff --git a/Assets/_Scripts/GhostSystem/FrameModel.cs b/Assets/_Scripts/GhostSystem/FrameModel.cs index e4cb636..cf9462d 100644 --- a/Assets/_Scripts/GhostSystem/FrameModel.cs +++ b/Assets/_Scripts/GhostSystem/FrameModel.cs @@ -28,6 +28,30 @@ namespace GhostSystem [Column("rotation")] public string RotationJson { get; set; } // stored as JSONB + public static FrameModel FromGhostFrame(GhostFrame frame) + { + return new FrameModel + { + UserId = SupabaseManager.instance.userId, + SceneId = frame.SceneId, + ObjectId = frame.ObjectId, + Timestamp = frame.Timestamp.ToString("o"), // "o" für ISO 8601 + PositionJson = JsonConvert.SerializeObject(new Vector3Serializable + { + x = frame.Position.x, + y = frame.Position.y, + z = frame.Position.z, + }), + RotationJson = JsonConvert.SerializeObject(new QuaternionSerializable + { + x = frame.Rotation.x, + y = frame.Rotation.y, + z = frame.Rotation.z, + w = frame.Rotation.w + }) + }; + } + [JsonIgnore] public DateTime TimestampParsed => DateTime.Parse(Timestamp).ToUniversalTime(); diff --git a/Assets/_Scripts/GhostSystem/GhostRecorderBatch.cs b/Assets/_Scripts/GhostSystem/GhostRecorderBatch.cs index 9132e90..7c7e42f 100644 --- a/Assets/_Scripts/GhostSystem/GhostRecorderBatch.cs +++ b/Assets/_Scripts/GhostSystem/GhostRecorderBatch.cs @@ -1,30 +1,39 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using System.Threading.Tasks; +using Cysharp.Threading.Tasks; using Newtonsoft.Json; using System; using Oculus.Interaction; +using System.IO; namespace GhostSystem { public class GhostRecorderBatch : MonoBehaviour { - public bool test = false; public string SceneId; public float SampleRate = 0.05f; + public int BatchSize = 10; + public float FlushInterval = 2f; + public List TrackedObjects; private int doorCount; - private float _timer; - public bool _isRecording; + private float _sampleTimer; + private float _flushTimer; + private bool _isRecording; private bool supabaseReady = false; private bool sceneIdReady = false; + + private readonly List _frameBuffer = new(); + + private string _offlinePath; + public static event Action OnRecord; public static event Action OnStopRecord; - private async void OnEnable() + private void OnEnable() { SupabaseManager.OnSuperbaseReady += HandleSupabaseReady; RoomManager.OnSceneIdReady += HandleSceneIdReady; @@ -36,6 +45,11 @@ namespace GhostSystem RoomManager.OnSceneIdReady -= HandleSceneIdReady; } + private void Start() + { + _offlinePath = Path.Combine(Application.persistentDataPath, "offline_log.jsonl"); + } + private void HandleSupabaseReady() { supabaseReady = true; @@ -47,57 +61,82 @@ namespace GhostSystem sceneIdReady = true; foreach (GameObject door in doors) { - TrackedObjects.Add(door.GetComponentInChildren().gameObject.transform); - doorCount++; - } - } - - private async void Update() - { - if (test) await TestInsert(); - if (!_isRecording) return; - - _timer += Time.deltaTime; - if (_timer >= SampleRate) - { - _timer = 0f; - foreach (var obj in TrackedObjects) + var rotator = door.GetComponentInChildren(); + if (rotator != null) { - var frame = new GhostFrame(SceneId, obj.name, obj.position, obj.rotation); - await InsertFrame(frame); + TrackedObjects.Add(rotator.transform); + doorCount++; } } } - private async Task InsertFrame(GhostFrame frame) + private void Update() { - var position = new Vector3Serializable - { - x = frame.Position.x, - y = frame.Position.y, - z = frame.Position.z - }; - var rotation = new QuaternionSerializable - { - x = frame.Rotation.x, - y = frame.Rotation.y, - z = frame.Rotation.z, - w = frame.Rotation.w - }; + if (!_isRecording) return; - var data = new FrameModel + _sampleTimer += Time.deltaTime; + _flushTimer += Time.deltaTime; + + if (_sampleTimer >= SampleRate) { - UserId = SupabaseManager.instance.userId, - SceneId = frame.SceneId, - ObjectId = frame.ObjectId, - Timestamp = frame.Timestamp.ToString("o"), - PositionJson = JsonConvert.SerializeObject(position), - RotationJson = JsonConvert.SerializeObject(rotation) - }; + _sampleTimer = 0f; + RecordSample(); + } - //Debug.Log($"Insert frame with user_id: {SupabaseManager.instance.userId}"); + if (_frameBuffer.Count >= BatchSize || _flushTimer >= FlushInterval) + { + _flushTimer = 0f; + _ = FlushBatchAsync(); // Fire and forget + } + } - await SupabaseManager.instance.supabase.From().Insert(data); + private void RecordSample() + { + foreach (var obj in TrackedObjects) + { + var frame = new GhostFrame(SceneId, obj.name, obj.position, obj.rotation); + _frameBuffer.Add(FrameModel.FromGhostFrame(frame)); + } + } + + private async UniTaskVoid FlushBatchAsync() + { + if (_frameBuffer.Count == 0 || !supabaseReady) return; + + var batch = new List(_frameBuffer); + _frameBuffer.Clear(); + + try + { + var response = await SupabaseManager.instance.supabase.From().Insert(batch); + if (!response.ResponseMessage.IsSuccessStatusCode) + { + Debug.LogWarning($"Batch insert failed: {response.ResponseMessage.StatusCode}, fallback to offline."); + await FallbackToOfflineAsync(batch); + } + } + catch (Exception ex) + { + Debug.LogWarning($"Insert failed, fallback to offline: {ex.Message}"); + await FallbackToOfflineAsync(batch); + } + } + + private async UniTask FallbackToOfflineAsync(List batch) + { + try + { + using var writer = new StreamWriter(_offlinePath, append: true); + foreach (var model in batch) + { + string jsonLine = JsonConvert.SerializeObject(model); + await writer.WriteLineAsync(jsonLine); + } + } + catch (Exception ex) + { + Debug.LogError($"Offline write failed: {ex.Message}"); + } } public void StartRecording() @@ -114,28 +153,13 @@ namespace GhostSystem sceneIdReady = false; OnStopRecord?.Invoke(); Debug.Log($"Stop recording: {SceneId}"); - TrackedObjects.RemoveRange( TrackedObjects.Count - doorCount, doorCount ); - doorCount = 0; - } - - private async Task TestInsert() - { - var pos = new Vector3Serializable { x = 1f, y = 2f, z = 3f }; - var rot = new QuaternionSerializable { x = 0f, y = 0f, z = 0f, w = 1f }; - - var data = new FrameModel + + if (doorCount > 0 && TrackedObjects.Count >= doorCount) { - UserId = SupabaseManager.instance.userId, - SceneId = "testScene", - ObjectId = "testObject", - Timestamp = DateTime.UtcNow.ToString("o"), - PositionJson = JsonConvert.SerializeObject(pos), - RotationJson = JsonConvert.SerializeObject(rot) - }; + TrackedObjects.RemoveRange(TrackedObjects.Count - doorCount, doorCount); + } - Debug.Log(JsonConvert.SerializeObject(data)); // Schau hier, ob es nur Strings sind. - - await SupabaseManager.instance.supabase.From().Insert(data); + doorCount = 0; } } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 38088e4..d1d8d59 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -49,7 +49,7 @@ PlayerSettings: defaultScreenHeight: 768 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 - m_StereoRenderingPath: 0 + m_StereoRenderingPath: 2 m_ActiveColorSpace: 1 unsupportedMSAAFallback: 0 m_SpriteBatchMaxVertexCount: 65535 @@ -541,8 +541,12 @@ PlayerSettings: m_SubKind: m_BuildTargetBatching: [] m_BuildTargetShaderSettings: [] - m_BuildTargetGraphicsJobs: [] - m_BuildTargetGraphicsJobMode: [] + m_BuildTargetGraphicsJobs: + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 1 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: AndroidPlayer + m_GraphicsJobMode: 1 m_BuildTargetGraphicsAPIs: - m_BuildTarget: iOSSupport m_APIs: 10000000 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index fc06b97..b87cc9d 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -16,7 +16,7 @@ TagManager: - Default - TransparentFX - Ignore Raycast - - + - Overlay UI - Water - UI - Player