merge commit

This commit is contained in:
2022-04-11 18:46:10 +03:00
parent 6f7c3eaa9b
commit 82b7e7fbb2
21 changed files with 2314 additions and 1437 deletions

View File

@@ -15,7 +15,7 @@ RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.87746114, g: 0.7956361, b: 0.74937975, a: 1}
m_FogColor: {r: 0.41592866, g: 0.36391953, b: 0.5471698, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
@@ -26,8 +26,7 @@ RenderSettings:
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 3754961556890611794, guid: acded0c84d73b454aa0f31e93a7a47f6,
type: 2}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
@@ -39,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.25923243, g: 0.2534048, b: 0.27568978, a: 1}
m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -18256,7 +18255,7 @@ PrefabInstance:
- target: {fileID: 4755647111779244945, guid: 4dc735765de3bfb43825d37a57707441,
type: 3}
propertyPath: m_LocalPosition.z
value: 19.895
value: 19.944
objectReference: {fileID: 0}
- target: {fileID: 4755647111779244945, guid: 4dc735765de3bfb43825d37a57707441,
type: 3}
@@ -33361,7 +33360,7 @@ PrefabInstance:
- target: {fileID: 4755647111779244945, guid: 4dc735765de3bfb43825d37a57707441,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -0.006
objectReference: {fileID: 0}
- target: {fileID: 4755647111779244945, guid: 4dc735765de3bfb43825d37a57707441,
type: 3}
@@ -34425,7 +34424,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &1634078368
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -44916,7 +44915,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &2097260270
MonoBehaviour:
m_ObjectHideFlags: 0