From 88f1b19990c1daa25eeadc9d39fc2de33d833b6f Mon Sep 17 00:00:00 2001 From: milan Date: Thu, 1 Dec 2022 16:00:00 +0100 Subject: [PATCH] update unity, fix skybox --- .../Desert/Assets/Prefabs/Desert XR Origin.prefab | 15 +++++++++++++++ Assets/Desert/Runtime/Puzzle C/Holes.cs | 4 ++-- Assets/Scenes/TestScene.unity | 4 ++-- Packages/manifest.json | 2 +- Packages/packages-lock.json | 12 ++++++------ ProjectSettings/ProjectVersion.txt | 4 ++-- 6 files changed, 28 insertions(+), 13 deletions(-) diff --git a/Assets/Desert/Assets/Prefabs/Desert XR Origin.prefab b/Assets/Desert/Assets/Prefabs/Desert XR Origin.prefab index 5f672ad..5a4f928 100644 --- a/Assets/Desert/Assets/Prefabs/Desert XR Origin.prefab +++ b/Assets/Desert/Assets/Prefabs/Desert XR Origin.prefab @@ -93,3 +93,18 @@ PrefabInstance: m_RemovedComponents: [] m_AddedGameObjects: [] m_SourcePrefab: {fileID: 100100000, guid: c84e0198f66a41b4294f6e8e585192a4, type: 3} +--- !u!1 &6854256365856247459 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 419816428804372187, guid: c84e0198f66a41b4294f6e8e585192a4, + type: 3} + m_PrefabInstance: {fileID: 6542684658370590840} + m_PrefabAsset: {fileID: 0} +--- !u!45 &542038026734091070 +Skybox: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6854256365856247459} + m_Enabled: 1 + m_CustomSkybox: {fileID: 2100000, guid: b543b13595b5be247a0ef19ffdc5344b, type: 2} diff --git a/Assets/Desert/Runtime/Puzzle C/Holes.cs b/Assets/Desert/Runtime/Puzzle C/Holes.cs index 5f04582..ebd15b2 100644 --- a/Assets/Desert/Runtime/Puzzle C/Holes.cs +++ b/Assets/Desert/Runtime/Puzzle C/Holes.cs @@ -41,7 +41,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C hole.Emission.color = _puzzleColor.hdr; }); frameLight.color = _puzzleColor.hdr; - _dispenser.Solved = false; + _dispenser.Reset(); break; case PuzzleEventType.Solved: _holes.ForEach(hole => @@ -50,7 +50,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C hole.Emission.color = solution[hole.number] == 1 ? _activeColor.hdr : _solvedColor.hdr; }); frameLight.color = _solvedColor.hdr; - _dispenser.Solved = true; + _dispenser.Solve(); break; } }; diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index 64b8f33..230d931 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -26,7 +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: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_SkyboxMaterial: {fileID: 2100000, guid: b543b13595b5be247a0ef19ffdc5344b, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -39,7 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 7995536730365897021, guid: 0000000000000000d000000000000000, type: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18373267, g: 0.22818318, b: 0.29914957, a: 1} + m_IndirectSpecularColor: {r: 0.13511999, g: 0.18402225, b: 0.29053703, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: diff --git a/Packages/manifest.json b/Packages/manifest.json index 90e00a1..6dc66b8 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,7 +4,7 @@ "com.unity.ide.rider": "3.0.16", "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", - "com.unity.render-pipelines.universal": "13.1.8", + "com.unity.render-pipelines.universal": "13.1.9", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.2", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 5b75a98..760ada0 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -65,7 +65,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "13.1.8", + "version": "13.1.9", "depth": 1, "source": "builtin", "dependencies": { @@ -75,14 +75,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "13.1.8", + "version": "13.1.9", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.7.3", - "com.unity.render-pipelines.core": "13.1.8", - "com.unity.shadergraph": "13.1.8" + "com.unity.render-pipelines.core": "13.1.9", + "com.unity.shadergraph": "13.1.9" } }, "com.unity.searcher": { @@ -93,11 +93,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "13.1.8", + "version": "13.1.9", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "13.1.8", + "com.unity.render-pipelines.core": "13.1.9", "com.unity.searcher": "4.9.2" } }, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 48925a4..ab1578c 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.1.23f1 -m_EditorVersionWithRevision: 2022.1.23f1 (9636b062134a) +m_EditorVersion: 2022.1.24f1 +m_EditorVersionWithRevision: 2022.1.24f1 (709dddfb713f)