diff --git a/3D/Assets/Miscellanius/LightSetting.lighting b/3D/Assets/Miscellanius/MainLightningSetting.lighting similarity index 98% rename from 3D/Assets/Miscellanius/LightSetting.lighting rename to 3D/Assets/Miscellanius/MainLightningSetting.lighting index 289a976..a70d10f 100644 --- a/3D/Assets/Miscellanius/LightSetting.lighting +++ b/3D/Assets/Miscellanius/MainLightningSetting.lighting @@ -6,7 +6,7 @@ LightingSettings: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: LightSetting + m_Name: MainLightningSetting serializedVersion: 3 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 diff --git a/3D/Assets/Miscellanius/LightSetting.lighting.meta b/3D/Assets/Miscellanius/MainLightningSetting.lighting.meta similarity index 100% rename from 3D/Assets/Miscellanius/LightSetting.lighting.meta rename to 3D/Assets/Miscellanius/MainLightningSetting.lighting.meta diff --git a/3D/Assets/Miscellanius/MainMenuLightSetting.lighting b/3D/Assets/Miscellanius/MainMenuLightSetting.lighting new file mode 100644 index 0000000..782c49c --- /dev/null +++ b/3D/Assets/Miscellanius/MainMenuLightSetting.lighting @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MainMenuLightSetting + serializedVersion: 3 + 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: 1 + m_LightmapMaxSize: 128 + m_BakeResolution: 40 + m_Padding: 2 + m_TextureCompression: 1 + 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: 512 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 1 + m_PVREnvironmentMIS: 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 diff --git a/3D/Assets/Miscellanius/MainMenuLightSetting.lighting.meta b/3D/Assets/Miscellanius/MainMenuLightSetting.lighting.meta new file mode 100644 index 0000000..bfb27ce --- /dev/null +++ b/3D/Assets/Miscellanius/MainMenuLightSetting.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c0beaa4d43dfab34c82941311e593f52 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3D/Assets/Scenes/Main.unity b/3D/Assets/Scenes/Main.unity index 95b6623..1ab22c4 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.172768, g: 0.21589169, b: 0.29782546, a: 1} + m_IndirectSpecularColor: {r: 0.17276812, g: 0.21589181, b: 0.29782555, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -588,7 +588,7 @@ Light: m_Type: 1 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1.71 + m_Intensity: 1.6 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -627,7 +627,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 2 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -1075,7 +1075,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!114 &1648409444 MonoBehaviour: @@ -1374,7 +1374,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1967023218 RectTransform: diff --git a/3D/Assets/Scenes/Main/LightingData.asset b/3D/Assets/Scenes/Main/LightingData.asset index f650e23..05f7b69 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 ea5a214..dd77c1f 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 0198c67..8d3b161 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 b8206c4..4a13411 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 8818339..ddb236e 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 4e7f02d..1dac76b 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 4607db7..b14b69c 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 0f53640..cfb3337 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 3606131..e8efe6d 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 106e911..58938ee 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 b0dd288..a54a6f0 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 7984c1c..98f6bc3 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 4245108..0dfcc15 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 7dec9cd..9192a53 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 8e1dfa1..4f450e7 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 26fff6e..7817785 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 8cb852f..22a11f2 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 24e9d78..9b056bb 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 6fc2f56..bca3da3 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 c124232..6515c72 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 1201b7c..f4e3326 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 4668531..e708716 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 0b8a589..c1877cd 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 3e1b990..7ccf41d 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 29f727d..6260ce4 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 22fbe7b..a070c3a 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 7421d6a..66c0e2d 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 bcaf7c9..02973fb 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 419d6af..c816788 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 1475fcd..0559f79 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 f2794b5..bc04fd2 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 16e5634..1b0603d 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 3dfd933..f450aa1 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 06ba15c..4ea0de0 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 5abd89c..f575f47 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 169e102..2b2b24f 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 cdb4041..b7720af 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 e552b5e..9a6d482 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 df81735..a7d9377 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 2b13bdd..1e78c66 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 4f4a576..f2091bf 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 e5efc8e..225ddf7 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 20b3228..7c2b556 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 2bead7d..65b20a0 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 63723e5..ac59b82 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 e9ad369..692729b 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 202f811..b6e8531 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 94941fe..bfd4472 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/PauseMenu.unity.meta b/3D/Assets/Scenes/MainMenu.meta similarity index 67% rename from 3D/Assets/Scenes/PauseMenu.unity.meta rename to 3D/Assets/Scenes/MainMenu.meta index f2b088d..22e3e5c 100644 --- a/3D/Assets/Scenes/PauseMenu.unity.meta +++ b/3D/Assets/Scenes/MainMenu.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: fb3817662f5dfa841a868c0db08b02ea +guid: fb49c3ca69521a342954e1d45a3ec6bc +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/3D/Assets/Scenes/MainMenu.unity b/3D/Assets/Scenes/MainMenu.unity index 79e6f2b..5a539a4 100644 --- a/3D/Assets/Scenes/MainMenu.unity +++ b/3D/Assets/Scenes/MainMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571328, b: 0.3069217, a: 1} + m_IndirectSpecularColor: {r: 0.1802834, g: 0.2257135, b: 0.3069223, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -97,8 +97,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: 95f354166198c1b48a8b08c5727326ee, type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: c0beaa4d43dfab34c82941311e593f52, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -139,7 +139,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &25933313 RectTransform: @@ -207,12 +207,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 100 + m_fontSize: 70 m_fontSizeBase: 48 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 40 - m_fontSizeMax: 100 + m_fontSizeMax: 70 m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -274,7 +274,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &45143194 RectTransform: @@ -294,8 +294,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -508, y: 262} - m_SizeDelta: {x: 344.18, y: 137.037} + m_AnchoredPosition: {x: -522, y: 271} + m_SizeDelta: {x: 281.414, y: 105.65} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &45143195 MonoBehaviour: @@ -431,7 +431,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &57176556 RectTransform: @@ -506,7 +506,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &97446640 RectTransform: @@ -581,7 +581,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &131301362 RectTransform: @@ -715,7 +715,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &137976614 RectTransform: @@ -789,7 +789,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &161385499 RectTransform: @@ -877,7 +877,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &224971596 RectTransform: @@ -952,7 +952,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &265052143 RectTransform: @@ -1026,7 +1026,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &267579258 RectTransform: @@ -1113,7 +1113,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &278045805 RectTransform: @@ -1186,7 +1186,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 0 --- !u!224 &345853270 RectTransform: @@ -1225,7 +1225,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &381014087 RectTransform: @@ -1264,7 +1264,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &415922101 RectTransform: @@ -1402,7 +1402,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &418583177 RectTransform: @@ -1534,7 +1534,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &469583358 RectTransform: @@ -1602,12 +1602,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 100 + m_fontSize: 70 m_fontSizeBase: 48 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 40 - m_fontSizeMax: 100 + m_fontSizeMax: 70 m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -1666,7 +1666,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &473046398 RectTransform: @@ -1705,7 +1705,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &500113176 RectTransform: @@ -1725,8 +1725,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 584, y: 262.5} - m_SizeDelta: {x: 344.18, y: 137.037} + m_AnchoredPosition: {x: 542, y: 271} + m_SizeDelta: {x: 323.258, y: 105.65} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &500113177 MonoBehaviour: @@ -1862,7 +1862,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &543496618 RectTransform: @@ -1937,7 +1937,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &613901735 RectTransform: @@ -2012,7 +2012,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &657051350 RectTransform: @@ -2146,7 +2146,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &667505323 RectTransform: @@ -2280,7 +2280,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &679106030 RectTransform: @@ -2414,7 +2414,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &689279497 RectTransform: @@ -2488,7 +2488,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &700953894 RectTransform: @@ -2524,7 +2524,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &702502656 RectTransform: @@ -2560,7 +2560,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &706519640 RectTransform: @@ -2598,7 +2598,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &707380879 RectTransform: @@ -2677,7 +2677,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &708080829 RectTransform: @@ -2754,7 +2754,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &723630300 RectTransform: @@ -2792,7 +2792,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &756044081 RectTransform: @@ -2867,7 +2867,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &788560223 RectTransform: @@ -2942,7 +2942,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &850122247 RectTransform: @@ -3019,7 +3019,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &869851347 RectTransform: @@ -3040,7 +3040,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 398.59988, y: 109.15679} + m_AnchoredPosition: {x: 441, y: 161} m_SizeDelta: {x: 433.849, y: 95.04} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &869851348 @@ -3158,7 +3158,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &882912778 RectTransform: @@ -3233,7 +3233,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &894815528 RectTransform: @@ -3308,7 +3308,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &904662089 RectTransform: @@ -3443,7 +3443,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &913520484 RectTransform: @@ -3587,7 +3587,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &940906247 RectTransform: @@ -3660,7 +3660,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &956159987 RectTransform: @@ -3698,7 +3698,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1023402265 RectTransform: @@ -3773,7 +3773,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1066659426 RectTransform: @@ -3852,7 +3852,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1077206448 RectTransform: @@ -3986,7 +3986,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1091704718 RectTransform: @@ -4061,7 +4061,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1092561536 RectTransform: @@ -4129,12 +4129,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 100 + m_fontSize: 70 m_fontSizeBase: 48 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 40 - m_fontSizeMax: 100 + m_fontSizeMax: 70 m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -4195,7 +4195,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1131624271 RectTransform: @@ -4270,7 +4270,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1135275703 RectTransform: @@ -4404,7 +4404,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1176298483 RectTransform: @@ -4479,7 +4479,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1190063027 RectTransform: @@ -4547,12 +4547,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 100 + m_fontSize: 70 m_fontSizeBase: 48 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 40 - m_fontSizeMax: 100 + m_fontSizeMax: 70 m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -4614,7 +4614,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1190080034 RectTransform: @@ -4703,7 +4703,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1194444118 RectTransform: @@ -4837,7 +4837,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1214767796 RectTransform: @@ -4910,7 +4910,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1221937327 RectTransform: @@ -4946,7 +4946,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1226746226 RectTransform: @@ -4985,7 +4985,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 0 --- !u!224 &1247233888 RectTransform: @@ -5091,7 +5091,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1274410648 RectTransform: @@ -5146,7 +5146,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1289705711 RectTransform: @@ -5221,7 +5221,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1306183015 RectTransform: @@ -5298,7 +5298,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1324811439 RectTransform: @@ -5338,7 +5338,7 @@ GameObject: m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!81 &1386328417 AudioListener: @@ -5530,7 +5530,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1392824475 RectTransform: @@ -5550,8 +5550,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 34.5, y: 262.5} - m_SizeDelta: {x: 564.187, y: 137.037} + m_AnchoredPosition: {x: -15, y: 271} + m_SizeDelta: {x: 456.09, y: 105.654} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1392824476 MonoBehaviour: @@ -5686,7 +5686,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!108 &1421425875 Light: @@ -5706,7 +5706,7 @@ Light: m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 2 + m_Type: 0 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 @@ -5781,7 +5781,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1421471718 RectTransform: @@ -5912,7 +5912,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1463592100 RectTransform: @@ -6001,7 +6001,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!114 &1579945847 MonoBehaviour: @@ -6034,10 +6034,10 @@ MonoBehaviour: m_EditorClassIdentifier: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 + m_ScaleFactor: 0.75 m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0.5 + m_MatchWidthOrHeight: 0.7 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -6102,7 +6102,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1592739286 RectTransform: @@ -6120,8 +6120,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -576, y: 443} - m_SizeDelta: {x: -1276.463, y: -991.117} + m_AnchoredPosition: {x: -599, y: 459} + m_SizeDelta: {x: -1384.1, y: -1022.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1592739287 MonoBehaviour: @@ -6170,12 +6170,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 90 + m_fontSize: 70 m_fontSizeBase: 48 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 40 - m_fontSizeMax: 90 + m_fontSizeMax: 70 m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -6237,7 +6237,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 0 --- !u!224 &1623792962 RectTransform: @@ -6345,7 +6345,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1625972530 RectTransform: @@ -6468,7 +6468,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1671125897 RectTransform: @@ -6506,7 +6506,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 0 --- !u!224 &1704647067 RectTransform: @@ -6569,7 +6569,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1719880755 RectTransform: @@ -6673,7 +6673,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1730604440 RectTransform: @@ -6748,7 +6748,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1742719429 RectTransform: @@ -6823,7 +6823,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1798077010 RectTransform: @@ -6955,7 +6955,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 0 --- !u!224 &1804663945 RectTransform: @@ -6993,7 +6993,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1806303952 RectTransform: @@ -7012,7 +7012,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -33.1, y: -310.3921} + m_AnchoredPosition: {x: -9, y: -310.3921} m_SizeDelta: {x: 1575, y: 770.784} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1831593193 @@ -7032,7 +7032,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1831593194 RectTransform: @@ -7156,7 +7156,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1834452397 RectTransform: @@ -7259,7 +7259,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1834896933 RectTransform: @@ -7344,7 +7344,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1847040548 RectTransform: @@ -7383,7 +7383,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1865000366 RectTransform: @@ -7473,7 +7473,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1873795001 RectTransform: @@ -7492,8 +7492,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -622.68, y: -489} - m_SizeDelta: {x: 344.18, y: 137.037} + m_AnchoredPosition: {x: -653, y: -459} + m_SizeDelta: {x: 306.36, y: 98.68} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1873795002 MonoBehaviour: @@ -7682,7 +7682,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &1936420340 RectTransform: @@ -7785,7 +7785,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &2025603942 RectTransform: @@ -7889,7 +7889,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &2072009663 RectTransform: @@ -8023,7 +8023,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!224 &2079789106 RectTransform: diff --git a/3D/Assets/Scenes/MainMenu/LightingData.asset b/3D/Assets/Scenes/MainMenu/LightingData.asset new file mode 100644 index 0000000..9555aff Binary files /dev/null and b/3D/Assets/Scenes/MainMenu/LightingData.asset differ diff --git a/3D/Assets/Scenes/MainMenu/LightingData.asset.meta b/3D/Assets/Scenes/MainMenu/LightingData.asset.meta new file mode 100644 index 0000000..757aacd --- /dev/null +++ b/3D/Assets/Scenes/MainMenu/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 95f354166198c1b48a8b08c5727326ee +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3D/Assets/Scenes/MainMenu/ReflectionProbe-0.exr b/3D/Assets/Scenes/MainMenu/ReflectionProbe-0.exr new file mode 100644 index 0000000..058edba Binary files /dev/null and b/3D/Assets/Scenes/MainMenu/ReflectionProbe-0.exr differ diff --git a/3D/Assets/Scenes/MainMenu/ReflectionProbe-0.exr.meta b/3D/Assets/Scenes/MainMenu/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..5f8f521 --- /dev/null +++ b/3D/Assets/Scenes/MainMenu/ReflectionProbe-0.exr.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: de98d5191b109e64298a590d0c5c950a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/3D/Assets/Scenes/PauseMenu.unity b/3D/Assets/Scenes/PauseMenu.unity deleted file mode 100644 index 34bd61b..0000000 --- a/3D/Assets/Scenes/PauseMenu.unity +++ /dev/null @@ -1,301 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &1334713002 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1334713004} - - component: {fileID: 1334713003} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &1334713003 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1334713002} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &1334713004 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1334713002} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1408486398 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1408486401} - - component: {fileID: 1408486400} - - component: {fileID: 1408486399} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1408486399 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1408486398} - m_Enabled: 1 ---- !u!20 &1408486400 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1408486398} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1408486401 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1408486398} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/3D/UserSettings/EditorUserSettings.asset b/3D/UserSettings/EditorUserSettings.asset index 096edda..1baccad 100644 --- a/3D/UserSettings/EditorUserSettings.asset +++ b/3D/UserSettings/EditorUserSettings.asset @@ -12,10 +12,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c72111f192b292926237e38271427fb flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c72111f19563f22213229 + value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c72111f19352f223d68252320092a + value: 22424703114646680e0b0227036c72111f19563f22213229 flags: 0 vcSharedLogLevel: value: 0d5e400f0650