Skip to content
Snippets Groups Projects
Commit 00bf7885 authored by MrWarzo's avatar MrWarzo :speech_balloon:
Browse files

Merge branch 'main' into 'main'

Correction bug de gamma

See merge request !103
parents 00cf23ff 57a50807
Branches
1 merge request!103Correction bug de gamma
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -962,7 +962,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: ui
m_StringArgument: Map_Tests1
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1656747851
......
......@@ -11,12 +11,12 @@ EditorBuildSettings:
- enabled: 0
path: Assets/Scenes/PlacementObject_1.unity
guid: 40275f15a185c5242b37076a9c27b1d1
- enabled: 1
path: Assets/Scenes/Map_Tests1.unity
guid: 32fc8cc296ff6a44ca9e752fdfb4a379
- enabled: 1
path: Assets/Scenes/Main_Menu.unity
guid: 17fb8e4df07a1f043bbb1a2d5336addc
- enabled: 1
path: Assets/Scenes/Map_Tests1.unity
guid: 32fc8cc296ff6a44ca9e752fdfb4a379
- enabled: 0
path: Assets/Scenes/ui.unity
guid: ddfc8898776cdfd4c9c465d2281ef4a3
......
......@@ -47,7 +47,7 @@ PlayerSettings:
defaultScreenWidthWeb: 960
defaultScreenHeightWeb: 600
m_StereoRenderingPath: 0
m_ActiveColorSpace: 0
m_ActiveColorSpace: 1
m_MTRendering: 1
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
iosShowActivityIndicatorOnLoading: -1
......@@ -121,7 +121,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 130
bundleVersion: 1.0
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
......@@ -409,7 +409,10 @@ PlayerSettings:
iPhone: 1
tvOS: 1
m_BuildTargetGroupLightmapEncodingQuality: []
m_BuildTargetGroupLightmapSettings: []
m_BuildTargetGroupLightmapSettings:
- m_BuildTarget: Standalone
m_TextureStreamingEnabled: 1
m_TextureStreamingPriority: 0
playModeTestRunnerEnabled: 0
runPlayModeTestAsEditModeTest: 0
actionOnDotNetUnhandledException: 1
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment