diff --git a/Game/Assets/Scenes/Day3.unity b/Game/Assets/Scenes/Day3.unity index d5ac87c..310ee8a 100644 --- a/Game/Assets/Scenes/Day3.unity +++ b/Game/Assets/Scenes/Day3.unity @@ -97,7 +97,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000000, guid: 3ab5d1d91d3e7444f9442b83984f4220, type: 2} - m_LightingSettings: {fileID: 545922260} + m_LightingSettings: {fileID: 4890085278179872738, guid: ab6ecd5ac90452a48a18b38d1fd7cc30, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -46684,7 +46684,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e01448acf10665b469bdbd43de140feb, type: 3} m_Name: m_EditorClassIdentifier: - currentDay: 1 storyPanelUI: {fileID: 620624014} storyText: {fileID: 1214791149} --- !u!1 &279787517 @@ -82269,70 +82268,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: 256 - 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!1 &546986843 GameObject: m_ObjectHideFlags: 0 @@ -212193,8 +212128,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 95f0438a7d9b79a44b3b4266ba371262, type: 3} m_Name: m_EditorClassIdentifier: - gameManager: {fileID: 278618526} nextSceneName: Town + day3: confirmationPanel: {fileID: 347656170} warningText: {fileID: 1839460625} warningPanel: {fileID: 1776114648} @@ -318601,7 +318536,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: timeToWait: 30 - NextScene: EndingChoice + nextScene: --- !u!4 &2019816215 Transform: m_ObjectHideFlags: 0 diff --git a/Game/Assets/Scenes/Day3/LightingData.asset b/Game/Assets/Scenes/Day3/LightingData.asset index 1b23c3a..d374136 100644 Binary files a/Game/Assets/Scenes/Day3/LightingData.asset and b/Game/Assets/Scenes/Day3/LightingData.asset differ diff --git a/Game/Assets/Scenes/Day3/Lightmap-0_comp_dir.png b/Game/Assets/Scenes/Day3/Lightmap-0_comp_dir.png index b49a34b..ec14292 100644 --- a/Game/Assets/Scenes/Day3/Lightmap-0_comp_dir.png +++ b/Game/Assets/Scenes/Day3/Lightmap-0_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15430a1ccf342b2ab502dbc3106273cbf1b36cca78dace49036f41f6e750df03 -size 1572013 +oid sha256:b92ba03a6d85359cd540b010d0743e4613cd5ecbbd2c9a875775dc25e9473dcf +size 440704 diff --git a/Game/Assets/Scenes/Day3/Lightmap-0_comp_dir.png.meta b/Game/Assets/Scenes/Day3/Lightmap-0_comp_dir.png.meta index 9385ee1..fc8a346 100644 --- a/Game/Assets/Scenes/Day3/Lightmap-0_comp_dir.png.meta +++ b/Game/Assets/Scenes/Day3/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/Day3/Lightmap-0_comp_light.exr b/Game/Assets/Scenes/Day3/Lightmap-0_comp_light.exr index d5a7416..01e6045 100644 --- a/Game/Assets/Scenes/Day3/Lightmap-0_comp_light.exr +++ b/Game/Assets/Scenes/Day3/Lightmap-0_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bae0340e9a560d9a6a215fcfc4f2e67c95c4b5bbefcc956cd75b01b663aeb61a -size 7031652 +oid sha256:54a50a120880c37124e527bd540d27dbef0decc8426cff628c5d95a91365ea9f +size 1839706 diff --git a/Game/Assets/Scenes/Day3/Lightmap-0_comp_light.exr.meta b/Game/Assets/Scenes/Day3/Lightmap-0_comp_light.exr.meta index 5470771..54036b7 100644 --- a/Game/Assets/Scenes/Day3/Lightmap-0_comp_light.exr.meta +++ b/Game/Assets/Scenes/Day3/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/Day3/ReflectionProbe-0.exr b/Game/Assets/Scenes/Day3/ReflectionProbe-0.exr index 070b076..672eaeb 100644 --- a/Game/Assets/Scenes/Day3/ReflectionProbe-0.exr +++ b/Game/Assets/Scenes/Day3/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/Day3/ReflectionProbe-0.exr.meta b/Game/Assets/Scenes/Day3/ReflectionProbe-0.exr.meta index a14f3f2..1070141 100644 --- a/Game/Assets/Scenes/Day3/ReflectionProbe-0.exr.meta +++ b/Game/Assets/Scenes/Day3/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