diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 12a1c55..130393c 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -593,7 +593,7 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 10 MaxDistance: 100 Pan2D: 0 rolloffMode: 1 @@ -720,7 +720,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 2 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -1721,7 +1721,7 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 3 MaxDistance: 500 Pan2D: 0 rolloffMode: 0 @@ -1848,7 +1848,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 2 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -2051,7 +2051,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh25630 + m_Name: pb_Mesh25022 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -2215,7 +2215,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-5932 + m_Name: pb_Mesh25124 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -2465,7 +2465,7 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 7 MaxDistance: 200 Pan2D: 0 rolloffMode: 0 @@ -2761,9 +2761,9 @@ AudioSource: Priority: 128 DopplerLevel: 1 MinDistance: 1 - MaxDistance: 500 + MaxDistance: 30 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 2 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -2771,23 +2771,59 @@ AudioSource: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.033333335 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: -30.011993 + outSlope: -30.011993 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.06666667 + value: 0.5 + inSlope: -7.5029984 + outSlope: -7.5029984 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.13333334 + value: 0.25 + inSlope: -1.8757496 + outSlope: -1.8757496 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.26666668 + value: 0.0874939 + inSlope: -0.4689374 + outSlope: -0.4689374 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.53333336 + value: 0 + inSlope: -0.11723435 + outSlope: -0.11723435 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: -0.033346657 + outSlope: -0.033346657 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2887,7 +2923,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 2 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -3068,7 +3104,7 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 5 MaxDistance: 700 Pan2D: 0 rolloffMode: 0 @@ -3195,7 +3231,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 2 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -37463,7 +37499,7 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 5 MaxDistance: 700 Pan2D: 0 rolloffMode: 0 @@ -37590,7 +37626,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 2 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -37771,7 +37807,7 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 5 MaxDistance: 700 Pan2D: 0 rolloffMode: 0 @@ -37898,7 +37934,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 2 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 diff --git a/Assets/Scenes/Main/LightingData.asset b/Assets/Scenes/Main/LightingData.asset index 1b8b4c1..a6faf42 100644 Binary files a/Assets/Scenes/Main/LightingData.asset and b/Assets/Scenes/Main/LightingData.asset differ diff --git a/Assets/Scenes/Main/Lightmap-1_comp_dir.png b/Assets/Scenes/Main/Lightmap-1_comp_dir.png index c6f8ff1..1faec46 100644 Binary files a/Assets/Scenes/Main/Lightmap-1_comp_dir.png and b/Assets/Scenes/Main/Lightmap-1_comp_dir.png differ diff --git a/Assets/Scenes/Main/Lightmap-1_comp_light.exr b/Assets/Scenes/Main/Lightmap-1_comp_light.exr index 5591cf9..11a9858 100644 Binary files a/Assets/Scenes/Main/Lightmap-1_comp_light.exr and b/Assets/Scenes/Main/Lightmap-1_comp_light.exr differ diff --git a/Assets/Scenes/Main/Lightmap-1_comp_shadowmask.png b/Assets/Scenes/Main/Lightmap-1_comp_shadowmask.png index a970cc2..e4aa2f3 100644 Binary files a/Assets/Scenes/Main/Lightmap-1_comp_shadowmask.png and b/Assets/Scenes/Main/Lightmap-1_comp_shadowmask.png differ diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0147887..93e7b16 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,5 +4,8 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Scenes/Main.unity + guid: 9fc0d4010bbf28b4594072e72b8655ab m_configObjects: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a80d7e4..0912b70 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -39,7 +39,9 @@ PlayerSettings: y: 0 width: 1 height: 1 - m_SplashScreenLogos: [] + m_SplashScreenLogos: + - logo: {fileID: 21300000, guid: b732eef5133eaa290a638df1d73d5503, type: 3} + duration: 2 m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1920 @@ -428,7 +430,7 @@ PlayerSettings: m_Automatic: 1 - m_BuildTarget: WebGLSupport m_APIs: 0b000000 - m_Automatic: 1 + m_Automatic: 0 m_BuildTargetVRSettings: - m_BuildTarget: Standalone m_Enabled: 0 @@ -691,9 +693,9 @@ PlayerSettings: ps4IncludedModules: [] ps4attribVROutputEnabled: 0 monoEnv: - splashScreenBackgroundSourceLandscape: {fileID: 0} + splashScreenBackgroundSourceLandscape: {fileID: 21300000, guid: f5e176245faeeda3cb8d83b426451052, type: 3} splashScreenBackgroundSourcePortrait: {fileID: 0} - blurSplashScreenBackground: 1 + blurSplashScreenBackground: 0 spritePackerPolicy: webGLMemorySize: 16 webGLExceptionSupport: 1 @@ -712,6 +714,7 @@ PlayerSettings: webGLDecompressionFallback: 0 scriptingDefineSymbols: Standalone: STARTER_ASSETS_PACKAGES_CHECKED + WebGL: STARTER_ASSETS_PACKAGES_CHECKED additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {}