diff --git a/Game/Assets/Scenes/Day2.unity b/Game/Assets/Scenes/Day2.unity index 781d357..016ae2d 100644 --- a/Game/Assets/Scenes/Day2.unity +++ b/Game/Assets/Scenes/Day2.unity @@ -97,7 +97,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000000, guid: c7d4f0b3c054e4e4183192b86616e458, type: 2} - m_LightingSettings: {fileID: 545922260} + m_LightingSettings: {fileID: 4890085278179872738, guid: ab6ecd5ac90452a48a18b38d1fd7cc30, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -111944,70 +111944,6 @@ MonoBehaviour: m_SelectedFaces: m_SelectedEdges: [] m_SelectedVertices: ---- !u!850595691 &545922260 -LightingSettings: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 6 - m_GIWorkflowMode: 1 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_RealtimeEnvironmentLighting: 1 - m_BounceScale: 1 - m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 - m_UsingShadowmask: 0 - m_BakeBackend: 2 - m_LightmapMaxSize: 2048 - m_BakeResolution: 10 - m_Padding: 2 - m_LightmapCompression: 2 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAO: 0 - m_MixedBakeMode: 0 - m_LightmapsBakeMode: 1 - m_FilterMode: 1 - m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_RealtimeResolution: 2 - m_ForceWhiteAlbedo: 0 - m_ForceUpdates: 0 - m_FinalGather: 0 - m_FinalGatherRayCount: 256 - m_FinalGatherFiltering: 1 - m_PVRCulling: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 128 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 1 - m_PVRMinBounces: 1 - m_PVREnvironmentImportanceSampling: 1 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_PVRTiledBaking: 0 - m_NumRaysToShootPerTexel: -1 - m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!43 &545937315 Mesh: m_ObjectHideFlags: 0 @@ -276578,7 +276514,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: nextSceneName: Town - Day3: Day3 + day3: confirmationPanel: {fileID: 347656170} warningText: {fileID: 1839460625} warningPanel: {fileID: 1776114648} diff --git a/Game/Assets/Scenes/Day2/LightingData.asset b/Game/Assets/Scenes/Day2/LightingData.asset index 725925d..341b1bf 100644 Binary files a/Game/Assets/Scenes/Day2/LightingData.asset and b/Game/Assets/Scenes/Day2/LightingData.asset differ diff --git a/Game/Assets/Scenes/Day2/Lightmap-0_comp_dir.png b/Game/Assets/Scenes/Day2/Lightmap-0_comp_dir.png index 1461bcf..6f85b05 100644 --- a/Game/Assets/Scenes/Day2/Lightmap-0_comp_dir.png +++ b/Game/Assets/Scenes/Day2/Lightmap-0_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2601ad9cc7d6e042f7b7d6879ce1c4cba9411f97ee9835e170314c3789fb8254 -size 2110868 +oid sha256:373c5701bc22a03cfabef6379cf46d7266e5a18c8456358fa5a20d536bd9c81f +size 464566 diff --git a/Game/Assets/Scenes/Day2/Lightmap-0_comp_dir.png.meta b/Game/Assets/Scenes/Day2/Lightmap-0_comp_dir.png.meta index 392da87..0ea2855 100644 --- a/Game/Assets/Scenes/Day2/Lightmap-0_comp_dir.png.meta +++ b/Game/Assets/Scenes/Day2/Lightmap-0_comp_dir.png.meta @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 diff --git a/Game/Assets/Scenes/Day2/Lightmap-0_comp_light.exr b/Game/Assets/Scenes/Day2/Lightmap-0_comp_light.exr index 1e7221a..df2fce9 100644 --- a/Game/Assets/Scenes/Day2/Lightmap-0_comp_light.exr +++ b/Game/Assets/Scenes/Day2/Lightmap-0_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd9542399bdad3d228fa95d5aaf23cd7c55b8a5dcc19aebe22c5038c08151418 -size 9340179 +oid sha256:cc39305d87e9c5445c7ce04daa63efbc4d6d638c9af56306e0b2cbd326757fb5 +size 1771166 diff --git a/Game/Assets/Scenes/Day2/Lightmap-0_comp_light.exr.meta b/Game/Assets/Scenes/Day2/Lightmap-0_comp_light.exr.meta index b8bd0e8..9ea0a41 100644 --- a/Game/Assets/Scenes/Day2/Lightmap-0_comp_light.exr.meta +++ b/Game/Assets/Scenes/Day2/Lightmap-0_comp_light.exr.meta @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 diff --git a/Game/Assets/Scenes/Day2/Lightmap-1_comp_dir.png b/Game/Assets/Scenes/Day2/Lightmap-1_comp_dir.png index 746bbe6..f6f0ea2 100644 --- a/Game/Assets/Scenes/Day2/Lightmap-1_comp_dir.png +++ b/Game/Assets/Scenes/Day2/Lightmap-1_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9782bfaecf48a2192414996be7717efd86fb50d1f86ea9a9c64721939577a8a1 -size 143178 +oid sha256:ac29724ec25a72c4c27082ec756a830655f59c4480c35abd70c3e7a25bccaa1d +size 510338 diff --git a/Game/Assets/Scenes/Day2/Lightmap-1_comp_dir.png.meta b/Game/Assets/Scenes/Day2/Lightmap-1_comp_dir.png.meta index 32d6b2a..cb57ead 100644 --- a/Game/Assets/Scenes/Day2/Lightmap-1_comp_dir.png.meta +++ b/Game/Assets/Scenes/Day2/Lightmap-1_comp_dir.png.meta @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 diff --git a/Game/Assets/Scenes/Day2/Lightmap-1_comp_light.exr b/Game/Assets/Scenes/Day2/Lightmap-1_comp_light.exr index 5dfc993..ae55061 100644 --- a/Game/Assets/Scenes/Day2/Lightmap-1_comp_light.exr +++ b/Game/Assets/Scenes/Day2/Lightmap-1_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce5fe7652610133218c13666ee3993dab52720a9abdae80160b3df048996a157 -size 462645 +oid sha256:893190f445ca0f16c483602d8a4cd2eb82746d13193be6220f55bd8045a5cb1b +size 1916477 diff --git a/Game/Assets/Scenes/Day2/Lightmap-1_comp_light.exr.meta b/Game/Assets/Scenes/Day2/Lightmap-1_comp_light.exr.meta index 2f13b8d..93c7f7f 100644 --- a/Game/Assets/Scenes/Day2/Lightmap-1_comp_light.exr.meta +++ b/Game/Assets/Scenes/Day2/Lightmap-1_comp_light.exr.meta @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 diff --git a/Game/Assets/Scenes/Day2/ReflectionProbe-0.exr b/Game/Assets/Scenes/Day2/ReflectionProbe-0.exr index 070b076..672eaeb 100644 --- a/Game/Assets/Scenes/Day2/ReflectionProbe-0.exr +++ b/Game/Assets/Scenes/Day2/ReflectionProbe-0.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8272c36a7cdf1eedbc512a309e22de5cba3c42a9b210dc79fdc013afeae5287c -size 238660 +oid sha256:843baf7864ea17c3cc58fa892004356609c7972771ea7cea22103c21ee1731c4 +size 59734 diff --git a/Game/Assets/Scenes/Day2/ReflectionProbe-0.exr.meta b/Game/Assets/Scenes/Day2/ReflectionProbe-0.exr.meta index 269637c..0d35842 100644 --- a/Game/Assets/Scenes/Day2/ReflectionProbe-0.exr.meta +++ b/Game/Assets/Scenes/Day2/ReflectionProbe-0.exr.meta @@ -93,6 +93,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048