diff --git a/Assets/Materials/uncategorized/ButtonOverlay.mat b/Assets/Materials/uncategorized/ButtonOverlay.mat index 02cc44fe..503a8ac7 100644 --- a/Assets/Materials/uncategorized/ButtonOverlay.mat +++ b/Assets/Materials/uncategorized/ButtonOverlay.mat @@ -4,142 +4,82 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: ButtonOverlay m_Shader: {fileID: 4800000, guid: 31bfda934c27bd54a96d5f3f1ae1d398, type: 3} m_ShaderKeywords: _EMISSION m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - - first: - name: _BumpMap - second: + - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _DetailAlbedoMap - second: + - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _DetailMask - second: + - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _DetailNormalMap - second: + - _DetailNormalMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _EmissionMap - second: + - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MainTex - second: + - _MainTex: m_Texture: {fileID: 2800000, guid: 927f8fea58c7b414a91ce3185869c85c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _MetallicGlossMap - second: + - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _OcclusionMap - second: + - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _ParallaxMap - second: + - _ParallaxMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - first: - name: _SpecGlossMap - second: + - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - first: - name: _BumpScale - second: 1 - - first: - name: _Cutoff - second: 0.5 - - first: - name: _DetailNormalMapScale - second: 1 - - first: - name: _DstBlend - second: 0 - - first: - name: _EmissionGain - second: 0.5 - - first: - name: _GlossMapScale - second: 1 - - first: - name: _Glossiness - second: 0.5 - - first: - name: _GlossyReflections - second: 1 - - first: - name: _InvFade - second: 1 - - first: - name: _Metallic - second: 0 - - first: - name: _Mode - second: 0 - - first: - name: _OcclusionStrength - second: 1 - - first: - name: _Parallax - second: 0.02 - - first: - name: _SmoothnessTextureChannel - second: 0 - - first: - name: _SpecularHighlights - second: 1 - - first: - name: _SrcBlend - second: 1 - - first: - name: _UVSec - second: 0 - - first: - name: _ZWrite - second: 1 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EmissionGain: 0.081 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _InvFade: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: - - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 0.459} - - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 1} - - first: - name: _SpecColor - second: {r: 0.53433055, g: 0.565878, b: 0.88620687, a: 1} - - first: - name: _TintColor - second: {r: 0.5661765, g: 0.5661765, b: 0.5661765, a: 0.5} + - _Color: {r: 1, g: 1, b: 1, a: 0.459} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.53433055, g: 0.565878, b: 0.88620687, a: 1} + - _TintColor: {r: 0.5647059, g: 0.5647059, b: 0.5647059, a: 0.5} diff --git a/Assets/main.unity b/Assets/main.unity index 819d645d..9e560cd9 100644 --- a/Assets/main.unity +++ b/Assets/main.unity @@ -222,14 +222,29 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000011871277266, guid: 9e4cecaca80e2d14d8bc2b6e56198bb4, type: 3} + - target: {fileID: 4000012984231126, guid: 9e4cecaca80e2d14d8bc2b6e56198bb4, type: 3} propertyPath: m_LocalPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114000012806960762, guid: 9e4cecaca80e2d14d8bc2b6e56198bb4, + type: 3} + propertyPath: shader + value: + objectReference: {fileID: 4800000, guid: e14e8250c4a18584fba0b34b47553a9c, type: 3} + - target: {fileID: 114000012806960762, guid: 9e4cecaca80e2d14d8bc2b6e56198bb4, + type: 3} + propertyPath: inputIsHDR value: 0 objectReference: {fileID: 0} - - target: {fileID: 4000012984231126, guid: 9e4cecaca80e2d14d8bc2b6e56198bb4, type: 3} - propertyPath: m_LocalPosition.y + - target: {fileID: 114000012806960762, guid: 9e4cecaca80e2d14d8bc2b6e56198bb4, + type: 3} + propertyPath: lowQuality value: 1 objectReference: {fileID: 0} + - target: {fileID: 4000011871277266, guid: 9e4cecaca80e2d14d8bc2b6e56198bb4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4000012184333462, guid: 9e4cecaca80e2d14d8bc2b6e56198bb4, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -301,11 +316,11 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 114000012806960762, guid: 9e4cecaca80e2d14d8bc2b6e56198bb4, + - target: {fileID: 45000011867636070, guid: 9e4cecaca80e2d14d8bc2b6e56198bb4, type: 3} - propertyPath: lowQuality - value: 1 - objectReference: {fileID: 0} + propertyPath: m_CustomSkybox + value: + objectReference: {fileID: 2100000, guid: 7c4a0618bb47f2547adaf93ab1bccfa9, type: 2} m_RemovedComponents: - {fileID: 114000013251418538, guid: 9e4cecaca80e2d14d8bc2b6e56198bb4, type: 3} - {fileID: 114000011850917524, guid: 9e4cecaca80e2d14d8bc2b6e56198bb4, type: 3} @@ -827,5 +842,30 @@ PrefabInstance: propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 108000010882476752, guid: 5fcaa2781e944b041aead28e2f499fa3, + type: 3} + propertyPath: m_Intensity + value: 1.44 + objectReference: {fileID: 0} + - target: {fileID: 108000011579158192, guid: 5fcaa2781e944b041aead28e2f499fa3, + type: 3} + propertyPath: m_Intensity + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 108000013591479440, guid: 5fcaa2781e944b041aead28e2f499fa3, + type: 3} + propertyPath: m_Intensity + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 108000013052018904, guid: 5fcaa2781e944b041aead28e2f499fa3, + type: 3} + propertyPath: m_Intensity + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 108000011305424894, guid: 5fcaa2781e944b041aead28e2f499fa3, + type: 3} + propertyPath: m_Intensity + value: 6.6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5fcaa2781e944b041aead28e2f499fa3, type: 3} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 68905380..fa17927a 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -7,3 +7,7 @@ EditorBuildSettings: m_Scenes: - enabled: 1 path: Assets/main.unity + guid: 00000000000000000000000000000000 + m_configObjects: + com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 93c4f4428c8e3814dbf9d469c39e85d4, + type: 2} diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index ed39aa80..e34d3ca2 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -154,52 +154,52 @@ GraphicsSettings: m_BuildTarget: 7 m_Tier: 0 m_Settings: - standardShaderQuality: 0 + standardShaderQuality: 2 renderingPath: 1 hdrMode: 1 realtimeGICPUUsage: 25 - useReflectionProbeBoxProjection: 0 - useReflectionProbeBlending: 0 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 useHDR: 1 - useDetailNormalMap: 0 - useCascadedShadowMaps: 0 + useDetailNormalMap: 1 + useCascadedShadowMaps: 1 prefer32BitShadowMaps: 0 enableLPPV: 0 - useDitherMaskForAlphaBlendedShadows: 0 + useDitherMaskForAlphaBlendedShadows: 1 m_Automatic: 0 - serializedVersion: 5 m_BuildTarget: 7 m_Tier: 1 m_Settings: - standardShaderQuality: 1 + standardShaderQuality: 2 renderingPath: 1 hdrMode: 1 realtimeGICPUUsage: 25 - useReflectionProbeBoxProjection: 0 - useReflectionProbeBlending: 0 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 useHDR: 1 - useDetailNormalMap: 0 - useCascadedShadowMaps: 0 + useDetailNormalMap: 1 + useCascadedShadowMaps: 1 prefer32BitShadowMaps: 0 enableLPPV: 0 - useDitherMaskForAlphaBlendedShadows: 0 + useDitherMaskForAlphaBlendedShadows: 1 m_Automatic: 0 - serializedVersion: 5 m_BuildTarget: 7 m_Tier: 2 m_Settings: - standardShaderQuality: 1 + standardShaderQuality: 2 renderingPath: 1 hdrMode: 1 - realtimeGICPUUsage: 25 - useReflectionProbeBoxProjection: 0 - useReflectionProbeBlending: 0 + realtimeGICPUUsage: 50 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 useHDR: 1 - useDetailNormalMap: 0 - useCascadedShadowMaps: 0 + useDetailNormalMap: 1 + useCascadedShadowMaps: 1 prefer32BitShadowMaps: 0 enableLPPV: 0 - useDitherMaskForAlphaBlendedShadows: 0 + useDitherMaskForAlphaBlendedShadows: 1 m_Automatic: 0 m_LightmapStripping: 0 m_FogStripping: 0