m-vz/modular-vr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update unity, fix skybox

Browse Source
This commit is contained in:
milan
2022-12-01 16:00:00 +01:00
parent 26602d3dbc
commit 88f1b19990
6 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/Desert/Assets/Prefabs/Desert XR Origin.prefab
View File

@@ -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}

4
Assets/Desert/Runtime/Puzzle C/Holes.cs
View File

@@ -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;
}
};

4
Assets/Scenes/TestScene.unity
View File

@@ -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:

2
Packages/manifest.json
View File

@@ -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",

12
Packages/packages-lock.json
View File

@@ -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"
}
},

4
ProjectSettings/ProjectVersion.txt
View File

@@ -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)