From a0cf743f4ef0553f7772e5084560d79995fc4476 Mon Sep 17 00:00:00 2001 From: vladimir-d Date: Tue, 15 Nov 2022 16:19:08 +0500 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=A1?= =?UTF-8?q?=D0=BE=D0=BB=D0=BD=D0=B5=D1=87=D0=BD=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Bakery/ftGlobalStorage.asset | 4 +- Assets/Scenes/Logo.unity | 2 +- Assets/Scenes/StationSolnechnaya.unity | 58 ++++++++++++++++++++++---- 3 files changed, 55 insertions(+), 9 deletions(-) diff --git a/Assets/Bakery/ftGlobalStorage.asset b/Assets/Bakery/ftGlobalStorage.asset index 38c5537..9d68913 100644 --- a/Assets/Bakery/ftGlobalStorage.asset +++ b/Assets/Bakery/ftGlobalStorage.asset @@ -456,7 +456,9 @@ MonoBehaviour: - Assets/Models/Ivolga2/ivolga_2_wagon_decals.fbx - Assets/Models/Ivolga2/ivolga_2_wagon.fbx - Assets/Models/Ivolga2/ivolga_2_locomoto_decals.fbx - uvOverlapAssetList: 00000000ffffffff01010000000000000000000000000000010100000101000001010000010100000101000001010000010100000101000001010000010100000101000001010000000000000101000001010000010100000000000001010000000000000101000000000000010100000000000000000000010100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + - Assets/Models/StationSherbinka/SM_Suka_liniya_platformi.fbx + - Assets/Models/StationSherbinka/SM_Sherbinka_Znak.fbx + uvOverlapAssetList: 00000000ffffffff010100000000000000000000000000000101000001010000010100000101000001010000010100000101000001010000010100000101000001010000010100000000000001010000010100000101000000000000010100000000000001010000000000000101000000000000000000000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 xatlasWarningShown: 0 foundCompatibleSetup: 1 gpuName: NVIDIA GeForce RTX 2060 diff --git a/Assets/Scenes/Logo.unity b/Assets/Scenes/Logo.unity index d7031c3..44d54d3 100644 --- a/Assets/Scenes/Logo.unity +++ b/Assets/Scenes/Logo.unity @@ -15484,7 +15484,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &2102164629 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/StationSolnechnaya.unity b/Assets/Scenes/StationSolnechnaya.unity index f758fd0..a5eba2d 100644 --- a/Assets/Scenes/StationSolnechnaya.unity +++ b/Assets/Scenes/StationSolnechnaya.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4706417, g: 0.6250053, b: 0.86552364, a: 1} + m_IndirectSpecularColor: {r: 0.4678028, g: 0.62128484, b: 0.861514, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -18650,13 +18650,29 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2870708440658277367, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2870708440658277367, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2870708440658277367, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3214759456207710541, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5958147348918686101, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 6477381185575815983, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_LocalPosition.x - value: -0.277 + value: -0.79 objectReference: {fileID: 0} - target: {fileID: 6477381185575815983, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_LocalPosition.y @@ -18676,15 +18692,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6804656066269272005, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_LocalPosition.y - value: -1.938 + value: -1.19 objectReference: {fileID: 0} - target: {fileID: 6804656066269272005, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_LocalPosition.z - value: -6.23 + value: -3.88 objectReference: {fileID: 0} - target: {fileID: 6804656066269272005, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.7046343 objectReference: {fileID: 0} - target: {fileID: 6804656066269272005, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_LocalRotation.x @@ -18692,7 +18708,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6804656066269272005, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_LocalRotation.y - value: 0.7071068 + value: 0.7095707 objectReference: {fileID: 0} - target: {fileID: 6804656066269272005, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_LocalRotation.z @@ -18704,7 +18720,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6804656066269272005, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90 + value: 90.4 objectReference: {fileID: 0} - target: {fileID: 6804656066269272005, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -18722,6 +18738,34 @@ PrefabInstance: propertyPath: m_Name value: '[LOCOMOTIVE HANDLER]' objectReference: {fileID: 0} + - target: {fileID: 7241138577998217479, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7241138577998217479, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7241138577998217479, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7241138577998217479, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7241138577998217479, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7241138577998217479, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8013699821485841341, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 22df742bdbc592d4a8b7ace8d879df8e, type: 3} --- !u!21 &937342358