diff --git a/Assets/Escape Room Engine/Desert/Materials/Desert Floor.mat b/Assets/Escape Room Engine/Desert/Materials/Desert Floor.mat index 538106e..a5f1e90 100644 --- a/Assets/Escape Room Engine/Desert/Materials/Desert Floor.mat +++ b/Assets/Escape Room Engine/Desert/Materials/Desert Floor.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Desert Floor m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _METALLICSPECGLOSSMAP - _NORMALMAP @@ -21,6 +23,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -126,4 +129,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Escape Room Engine/Desert/Materials/Space Floor.mat b/Assets/Escape Room Engine/Desert/Materials/Space Floor.mat index 13a52f6..3befd9b 100644 --- a/Assets/Escape Room Engine/Desert/Materials/Space Floor.mat +++ b/Assets/Escape Room Engine/Desert/Materials/Space Floor.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Space Floor m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _METALLICSPECGLOSSMAP - _NORMALMAP @@ -22,6 +24,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -133,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Holo.mat b/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Holo.mat index 4a15cb4..781f7e9 100644 --- a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Holo.mat +++ b/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Holo.mat @@ -10,6 +10,8 @@ Material: m_Name: Holo m_Shader: {fileID: -6465566751694194690, guid: a8038611270959146bc1906238005866, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -136,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Light.mat b/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Light.mat index 873e2c8..2370567 100644 --- a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Light.mat +++ b/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Light.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Light m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _EMISSION - _METALLICSPECGLOSSMAP @@ -22,6 +24,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -127,4 +130,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Ring and Crystal.mat b/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Ring and Crystal.mat index 2e8ae4e..ad2baf0 100644 --- a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Ring and Crystal.mat +++ b/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Ring and Crystal.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Ring and Crystal m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _METALLICSPECGLOSSMAP - _NORMALMAP @@ -21,6 +23,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -126,4 +129,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Sphere.mat b/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Sphere.mat index c2088b7..3e635b4 100644 --- a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Sphere.mat +++ b/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Sphere.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Sphere m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _METALLICSPECGLOSSMAP - _NORMALMAP @@ -21,6 +23,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -126,4 +129,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Terminal.mat b/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Terminal.mat index 2eac4c5..9394c5e 100644 --- a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Terminal.mat +++ b/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Materials/Terminal.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Terminal m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _EMISSION - _METALLICSPECGLOSSMAP @@ -35,6 +37,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Escape Room Engine/Engine/Materials/Generic Material A.mat b/Assets/Escape Room Engine/Engine/Materials/Generic Material A.mat index a242500..c4cacb8 100644 --- a/Assets/Escape Room Engine/Engine/Materials/Generic Material A.mat +++ b/Assets/Escape Room Engine/Engine/Materials/Generic Material A.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Generic Material A m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Escape Room Engine/Engine/Materials/Generic Material B.mat b/Assets/Escape Room Engine/Engine/Materials/Generic Material B.mat index e6e5a3b..1049324 100644 --- a/Assets/Escape Room Engine/Engine/Materials/Generic Material B.mat +++ b/Assets/Escape Room Engine/Engine/Materials/Generic Material B.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Generic Material B m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Escape Room Engine/Engine/Materials/Generic Material C.mat b/Assets/Escape Room Engine/Engine/Materials/Generic Material C.mat index 35612ed..6d046cc 100644 --- a/Assets/Escape Room Engine/Engine/Materials/Generic Material C.mat +++ b/Assets/Escape Room Engine/Engine/Materials/Generic Material C.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Generic Material C m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Escape Room Engine/Player/Materials/Hand.mat b/Assets/Escape Room Engine/Player/Materials/Hand.mat index c075cc8..d0ac555 100644 --- a/Assets/Escape Room Engine/Player/Materials/Hand.mat +++ b/Assets/Escape Room Engine/Player/Materials/Hand.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hand m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Escape Room Engine/Test Assets/Materials/Interactable Metal.mat b/Assets/Escape Room Engine/Test Assets/Materials/Interactable Metal.mat index 10dd085..ce4ec71 100644 --- a/Assets/Escape Room Engine/Test Assets/Materials/Interactable Metal.mat +++ b/Assets/Escape Room Engine/Test Assets/Materials/Interactable Metal.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Interactable Metal m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Escape Room Engine/Test Assets/Materials/Interactable Plastic.mat b/Assets/Escape Room Engine/Test Assets/Materials/Interactable Plastic.mat index 1182013..8e3b40d 100644 --- a/Assets/Escape Room Engine/Test Assets/Materials/Interactable Plastic.mat +++ b/Assets/Escape Room Engine/Test Assets/Materials/Interactable Plastic.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Interactable Plastic m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Escape Room Engine/Test Assets/Materials/Light.mat b/Assets/Escape Room Engine/Test Assets/Materials/Light.mat index 3b24d29..652a41d 100644 --- a/Assets/Escape Room Engine/Test Assets/Materials/Light.mat +++ b/Assets/Escape Room Engine/Test Assets/Materials/Light.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Light m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _EMISSION m_InvalidKeywords: [] @@ -32,6 +34,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Escape Room Engine/Test Assets/Materials/World A.mat b/Assets/Escape Room Engine/Test Assets/Materials/World A.mat index a83c46d..15fb43d 100644 --- a/Assets/Escape Room Engine/Test Assets/Materials/World A.mat +++ b/Assets/Escape Room Engine/Test Assets/Materials/World A.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: World A m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Escape Room Engine/Test Assets/Materials/World B.mat b/Assets/Escape Room Engine/Test Assets/Materials/World B.mat index 7c4552d..db627c7 100644 --- a/Assets/Escape Room Engine/Test Assets/Materials/World B.mat +++ b/Assets/Escape Room Engine/Test Assets/Materials/World B.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: World B m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Escape Room Engine/Test Assets/Materials/World C.mat b/Assets/Escape Room Engine/Test Assets/Materials/World C.mat index 324aeb7..581d604 100644 --- a/Assets/Escape Room Engine/Test Assets/Materials/World C.mat +++ b/Assets/Escape Room Engine/Test Assets/Materials/World C.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: World C m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Escape Room Engine/Test Assets/Materials/World D.mat b/Assets/Escape Room Engine/Test Assets/Materials/World D.mat index 67c1bc0..8034647 100644 --- a/Assets/Escape Room Engine/Test Assets/Materials/World D.mat +++ b/Assets/Escape Room Engine/Test Assets/Materials/World D.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: World D m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db index e2746f2..59ade45 100644 Binary files a/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db and b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db differ diff --git a/Packages/manifest.json b/Packages/manifest.json index 1e0d9f1..90e00a1 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,14 +1,13 @@ { "dependencies": { "com.dbrizov.naughtyattributes": "https://github.com/dbrizov/NaughtyAttributes.git#upm", - "com.unity.collab-proxy": "1.17.6", "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": "12.1.7", + "com.unity.render-pipelines.universal": "13.1.8", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", + "com.unity.timeline": "1.7.2", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.7.8", "com.unity.xr.interaction.toolkit": "2.0.4", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 02fca94..5b75a98 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -8,7 +8,7 @@ "hash": "8a8fa5a9659a6d63f196391c71e06c4286c8acd7" }, "com.unity.burst": { - "version": "1.7.3", + "version": "1.7.4", "depth": 1, "source": "registry", "dependencies": { @@ -16,15 +16,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.collab-proxy": { - "version": "1.17.6", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, - "url": "https://packages.unity.com" - }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, @@ -58,7 +49,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.4.3", + "version": "1.4.4", "depth": 1, "source": "registry", "dependencies": { @@ -73,15 +64,8 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.render-pipelines.core": { - "version": "12.1.7", + "version": "13.1.8", "depth": 1, "source": "builtin", "dependencies": { @@ -91,45 +75,34 @@ } }, "com.unity.render-pipelines.universal": { - "version": "12.1.7", + "version": "13.1.8", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.7.3", - "com.unity.render-pipelines.core": "12.1.7", - "com.unity.shadergraph": "12.1.7" + "com.unity.render-pipelines.core": "13.1.8", + "com.unity.shadergraph": "13.1.8" } }, "com.unity.searcher": { - "version": "4.9.1", + "version": "4.9.2", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.services.core": { - "version": "1.5.2", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.modules.androidjni": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.shadergraph": { - "version": "12.1.7", + "version": "13.1.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.7", - "com.unity.searcher": "4.9.1" + "com.unity.render-pipelines.core": "13.1.8", + "com.unity.searcher": "4.9.2" } }, "com.unity.subsystemregistration": { - "version": "1.1.0", + "version": "1.1.1", "depth": 2, "source": "registry", "dependencies": { @@ -158,7 +131,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.7.2", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index e83d161..48925a4 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.13f1 -m_EditorVersionWithRevision: 2021.3.13f1 (9e7d58001ecf) +m_EditorVersion: 2022.1.23f1 +m_EditorVersionWithRevision: 2022.1.23f1 (9636b062134a) diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset index c1f118a..4fae4e6 100644 --- a/ProjectSettings/URPProjectSettings.asset +++ b/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 5 + m_LastMaterialVersion: 6 diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29..0000000