Skip to content
Snippets Groups Projects
Commit e4ee9e3b authored by Sofiane Lasri's avatar Sofiane Lasri
Browse files

fixed broken menu scene

parent f62bca92
No related branches found
No related tags found
No related merge requests found
...@@ -38,11 +38,7 @@ RenderSettings: ...@@ -38,11 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
<<<<<<< Updated upstream
m_IndirectSpecularColor: {r: 0.4514196, g: 0.5008462, b: 0.5719757, a: 1} m_IndirectSpecularColor: {r: 0.4514196, g: 0.5008462, b: 0.5719757, a: 1}
=======
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
>>>>>>> Stashed changes
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
......
...@@ -4,16 +4,5 @@ ...@@ -4,16 +4,5 @@
EditorBuildSettings: EditorBuildSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Scenes: m_Scenes: []
- enabled: 1
<<<<<<< Updated upstream
path: Assets/Scenes/MainMenu.unity
guid: 50c5b4897a71dc64399811a98a1eae49
=======
path: Assets/Scenes/Hub.unity
guid: 548ff420e1a556f44ab8d1326b7d9200
- enabled: 1
path: Assets/Scenes/SampleScene.unity
guid: 9fc0d4010bbf28b4594072e72b8655ab
>>>>>>> Stashed changes
m_configObjects: {} m_configObjects: {}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment