diff --git a/Game/Assets/Scenes/Day1.unity b/Game/Assets/Scenes/Day1.unity index d0326e2..12d3d63 100644 --- a/Game/Assets/Scenes/Day1.unity +++ b/Game/Assets/Scenes/Day1.unity @@ -97,7 +97,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000000, guid: b701e58d176512d4dab82ea0b05efc4e, type: 2} - m_LightingSettings: {fileID: 545922260} + m_LightingSettings: {fileID: 4890085278179872738, guid: ab6ecd5ac90452a48a18b38d1fd7cc30, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -58483,7 +58483,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e01448acf10665b469bdbd43de140feb, type: 3} m_Name: m_EditorClassIdentifier: - currentDay: 1 storyPanelUI: {fileID: 620624014} storyText: {fileID: 1214791149} --- !u!43 &278678358 @@ -112145,70 +112144,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!43 &545937315 Mesh: m_ObjectHideFlags: 0 @@ -275513,9 +275448,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 95f0438a7d9b79a44b3b4266ba371262, type: 3} m_Name: m_EditorClassIdentifier: - gameManager: {fileID: 278618526} nextSceneName: Town - Day3: Day3 + day3: confirmationPanel: {fileID: 347656170} warningText: {fileID: 1839460625} warningPanel: {fileID: 1776114648} diff --git a/Game/Assets/Scenes/Day1/LightingData.asset b/Game/Assets/Scenes/Day1/LightingData.asset index f7bb4fe..c99d83e 100644 Binary files a/Game/Assets/Scenes/Day1/LightingData.asset and b/Game/Assets/Scenes/Day1/LightingData.asset differ diff --git a/Game/Assets/Scenes/Day1/Lightmap-0_comp_dir.png b/Game/Assets/Scenes/Day1/Lightmap-0_comp_dir.png index 803f5a2..8ac59e1 100644 --- a/Game/Assets/Scenes/Day1/Lightmap-0_comp_dir.png +++ b/Game/Assets/Scenes/Day1/Lightmap-0_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:172ddb8ce4041c14696ff2426fce3ce0fb63f40cad97dff476a62a59bbd63b9b -size 2282003 +oid sha256:d2f848c0d29beb644b41006a0f5748fec36d75da881942671d42c1dd993e67e5 +size 498566 diff --git a/Game/Assets/Scenes/Day1/Lightmap-0_comp_dir.png.meta b/Game/Assets/Scenes/Day1/Lightmap-0_comp_dir.png.meta index 66ab794..cf410e8 100644 --- a/Game/Assets/Scenes/Day1/Lightmap-0_comp_dir.png.meta +++ b/Game/Assets/Scenes/Day1/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/Day1/Lightmap-0_comp_light.exr b/Game/Assets/Scenes/Day1/Lightmap-0_comp_light.exr index 44e03e2..01023a4 100644 --- a/Game/Assets/Scenes/Day1/Lightmap-0_comp_light.exr +++ b/Game/Assets/Scenes/Day1/Lightmap-0_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92e3516b4c7d7bdedeccd370f10b2acd7bb7726b03e7336e2fb7195a2d576588 -size 9979311 +oid sha256:17e613992c2079d025a84fd2d52d533081a689bc0fe024a70bc94bfb8da48aec +size 1847635 diff --git a/Game/Assets/Scenes/Day1/Lightmap-0_comp_light.exr.meta b/Game/Assets/Scenes/Day1/Lightmap-0_comp_light.exr.meta index c0f0a8d..c9ef926 100644 --- a/Game/Assets/Scenes/Day1/Lightmap-0_comp_light.exr.meta +++ b/Game/Assets/Scenes/Day1/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/Day1/Lightmap-1_comp_dir.png b/Game/Assets/Scenes/Day1/Lightmap-1_comp_dir.png index 91807c9..97e7d50 100644 --- a/Game/Assets/Scenes/Day1/Lightmap-1_comp_dir.png +++ b/Game/Assets/Scenes/Day1/Lightmap-1_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cb3c47776247760fdd1c0d1bedb2dfbe38768c3e29a3163da08c82b06947596 -size 153476 +oid sha256:650bcc225218b23ef5ac0e6b0485e62d8179e88c4b46f0b28c07a10f3bdf5f0c +size 551852 diff --git a/Game/Assets/Scenes/Day1/Lightmap-1_comp_dir.png.meta b/Game/Assets/Scenes/Day1/Lightmap-1_comp_dir.png.meta index 42fc663..c43869f 100644 --- a/Game/Assets/Scenes/Day1/Lightmap-1_comp_dir.png.meta +++ b/Game/Assets/Scenes/Day1/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/Day1/Lightmap-1_comp_light.exr b/Game/Assets/Scenes/Day1/Lightmap-1_comp_light.exr index 538334a..0203e08 100644 --- a/Game/Assets/Scenes/Day1/Lightmap-1_comp_light.exr +++ b/Game/Assets/Scenes/Day1/Lightmap-1_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:883fdfa0fa91f6dcc1d3b4441c49f6bc5be5c45f89392a3379bf37b05d500697 -size 461797 +oid sha256:54eaa8229f94e7ee60ff095ffe01fcb3b72a1eef5c8ae86f43f517802ba5bf44 +size 1991530 diff --git a/Game/Assets/Scenes/Day1/Lightmap-1_comp_light.exr.meta b/Game/Assets/Scenes/Day1/Lightmap-1_comp_light.exr.meta index 9d92731..0a1ab42 100644 --- a/Game/Assets/Scenes/Day1/Lightmap-1_comp_light.exr.meta +++ b/Game/Assets/Scenes/Day1/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/Day1/ReflectionProbe-0.exr b/Game/Assets/Scenes/Day1/ReflectionProbe-0.exr index cacd338..7d6f5ff 100644 --- a/Game/Assets/Scenes/Day1/ReflectionProbe-0.exr +++ b/Game/Assets/Scenes/Day1/ReflectionProbe-0.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:844922b87d22ecd9aca91245610bf6ed0cbb819e7b30d14e9c74ee05347f06ec -size 163864 +oid sha256:9c9986507088423203a1f1e5465224c95be0ef9b17e4abc7b7c8951e5cd5efa9 +size 163904 diff --git a/Game/Assets/Scenes/Day1/ReflectionProbe-0.exr.meta b/Game/Assets/Scenes/Day1/ReflectionProbe-0.exr.meta index 019c007..de35176 100644 --- a/Game/Assets/Scenes/Day1/ReflectionProbe-0.exr.meta +++ b/Game/Assets/Scenes/Day1/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