From 1de2d95db3922d3c0ba48ac8a61d6db980c8abce Mon Sep 17 00:00:00 2001 From: Mark Joshwel Date: Sat, 15 Feb 2025 16:18:23 +0800 Subject: [PATCH] game(scene/*ending*,lighting): low-qual bake --- Game/Assets/Scenes/BadEnding.unity | 84 +++------------------------ Game/Assets/Scenes/EndingChoice.unity | 71 +--------------------- Game/Assets/Scenes/GoodEnding.unity | 66 +-------------------- 3 files changed, 13 insertions(+), 208 deletions(-) diff --git a/Game/Assets/Scenes/BadEnding.unity b/Game/Assets/Scenes/BadEnding.unity index 5595499..8cf1f71 100644 --- a/Game/Assets/Scenes/BadEnding.unity +++ b/Game/Assets/Scenes/BadEnding.unity @@ -96,8 +96,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: 3ab5d1d91d3e7444f9442b83984f4220, type: 2} - m_LightingSettings: {fileID: 545922260} + m_LightingDataAsset: {fileID: 112000000, guid: 8b85c6eb8e26369408250ccf642b1e90, type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: ab6ecd5ac90452a48a18b38d1fd7cc30, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -1184,7 +1184,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1528478352} + m_Mesh: {fileID: 579023074} --- !u!33 &4534705 MeshFilter: m_ObjectHideFlags: 10 @@ -47275,7 +47275,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 @@ -49354,7 +49353,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 652992880} + m_Mesh: {fileID: 1710447760} --- !u!33 &288966588 MeshFilter: m_ObjectHideFlags: 10 @@ -83850,70 +83849,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 @@ -182799,7 +182734,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1300235849} + m_Mesh: {fileID: 1528478352} --- !u!33 &1098234895 MeshFilter: m_ObjectHideFlags: 10 @@ -214547,9 +214482,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 95f0438a7d9b79a44b3b4266ba371262, type: 3} m_Name: m_EditorClassIdentifier: - gameManager: {fileID: 278618526} nextSceneName: Town - Day3: + day3: confirmationPanel: {fileID: 347656170} warningText: {fileID: 0} warningPanel: {fileID: 1776114648} @@ -241717,7 +241651,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 252287583} + m_Mesh: {fileID: 1422275234} --- !u!33 &1445734722 MeshFilter: m_ObjectHideFlags: 10 @@ -313576,7 +313510,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1222937665} + m_Mesh: {fileID: 252287583} --- !u!33 &1946844591 MeshFilter: m_ObjectHideFlags: 10 @@ -328655,7 +328589,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1274892739} + m_Mesh: {fileID: 652992880} --- !u!33 &2051704714 MeshFilter: m_ObjectHideFlags: 10 diff --git a/Game/Assets/Scenes/EndingChoice.unity b/Game/Assets/Scenes/EndingChoice.unity index 7ecbae5..f613401 100644 --- a/Game/Assets/Scenes/EndingChoice.unity +++ b/Game/Assets/Scenes/EndingChoice.unity @@ -96,8 +96,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: 3ab5d1d91d3e7444f9442b83984f4220, type: 2} - m_LightingSettings: {fileID: 545922260} + m_LightingDataAsset: {fileID: 112000000, guid: a40568fd8379dd54294a5be645241eda, type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: ab6ecd5ac90452a48a18b38d1fd7cc30, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -47605,7 +47605,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e01448acf10665b469bdbd43de140feb, type: 3} m_Name: m_EditorClassIdentifier: - currentDay: 1 storyPanelUI: {fileID: 0} storyText: {fileID: 0} --- !u!1 &279787517 @@ -83590,70 +83589,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 @@ -214670,8 +214605,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: 0} warningPanel: {fileID: 0} diff --git a/Game/Assets/Scenes/GoodEnding.unity b/Game/Assets/Scenes/GoodEnding.unity index 49ae432..231c6e3 100644 --- a/Game/Assets/Scenes/GoodEnding.unity +++ b/Game/Assets/Scenes/GoodEnding.unity @@ -97,7 +97,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000000, guid: 7d2c07a649dc1204fb36ce4c8bef7d70, type: 2} - m_LightingSettings: {fileID: 545922260} + m_LightingSettings: {fileID: 4890085278179872738, guid: ab6ecd5ac90452a48a18b38d1fd7cc30, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -103955,70 +103955,6 @@ Mesh: offset: 0 size: 0 path: ---- !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: 1024 - 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: 128 - 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!4 &546377142 stripped Transform: m_CorrespondingSourceObject: {fileID: 4241611329230648748, guid: 8efb14e8dd692fd419e7081bf21c2815, type: 3}