diff --git a/3D/Assets/Miscellanius/MainLightningSetting.lighting b/3D/Assets/Miscellanius/MainLightningSetting.lighting index a70d10f..aaccfc8 100644 --- a/3D/Assets/Miscellanius/MainLightningSetting.lighting +++ b/3D/Assets/Miscellanius/MainLightningSetting.lighting @@ -14,10 +14,10 @@ LightingSettings: m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 - m_IndirectOutputScale: 0.75 - m_UsingShadowmask: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 0 m_BakeBackend: 1 - m_LightmapMaxSize: 512 + m_LightmapMaxSize: 256 m_BakeResolution: 40 m_Padding: 2 m_TextureCompression: 1 @@ -26,7 +26,7 @@ LightingSettings: m_CompAOExponent: 1 m_CompAOExponentDirect: 0 m_ExtractAO: 0 - m_MixedBakeMode: 2 + m_MixedBakeMode: 0 m_LightmapsBakeMode: 1 m_FilterMode: 1 m_LightmapParameters: {fileID: 15200, guid: 0000000000000000f000000000000000, type: 0} diff --git a/3D/Assets/Miscellanius/MainMenuLightSetting.lighting b/3D/Assets/Miscellanius/MainMenuLightSetting.lighting index 782c49c..892c855 100644 --- a/3D/Assets/Miscellanius/MainMenuLightSetting.lighting +++ b/3D/Assets/Miscellanius/MainMenuLightSetting.lighting @@ -15,9 +15,9 @@ LightingSettings: m_BounceScale: 1 m_AlbedoBoost: 1 m_IndirectOutputScale: 1 - m_UsingShadowmask: 0 + m_UsingShadowmask: 1 m_BakeBackend: 1 - m_LightmapMaxSize: 128 + m_LightmapMaxSize: 512 m_BakeResolution: 40 m_Padding: 2 m_TextureCompression: 1 @@ -26,7 +26,7 @@ LightingSettings: m_CompAOExponent: 1 m_CompAOExponentDirect: 0 m_ExtractAO: 0 - m_MixedBakeMode: 0 + m_MixedBakeMode: 2 m_LightmapsBakeMode: 1 m_FilterMode: 1 m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} diff --git a/3D/Assets/Scenes/Main.unity b/3D/Assets/Scenes/Main.unity index 1ab22c4..97bca30 100644 --- a/3D/Assets/Scenes/Main.unity +++ b/3D/Assets/Scenes/Main.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.17276812, g: 0.21589181, b: 0.29782555, a: 1} + m_IndirectSpecularColor: {r: 0.172768, g: 0.21589169, b: 0.29782546, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -215,8 +215,8 @@ GameObject: - component: {fileID: 403144235} - component: {fileID: 403144234} - component: {fileID: 403144233} - - component: {fileID: 403144236} - component: {fileID: 403144237} + - component: {fileID: 403144236} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -241,8 +241,8 @@ Camera: m_GameObject: {fileID: 403144232} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.3490566, g: 0.3490566, b: 0.3490566, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -255,8 +255,8 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 54.08 - far clip plane: 200 + near clip plane: 3 + far clip plane: 150 field of view: 32 orthographic: 1 orthographic size: 320 @@ -283,7 +283,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 403144232} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 10, y: 165, z: -5} + m_LocalPosition: {x: 10, y: 150, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -627,7 +627,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 2 + m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -1334,7 +1334,7 @@ Rigidbody: m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 116 - m_CollisionDetection: 3 + m_CollisionDetection: 0 --- !u!4 &1932968024 Transform: m_ObjectHideFlags: 0 @@ -1374,7 +1374,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!224 &1967023218 RectTransform: @@ -2000,7 +2000,7 @@ Rigidbody: m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 116 - m_CollisionDetection: 3 + m_CollisionDetection: 0 --- !u!1 &4130875970090338752 GameObject: m_ObjectHideFlags: 0 diff --git a/3D/Assets/Scenes/Main/LightingData.asset b/3D/Assets/Scenes/Main/LightingData.asset index 05f7b69..b198f3f 100644 Binary files a/3D/Assets/Scenes/Main/LightingData.asset and b/3D/Assets/Scenes/Main/LightingData.asset differ diff --git a/3D/Assets/Scenes/Main/Lightmap-0_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-0_comp_dir.png index dd77c1f..e4b8906 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-0_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-0_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-0_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-0_comp_light.exr index 8d3b161..cdb4619 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-0_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-0_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-10_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-10_comp_dir.png index 4a13411..5c2dcef 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-10_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-10_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-10_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-10_comp_light.exr index ddb236e..57d5210 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-10_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-10_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-11_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-11_comp_dir.png index 1dac76b..5eeb0c2 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-11_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-11_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-11_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-11_comp_light.exr index b14b69c..3bfa122 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-11_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-11_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-12_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-12_comp_dir.png index cfb3337..01d97ba 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-12_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-12_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-12_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-12_comp_light.exr index e8efe6d..c58a1d9 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-12_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-12_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-13_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-13_comp_dir.png index 58938ee..6e3167e 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-13_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-13_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-13_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-13_comp_light.exr index a54a6f0..2d36738 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-13_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-13_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-14_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-14_comp_dir.png index 98f6bc3..b627dd4 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-14_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-14_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-14_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-14_comp_light.exr index 0dfcc15..0416d0c 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-14_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-14_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-15_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-15_comp_dir.png index 9192a53..c1f25d8 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-15_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-15_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-15_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-15_comp_light.exr index 4f450e7..58b2498 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-15_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-15_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-16_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-16_comp_dir.png index 7817785..a895ee2 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-16_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-16_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-16_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-16_comp_light.exr index 22a11f2..e2b3b16 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-16_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-16_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-17_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-17_comp_dir.png index 9b056bb..d3f3db6 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-17_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-17_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-17_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-17_comp_light.exr index bca3da3..4c40ebc 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-17_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-17_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-18_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-18_comp_dir.png index 6515c72..e52e5ee 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-18_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-18_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-18_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-18_comp_light.exr index f4e3326..2218690 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-18_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-18_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-19_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-19_comp_dir.png index e708716..e7a1867 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-19_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-19_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-19_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-19_comp_light.exr index c1877cd..07d3d53 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-19_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-19_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-1_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-1_comp_dir.png index 7ccf41d..ed20876 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-1_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-1_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-1_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-1_comp_light.exr index 6260ce4..24ce2ec 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-1_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-1_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-20_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-20_comp_dir.png index a070c3a..dda6420 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-20_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-20_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-20_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-20_comp_light.exr index 66c0e2d..6b58e88 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-20_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-20_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-21_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-21_comp_dir.png index 02973fb..76bd6d3 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-21_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-21_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-21_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-21_comp_light.exr index c816788..4672a97 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-21_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-21_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-22_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-22_comp_dir.png index 0559f79..b0839f0 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-22_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-22_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-22_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-22_comp_light.exr index bc04fd2..81804be 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-22_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-22_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-2_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-2_comp_dir.png index 1b0603d..472ed0e 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-2_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-2_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-2_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-2_comp_light.exr index f450aa1..838e568 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-2_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-2_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-3_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-3_comp_dir.png index 4ea0de0..abb5c82 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-3_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-3_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-3_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-3_comp_light.exr index f575f47..de537f7 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-3_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-3_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-4_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-4_comp_dir.png index 2b2b24f..661344a 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-4_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-4_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-4_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-4_comp_light.exr index b7720af..0cf0158 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-4_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-4_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-5_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-5_comp_dir.png index 9a6d482..d5d66ff 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-5_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-5_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-5_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-5_comp_light.exr index a7d9377..b3b839e 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-5_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-5_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-6_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-6_comp_dir.png index 1e78c66..8d99721 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-6_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-6_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-6_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-6_comp_light.exr index f2091bf..dadbf52 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-6_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-6_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-7_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-7_comp_dir.png index 225ddf7..8f24192 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-7_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-7_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-7_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-7_comp_light.exr index 7c2b556..ac984d5 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-7_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-7_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-8_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-8_comp_dir.png index 65b20a0..ee1ad75 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-8_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-8_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-8_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-8_comp_light.exr index ac59b82..ac6b6b9 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-8_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-8_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/Lightmap-9_comp_dir.png b/3D/Assets/Scenes/Main/Lightmap-9_comp_dir.png index 692729b..cc8513b 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-9_comp_dir.png and b/3D/Assets/Scenes/Main/Lightmap-9_comp_dir.png differ diff --git a/3D/Assets/Scenes/Main/Lightmap-9_comp_light.exr b/3D/Assets/Scenes/Main/Lightmap-9_comp_light.exr index b6e8531..c7cdf1c 100644 Binary files a/3D/Assets/Scenes/Main/Lightmap-9_comp_light.exr and b/3D/Assets/Scenes/Main/Lightmap-9_comp_light.exr differ diff --git a/3D/Assets/Scenes/Main/ReflectionProbe-0.exr b/3D/Assets/Scenes/Main/ReflectionProbe-0.exr index bfd4472..94941fe 100644 Binary files a/3D/Assets/Scenes/Main/ReflectionProbe-0.exr and b/3D/Assets/Scenes/Main/ReflectionProbe-0.exr differ diff --git a/3D/Assets/Scenes/MainMenu.unity b/3D/Assets/Scenes/MainMenu.unity index 5a539a4..3c7a60b 100644 --- a/3D/Assets/Scenes/MainMenu.unity +++ b/3D/Assets/Scenes/MainMenu.unity @@ -6037,7 +6037,7 @@ MonoBehaviour: m_ScaleFactor: 0.75 m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0.7 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 diff --git a/3D/Assets/Scenes/MainMenu/LightingData.asset b/3D/Assets/Scenes/MainMenu/LightingData.asset index 9555aff..b8f68b3 100644 Binary files a/3D/Assets/Scenes/MainMenu/LightingData.asset and b/3D/Assets/Scenes/MainMenu/LightingData.asset differ diff --git a/3D/Assets/Scenes/MainMenu/ReflectionProbe-0.exr b/3D/Assets/Scenes/MainMenu/ReflectionProbe-0.exr index 058edba..eb017ba 100644 Binary files a/3D/Assets/Scenes/MainMenu/ReflectionProbe-0.exr and b/3D/Assets/Scenes/MainMenu/ReflectionProbe-0.exr differ diff --git a/3D/Packages/manifest.json b/3D/Packages/manifest.json index d7aa3fb..8b1b48c 100644 --- a/3D/Packages/manifest.json +++ b/3D/Packages/manifest.json @@ -3,6 +3,8 @@ "com.unity.collab-proxy": "1.15.13", "com.unity.ide.visualstudio": "2.0.14", "com.unity.ide.vscode": "1.2.5", + "com.unity.performance.profile-analyzer": "1.1.1", + "com.unity.postprocessing": "3.2.1", "com.unity.probuilder": "4.5.2", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", diff --git a/3D/Packages/packages-lock.json b/3D/Packages/packages-lock.json index 85869f3..8c1a98d 100644 --- a/3D/Packages/packages-lock.json +++ b/3D/Packages/packages-lock.json @@ -32,6 +32,22 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.performance.profile-analyzer": { + "version": "1.1.1", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.postprocessing": { + "version": "3.2.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.probuilder": { "version": "4.5.2", "depth": 0, diff --git a/3D/ProjectSettings/ProjectSettings.asset b/3D/ProjectSettings/ProjectSettings.asset index 378d668..28b911c 100644 --- a/3D/ProjectSettings/ProjectSettings.asset +++ b/3D/ProjectSettings/ProjectSettings.asset @@ -592,7 +592,20 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + 1: UNITY_POST_PROCESSING_STACK_V2 + 7: UNITY_POST_PROCESSING_STACK_V2 + 13: UNITY_POST_PROCESSING_STACK_V2 + 14: UNITY_POST_PROCESSING_STACK_V2 + 19: UNITY_POST_PROCESSING_STACK_V2 + 21: UNITY_POST_PROCESSING_STACK_V2 + 25: UNITY_POST_PROCESSING_STACK_V2 + 27: UNITY_POST_PROCESSING_STACK_V2 + 28: UNITY_POST_PROCESSING_STACK_V2 + 29: UNITY_POST_PROCESSING_STACK_V2 + 30: UNITY_POST_PROCESSING_STACK_V2 + 32: UNITY_POST_PROCESSING_STACK_V2 + 33: UNITY_POST_PROCESSING_STACK_V2 additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} diff --git a/3D/ProjectSettings/QualitySettings.asset b/3D/ProjectSettings/QualitySettings.asset index f9b0b2d..1babffc 100644 --- a/3D/ProjectSettings/QualitySettings.asset +++ b/3D/ProjectSettings/QualitySettings.asset @@ -4,7 +4,7 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 3 + m_CurrentQuality: 0 m_QualitySettings: - serializedVersion: 2 name: Low @@ -18,7 +18,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - skinWeights: 2 + skinWeights: 1 textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 @@ -45,24 +45,24 @@ QualitySettings: - serializedVersion: 2 name: Medium pixelLightCount: 1 - shadows: 1 - shadowResolution: 1 + shadows: 0 + shadowResolution: 0 shadowProjection: 1 shadowCascades: 1 - shadowDistance: 20 + shadowDistance: 10 shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - skinWeights: 2 + skinWeights: 1 textureQuality: 0 - anisotropicTextures: 1 + anisotropicTextures: 0 antiAliasing: 2 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 - vSyncCount: 1 + vSyncCount: 0 lodBias: 0.7 maximumLODLevel: 0 streamingMipmapsActive: 0 @@ -81,24 +81,24 @@ QualitySettings: - serializedVersion: 2 name: High pixelLightCount: 2 - shadows: 2 - shadowResolution: 2 + shadows: 0 + shadowResolution: 0 shadowProjection: 1 shadowCascades: 2 - shadowDistance: 40 + shadowDistance: 10 shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - skinWeights: 2 + skinWeights: 1 textureQuality: 0 - anisotropicTextures: 1 + anisotropicTextures: 0 antiAliasing: 4 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 1 + vSyncCount: 0 lodBias: 1 maximumLODLevel: 0 streamingMipmapsActive: 0 @@ -117,24 +117,24 @@ QualitySettings: - serializedVersion: 2 name: Ultra pixelLightCount: 4 - shadows: 2 - shadowResolution: 3 + shadows: 0 + shadowResolution: 0 shadowProjection: 1 shadowCascades: 4 - shadowDistance: 150 + shadowDistance: 10 shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - skinWeights: 4 + skinWeights: 1 textureQuality: 0 - anisotropicTextures: 2 + anisotropicTextures: 0 antiAliasing: 8 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 1 + vSyncCount: 0 lodBias: 2 maximumLODLevel: 0 streamingMipmapsActive: 0