diff --git a/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Floor_BaseMap.mat b/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Floor_BaseMap.mat index 8f73b84..5edb1b1 100644 --- a/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Floor_BaseMap.mat +++ b/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Floor_BaseMap.mat @@ -116,10 +116,10 @@ Material: - _DstBlend: 0 - _DstBlendAlpha: 0 - _EchoOpacity1: 0 - - _EchoOpacity2: 0.3193835 + - _EchoOpacity2: 0 - _EchoOpacity3: 0 - _EchoRadius1: 0 - - _EchoRadius2: 4.493115 + - _EchoRadius2: 0 - _EchoRadius3: 0 - _EnvironmentReflections: 1 - _FresnelPower: 2.5 @@ -162,9 +162,9 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EchoColor: {r: 4, g: 3.026, b: 1.049, a: 1} - _EchoCoreColor: {r: 7.5, g: 5.5, b: 2.2, a: 1} - - _EchoPosition1: {r: -37.285122, g: 0.12999992, b: -36.339718, a: 1} - - _EchoPosition2: {r: -36.50726, g: 0.12999992, b: -36.424538, a: 1} - - _EchoPosition3: {r: -37.424873, g: 0.13000004, b: -36.465725, a: 1} + - _EchoPosition1: {r: 2.2242002, g: 0.12999992, b: 40.5673, a: 1} + - _EchoPosition2: {r: 0, g: 0, b: 14.193845, a: 1} + - _EchoPosition3: {r: 0, g: 0, b: 14.193845, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _WaveCenter: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Glass_BaseMap 1.mat b/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Glass_BaseMap 1.mat index 2e98d42..3b61352 100644 --- a/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Glass_BaseMap 1.mat +++ b/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Glass_BaseMap 1.mat @@ -100,10 +100,10 @@ Material: - _DstBlend: 0 - _DstBlendAlpha: 0 - _EchoOpacity1: 0 - - _EchoOpacity2: 0.3193835 + - _EchoOpacity2: 0 - _EchoOpacity3: 0 - _EchoRadius1: 0 - - _EchoRadius2: 4.493115 + - _EchoRadius2: 0 - _EchoRadius3: 0 - _EnvironmentReflections: 1 - _FresnelPower: 2.5 @@ -144,9 +144,9 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EchoColor: {r: 4, g: 3.026, b: 1.049, a: 1} - _EchoCoreColor: {r: 7.5, g: 5.5, b: 2.2, a: 1} - - _EchoPosition1: {r: -37.285122, g: 0.12999992, b: -36.339718, a: 1} - - _EchoPosition2: {r: -36.50726, g: 0.12999992, b: -36.424538, a: 1} - - _EchoPosition3: {r: -37.424873, g: 0.13000004, b: -36.465725, a: 1} + - _EchoPosition1: {r: 2.2242002, g: 0.12999992, b: 40.5673, a: 1} + - _EchoPosition2: {r: 0, g: 0, b: 14.193845, a: 1} + - _EchoPosition3: {r: 0, g: 0, b: 14.193845, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _WaveCenter: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Glass_BaseMap.mat b/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Glass_BaseMap.mat index 0cc17ed..2783cf7 100644 --- a/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Glass_BaseMap.mat +++ b/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Glass_BaseMap.mat @@ -101,10 +101,10 @@ Material: - _DstBlend: 0 - _DstBlendAlpha: 0 - _EchoOpacity1: 0 - - _EchoOpacity2: 0.3193835 + - _EchoOpacity2: 0 - _EchoOpacity3: 0 - _EchoRadius1: 0 - - _EchoRadius2: 4.493115 + - _EchoRadius2: 0 - _EchoRadius3: 0 - _EnvironmentReflections: 1 - _FresnelPower: 2.5 @@ -147,9 +147,9 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EchoColor: {r: 4, g: 3.026, b: 1.049, a: 1} - _EchoCoreColor: {r: 7.5, g: 5.5, b: 2.2, a: 1} - - _EchoPosition1: {r: -37.285122, g: 0.12999992, b: -36.339718, a: 1} - - _EchoPosition2: {r: -36.50726, g: 0.12999992, b: -36.424538, a: 1} - - _EchoPosition3: {r: -37.424873, g: 0.13000004, b: -36.465725, a: 1} + - _EchoPosition1: {r: 2.2242002, g: 0.12999992, b: 40.5673, a: 1} + - _EchoPosition2: {r: 0, g: 0, b: 14.193845, a: 1} + - _EchoPosition3: {r: 0, g: 0, b: 14.193845, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _WaveCenter: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Other_01_BaseMap.mat b/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Other_01_BaseMap.mat index a253098..c70cdac 100644 --- a/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Other_01_BaseMap.mat +++ b/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Other_01_BaseMap.mat @@ -116,10 +116,10 @@ Material: - _DstBlend: 0 - _DstBlendAlpha: 0 - _EchoOpacity1: 0 - - _EchoOpacity2: 0.3193835 + - _EchoOpacity2: 0 - _EchoOpacity3: 0 - _EchoRadius1: 0 - - _EchoRadius2: 4.493115 + - _EchoRadius2: 0 - _EchoRadius3: 0 - _EnvironmentReflections: 1 - _FresnelPower: 2.5 @@ -162,9 +162,9 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EchoColor: {r: 4, g: 3.026, b: 1.049, a: 1} - _EchoCoreColor: {r: 7.5, g: 5.5, b: 2.2, a: 1} - - _EchoPosition1: {r: -37.285122, g: 0.12999992, b: -36.339718, a: 1} - - _EchoPosition2: {r: -36.50726, g: 0.12999992, b: -36.424538, a: 1} - - _EchoPosition3: {r: -37.424873, g: 0.13000004, b: -36.465725, a: 1} + - _EchoPosition1: {r: 2.2242002, g: 0.12999992, b: 40.5673, a: 1} + - _EchoPosition2: {r: 0, g: 0, b: 14.193845, a: 1} + - _EchoPosition3: {r: 0, g: 0, b: 14.193845, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _WaveCenter: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Others_BaseMap.mat b/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Others_BaseMap.mat index c172cd6..3c6d078 100644 --- a/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Others_BaseMap.mat +++ b/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Others_BaseMap.mat @@ -103,10 +103,10 @@ Material: - _DstBlend: 0 - _DstBlendAlpha: 0 - _EchoOpacity1: 0 - - _EchoOpacity2: 0.3193835 + - _EchoOpacity2: 0 - _EchoOpacity3: 0 - _EchoRadius1: 0 - - _EchoRadius2: 4.493115 + - _EchoRadius2: 0 - _EchoRadius3: 0 - _EnvironmentReflections: 1 - _FresnelPower: 2.5 @@ -149,9 +149,9 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EchoColor: {r: 4, g: 3.026, b: 1.049, a: 1} - _EchoCoreColor: {r: 7.5, g: 5.5, b: 2.2, a: 1} - - _EchoPosition1: {r: -37.285122, g: 0.12999992, b: -36.339718, a: 1} - - _EchoPosition2: {r: -36.50726, g: 0.12999992, b: -36.424538, a: 1} - - _EchoPosition3: {r: -37.424873, g: 0.13000004, b: -36.465725, a: 1} + - _EchoPosition1: {r: 2.2242002, g: 0.12999992, b: 40.5673, a: 1} + - _EchoPosition2: {r: 0, g: 0, b: 14.193845, a: 1} + - _EchoPosition3: {r: 0, g: 0, b: 14.193845, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _WaveCenter: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Wood_BaseMap.mat b/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Wood_BaseMap.mat index 1c98297..521ae44 100644 --- a/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Wood_BaseMap.mat +++ b/Assets/3D Laboratory Environment with Appratus/Materials/Laboratory03_Wood_BaseMap.mat @@ -102,10 +102,10 @@ Material: - _DstBlend: 0 - _DstBlendAlpha: 0 - _EchoOpacity1: 0 - - _EchoOpacity2: 0.3193835 + - _EchoOpacity2: 0 - _EchoOpacity3: 0 - _EchoRadius1: 0 - - _EchoRadius2: 4.493115 + - _EchoRadius2: 0 - _EchoRadius3: 0 - _EnvironmentReflections: 1 - _FresnelPower: 2.5 @@ -148,9 +148,9 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EchoColor: {r: 4, g: 3.026, b: 1.049, a: 1} - _EchoCoreColor: {r: 7.5, g: 5.5, b: 2.2, a: 1} - - _EchoPosition1: {r: -37.285122, g: 0.12999992, b: -36.339718, a: 1} - - _EchoPosition2: {r: -36.50726, g: 0.12999992, b: -36.424538, a: 1} - - _EchoPosition3: {r: -37.424873, g: 0.13000004, b: -36.465725, a: 1} + - _EchoPosition1: {r: 2.2242002, g: 0.12999992, b: 40.5673, a: 1} + - _EchoPosition2: {r: 0, g: 0, b: 14.193845, a: 1} + - _EchoPosition3: {r: 0, g: 0, b: 14.193845, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _WaveCenter: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/3D Laboratory Environment with Appratus/Materials/lambert1.mat b/Assets/3D Laboratory Environment with Appratus/Materials/lambert1.mat index cab7e88..237df46 100644 --- a/Assets/3D Laboratory Environment with Appratus/Materials/lambert1.mat +++ b/Assets/3D Laboratory Environment with Appratus/Materials/lambert1.mat @@ -73,10 +73,10 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EchoOpacity1: 0 - - _EchoOpacity2: 0.3193835 + - _EchoOpacity2: 0 - _EchoOpacity3: 0 - _EchoRadius1: 0 - - _EchoRadius2: 4.493115 + - _EchoRadius2: 0 - _EchoRadius3: 0 - _FresnelPower: 2.5 - _FresnelStrength: 0.4 @@ -110,9 +110,9 @@ Material: - _Color: {r: 0, g: 0, b: 0, a: 1} - _EchoColor: {r: 4, g: 3.026, b: 1.049, a: 1} - _EchoCoreColor: {r: 7.5, g: 5.5, b: 2.2, a: 1} - - _EchoPosition1: {r: -37.285122, g: 0.12999992, b: -36.339718, a: 1} - - _EchoPosition2: {r: -36.50726, g: 0.12999992, b: -36.424538, a: 1} - - _EchoPosition3: {r: -37.424873, g: 0.13000004, b: -36.465725, a: 1} + - _EchoPosition1: {r: 2.2242002, g: 0.12999992, b: 40.5673, a: 1} + - _EchoPosition2: {r: 0, g: 0, b: 14.193845, a: 1} + - _EchoPosition3: {r: 0, g: 0, b: 14.193845, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _WaveCenter: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/EchoCloudMat.mat b/Assets/EchoCloudMat.mat index e1fb0b9..6358675 100644 --- a/Assets/EchoCloudMat.mat +++ b/Assets/EchoCloudMat.mat @@ -63,10 +63,10 @@ Material: - _ColorRevealIntensity: 1.6 - _ColorRevealSharpness: 1 - _EchoOpacity1: 0 - - _EchoOpacity2: 0.3193835 + - _EchoOpacity2: 0 - _EchoOpacity3: 0 - _EchoRadius1: 0 - - _EchoRadius2: 4.493115 + - _EchoRadius2: 0 - _EchoRadius3: 0 - _FresnelPower: 2.5 - _FresnelStrength: 0.4 @@ -87,9 +87,9 @@ Material: - _BaseColor: {r: 0.015, g: 0.015, b: 0.02, a: 1} - _EchoColor: {r: 4, g: 3.026, b: 1.049, a: 1} - _EchoCoreColor: {r: 7.5, g: 5.5, b: 2.2, a: 1} - - _EchoPosition1: {r: -37.285122, g: 0.12999992, b: -36.339718, a: 1} - - _EchoPosition2: {r: -36.50726, g: 0.12999992, b: -36.424538, a: 1} - - _EchoPosition3: {r: -37.424873, g: 0.13000004, b: -36.465725, a: 1} + - _EchoPosition1: {r: 2.2242002, g: 0.12999992, b: 40.5673, a: 1} + - _EchoPosition2: {r: 0, g: 0, b: 14.193845, a: 1} + - _EchoPosition3: {r: 0, g: 0, b: 14.193845, a: 1} - _WaveCenter: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 9023435..80a2ec1 100644 Binary files a/Assets/Scenes/SampleScene.unity and b/Assets/Scenes/SampleScene.unity differ diff --git a/Assets/Scripts/Editor/LevelStoryBuilder.cs b/Assets/Scripts/Editor/LevelStoryBuilder.cs index f2553ba..9a1c88d 100644 --- a/Assets/Scripts/Editor/LevelStoryBuilder.cs +++ b/Assets/Scripts/Editor/LevelStoryBuilder.cs @@ -126,7 +126,8 @@ public static class LevelStoryBuilder terminalComp.statusLight = statusLight; terminalComp.screenRenderer = screenBox.GetComponent(); - CreateWorldText(console.transform, new Vector3(0f, 1.7f, 0f), "ТЕРМИНАЛ ЛИФТА\n[ВВЕДИТЕ 4 ЦИФРЫ]", new Color(1f, 0.85f, 0.1f), 0.035f); + // 3D текстовая подсказка отключена по запросу пользователя (убрана желтая надпись ТЕРМИНАЛ ЛИФТА) + // CreateWorldText(console.transform, new Vector3(0f, 1.7f, 0f), "ТЕРМИНАЛ ЛИФТА\n[ВВЕДИТЕ 4 ЦИФРЫ]", new Color(1f, 0.85f, 0.1f), 0.035f); } private static void CreateElevatorFrame(Transform parent) @@ -155,7 +156,8 @@ public static class LevelStoryBuilder beam.transform.localScale = new Vector3(6f, 0.4f, 0.3f); if (echoMat != null) beam.GetComponent().sharedMaterial = echoMat; - CreateWorldText(parent, new Vector3(0f, 4.3f, -3.1f), "ВЫХОД: ЭВАКУАЦИОННЫЙ ЛИФТ (УРОВЕНЬ 2)", new Color(1f, 0.85f, 0.1f), 0.05f); + // 3D текстовая подсказка отключена по запросу пользователя (убрана желтая надпись ВЫХОД: ЭВАКУАЦИОННЫЙ ЛИФТ) + // CreateWorldText(parent, new Vector3(0f, 4.3f, -3.1f), "ВЫХОД: ЭВАКУАЦИОННЫЙ ЛИФТ (УРОВЕНЬ 2)", new Color(1f, 0.85f, 0.1f), 0.05f); } private static void SetupFourStoryNotes() diff --git a/Assets/room/Cosmic_Retro_Laboratory_2_Demo/Materials/Cosmic_Retro.mat b/Assets/room/Cosmic_Retro_Laboratory_2_Demo/Materials/Cosmic_Retro.mat index 2a807c4..900da04 100644 --- a/Assets/room/Cosmic_Retro_Laboratory_2_Demo/Materials/Cosmic_Retro.mat +++ b/Assets/room/Cosmic_Retro_Laboratory_2_Demo/Materials/Cosmic_Retro.mat @@ -101,10 +101,10 @@ Material: - _DstBlend: 0 - _DstBlendAlpha: 0 - _EchoOpacity1: 0 - - _EchoOpacity2: 0.3193835 + - _EchoOpacity2: 0 - _EchoOpacity3: 0 - _EchoRadius1: 0 - - _EchoRadius2: 4.493115 + - _EchoRadius2: 0 - _EchoRadius3: 0 - _EnvironmentReflections: 1 - _FresnelPower: 2.5 @@ -143,9 +143,9 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EchoColor: {r: 4, g: 3.026, b: 1.049, a: 1} - _EchoCoreColor: {r: 7.5, g: 5.5, b: 2.2, a: 1} - - _EchoPosition1: {r: -37.285122, g: 0.12999992, b: -36.339718, a: 1} - - _EchoPosition2: {r: -36.50726, g: 0.12999992, b: -36.424538, a: 1} - - _EchoPosition3: {r: -37.424873, g: 0.13000004, b: -36.465725, a: 1} + - _EchoPosition1: {r: 2.2242002, g: 0.12999992, b: 40.5673, a: 1} + - _EchoPosition2: {r: 0, g: 0, b: 14.193845, a: 1} + - _EchoPosition3: {r: 0, g: 0, b: 14.193845, a: 1} - _EmissionColor: {r: 0.5849056, g: 0.5849056, b: 0.5849056, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _WaveCenter: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/room/Cosmic_Retro_Laboratory_2_Demo/Materials/Cosmic_Retro_Opacity.mat b/Assets/room/Cosmic_Retro_Laboratory_2_Demo/Materials/Cosmic_Retro_Opacity.mat index d19ee8b..76f9353 100644 --- a/Assets/room/Cosmic_Retro_Laboratory_2_Demo/Materials/Cosmic_Retro_Opacity.mat +++ b/Assets/room/Cosmic_Retro_Laboratory_2_Demo/Materials/Cosmic_Retro_Opacity.mat @@ -106,10 +106,10 @@ Material: - _DstBlend: 10 - _DstBlendAlpha: 10 - _EchoOpacity1: 0 - - _EchoOpacity2: 0.3193835 + - _EchoOpacity2: 0 - _EchoOpacity3: 0 - _EchoRadius1: 0 - - _EchoRadius2: 4.493115 + - _EchoRadius2: 0 - _EchoRadius3: 0 - _EnvironmentReflections: 1 - _FresnelPower: 2.5 @@ -158,9 +158,9 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 0.2901961} - _EchoColor: {r: 4, g: 3.026, b: 1.049, a: 1} - _EchoCoreColor: {r: 7.5, g: 5.5, b: 2.2, a: 1} - - _EchoPosition1: {r: -37.285122, g: 0.12999992, b: -36.339718, a: 1} - - _EchoPosition2: {r: -36.50726, g: 0.12999992, b: -36.424538, a: 1} - - _EchoPosition3: {r: -37.424873, g: 0.13000004, b: -36.465725, a: 1} + - _EchoPosition1: {r: 2.2242002, g: 0.12999992, b: 40.5673, a: 1} + - _EchoPosition2: {r: 0, g: 0, b: 14.193845, a: 1} + - _EchoPosition3: {r: 0, g: 0, b: 14.193845, a: 1} - _EmissionColor: {r: 0.3018868, g: 0.3018868, b: 0.3018868, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _UvOffset: {r: 0, g: 0, b: 0, a: 0}