From ea9aeec93be9013040b3b3ef5b03ada877136429 Mon Sep 17 00:00:00 2001 From: Benjamin Kraft Date: Fri, 2 Sep 2022 13:53:19 +0200 Subject: [PATCH] Upgraded to Unity 2022, which changed all materials --- .../Materials/Game/Circuits/Base/Base 0.mat | 5 ++- .../Materials/Game/Circuits/Base/Base 1.mat | 5 ++- .../Materials/Game/Circuits/Base/Base 2.mat | 5 ++- .../Materials/Game/Circuits/Base/Base 3.mat | 5 ++- .../Materials/Game/Circuits/Base/Base 4.mat | 5 ++- .../Materials/Game/Circuits/Base/Base 5.mat | 5 ++- .../Materials/Game/Circuits/Base/Base 6.mat | 5 ++- .../Materials/Game/Circuits/Base/Base 7.mat | 5 ++- .../Materials/Game/Circuits/Base/Base 8.mat | 5 ++- .../Materials/Game/Circuits/Deco/Deco 0.mat | 5 ++- .../Materials/Game/Circuits/Deco/Deco 1.mat | 5 ++- .../Materials/Game/Circuits/Deco/Deco 2.mat | 5 ++- .../Materials/Game/Circuits/Deco/Deco 3.mat | 5 ++- .../Materials/Game/Circuits/Deco/Deco 4.mat | 5 ++- .../Materials/Game/Circuits/Deco/Deco 5.mat | 5 ++- .../Materials/Game/Circuits/Deco/Deco 6.mat | 5 ++- .../Materials/Game/Circuits/Deco/Deco 7.mat | 5 ++- .../Materials/Game/Circuits/Deco/Deco 8.mat | 5 ++- .../Game/Circuits/Display/Display 0.mat | 5 ++- .../Game/Circuits/Display/Display 1.mat | 5 ++- .../Game/Circuits/Display/Display 2.mat | 5 ++- .../Game/Circuits/Display/Display 3.mat | 5 ++- .../Game/Circuits/Display/Display 4.mat | 5 ++- .../Game/Circuits/Display/Display 5.mat | 5 ++- .../Game/Circuits/Display/Display 6.mat | 5 ++- .../Game/Circuits/Display/Display 7.mat | 5 ++- .../Game/Circuits/Display/Display 8.mat | 5 ++- .../Game/Connections/Cable/Cable 0.mat | 5 ++- .../Game/Connections/Cable/Cable 1.mat | 5 ++- .../Game/Connections/Cable/Cable 2.mat | 5 ++- .../Game/Connections/Cable/Cable 3.mat | 5 ++- .../Game/Connections/Cable/Cable 4.mat | 5 ++- .../Game/Connections/Cable/Cable 5.mat | 5 ++- .../Game/Connections/Cable/Cable 6.mat | 5 ++- .../Game/Connections/Cable/Cable 7.mat | 5 ++- .../Game/Connections/Cable/Cable 8.mat | 5 ++- .../Game/Connections/Charge/Charge 0.mat | 5 ++- .../Game/Connections/Charge/Charge 1.mat | 5 ++- .../Game/Connections/Charge/Charge 2.mat | 5 ++- .../Game/Connections/Charge/Charge 3.mat | 5 ++- .../Game/Connections/Charge/Charge 4.mat | 5 ++- .../Game/Connections/Charge/Charge 5.mat | 5 ++- .../Game/Connections/Charge/Charge 6.mat | 5 ++- .../Game/Connections/Charge/Charge 7.mat | 5 ++- .../Game/Connections/Charge/Charge 8.mat | 5 ++- .../Materials/Island/Grass Objects.mat | 5 ++- .../Materials/Island/Island Dirt.mat | 5 ++- .../Materials/Island/Island Grass.mat | 5 ++- Assets/Resources/Materials/Island/Leaves.mat | 5 ++- Assets/Resources/Materials/Island/Log.mat | 5 ++- Assets/Resources/Materials/Island/Stones.mat | 5 ++- Assets/Resources/Materials/Island/Table.mat | 5 ++- Packages/manifest.json | 12 ++--- Packages/packages-lock.json | 44 +++++++++---------- .../Settings.json | 2 - ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/URPProjectSettings.asset | 2 +- ProjectSettings/boot.config | 0 58 files changed, 239 insertions(+), 85 deletions(-) delete mode 100644 ProjectSettings/boot.config diff --git a/Assets/Resources/Materials/Game/Circuits/Base/Base 0.mat b/Assets/Resources/Materials/Game/Circuits/Base/Base 0.mat index 195d255..1c2346d 100644 --- a/Assets/Resources/Materials/Game/Circuits/Base/Base 0.mat +++ b/Assets/Resources/Materials/Game/Circuits/Base/Base 0.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Base 0 m_Shader: {fileID: -6465566751694194690, guid: f191eb9b6b497b743acda12d5199263f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} 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/Resources/Materials/Game/Circuits/Base/Base 1.mat b/Assets/Resources/Materials/Game/Circuits/Base/Base 1.mat index 93ba17c..1121294 100644 --- a/Assets/Resources/Materials/Game/Circuits/Base/Base 1.mat +++ b/Assets/Resources/Materials/Game/Circuits/Base/Base 1.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: Base 1 m_Shader: {fileID: -6465566751694194690, guid: f191eb9b6b497b743acda12d5199263f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Base/Base 2.mat b/Assets/Resources/Materials/Game/Circuits/Base/Base 2.mat index 1cce230..53c07d1 100644 --- a/Assets/Resources/Materials/Game/Circuits/Base/Base 2.mat +++ b/Assets/Resources/Materials/Game/Circuits/Base/Base 2.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: Base 2 m_Shader: {fileID: -6465566751694194690, guid: f191eb9b6b497b743acda12d5199263f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Base/Base 3.mat b/Assets/Resources/Materials/Game/Circuits/Base/Base 3.mat index 6a828d1..ca7c4cf 100644 --- a/Assets/Resources/Materials/Game/Circuits/Base/Base 3.mat +++ b/Assets/Resources/Materials/Game/Circuits/Base/Base 3.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: Base 3 m_Shader: {fileID: -6465566751694194690, guid: f191eb9b6b497b743acda12d5199263f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Base/Base 4.mat b/Assets/Resources/Materials/Game/Circuits/Base/Base 4.mat index f288992..ca146a4 100644 --- a/Assets/Resources/Materials/Game/Circuits/Base/Base 4.mat +++ b/Assets/Resources/Materials/Game/Circuits/Base/Base 4.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: Base 4 m_Shader: {fileID: -6465566751694194690, guid: f191eb9b6b497b743acda12d5199263f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Base/Base 5.mat b/Assets/Resources/Materials/Game/Circuits/Base/Base 5.mat index eb90063..c5c7eaf 100644 --- a/Assets/Resources/Materials/Game/Circuits/Base/Base 5.mat +++ b/Assets/Resources/Materials/Game/Circuits/Base/Base 5.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: Base 5 m_Shader: {fileID: -6465566751694194690, guid: f191eb9b6b497b743acda12d5199263f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Base/Base 6.mat b/Assets/Resources/Materials/Game/Circuits/Base/Base 6.mat index bdecacd..e7e319d 100644 --- a/Assets/Resources/Materials/Game/Circuits/Base/Base 6.mat +++ b/Assets/Resources/Materials/Game/Circuits/Base/Base 6.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: Base 6 m_Shader: {fileID: -6465566751694194690, guid: f191eb9b6b497b743acda12d5199263f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Base/Base 7.mat b/Assets/Resources/Materials/Game/Circuits/Base/Base 7.mat index 9591684..a263de0 100644 --- a/Assets/Resources/Materials/Game/Circuits/Base/Base 7.mat +++ b/Assets/Resources/Materials/Game/Circuits/Base/Base 7.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: Base 7 m_Shader: {fileID: -6465566751694194690, guid: f191eb9b6b497b743acda12d5199263f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Base/Base 8.mat b/Assets/Resources/Materials/Game/Circuits/Base/Base 8.mat index c791bd2..2ce974c 100644 --- a/Assets/Resources/Materials/Game/Circuits/Base/Base 8.mat +++ b/Assets/Resources/Materials/Game/Circuits/Base/Base 8.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: Base 8 m_Shader: {fileID: -6465566751694194690, guid: f191eb9b6b497b743acda12d5199263f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 0.mat b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 0.mat index dfc5a8a..d4988ed 100644 --- a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 0.mat +++ b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 0.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Deco 0 m_Shader: {fileID: -6465566751694194690, guid: 1ecf4cef1dcab494cbcd58840f890114, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -125,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 1.mat b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 1.mat index 8447fb5..3b0556a 100644 --- a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 1.mat +++ b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 1.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: Deco 1 m_Shader: {fileID: -6465566751694194690, guid: 1ecf4cef1dcab494cbcd58840f890114, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 2.mat b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 2.mat index 9a5a27f..e9049bd 100644 --- a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 2.mat +++ b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 2.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: Deco 2 m_Shader: {fileID: -6465566751694194690, guid: 1ecf4cef1dcab494cbcd58840f890114, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 3.mat b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 3.mat index 1e5fb03..0056565 100644 --- a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 3.mat +++ b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 3.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: Deco 3 m_Shader: {fileID: -6465566751694194690, guid: 1ecf4cef1dcab494cbcd58840f890114, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 4.mat b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 4.mat index aa9af7b..7a65fad 100644 --- a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 4.mat +++ b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 4.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: Deco 4 m_Shader: {fileID: -6465566751694194690, guid: 1ecf4cef1dcab494cbcd58840f890114, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 5.mat b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 5.mat index d656d43..fe21360 100644 --- a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 5.mat +++ b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 5.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: Deco 5 m_Shader: {fileID: -6465566751694194690, guid: 1ecf4cef1dcab494cbcd58840f890114, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 6.mat b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 6.mat index 4421d3c..b201d6c 100644 --- a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 6.mat +++ b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 6.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: Deco 6 m_Shader: {fileID: -6465566751694194690, guid: 1ecf4cef1dcab494cbcd58840f890114, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 7.mat b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 7.mat index 0b54d02..8f3e0b7 100644 --- a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 7.mat +++ b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 7.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: Deco 7 m_Shader: {fileID: -6465566751694194690, guid: 1ecf4cef1dcab494cbcd58840f890114, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 8.mat b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 8.mat index 5925174..2c00803 100644 --- a/Assets/Resources/Materials/Game/Circuits/Deco/Deco 8.mat +++ b/Assets/Resources/Materials/Game/Circuits/Deco/Deco 8.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: Deco 8 m_Shader: {fileID: -6465566751694194690, guid: 1ecf4cef1dcab494cbcd58840f890114, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Display/Display 0.mat b/Assets/Resources/Materials/Game/Circuits/Display/Display 0.mat index a100531..8c1369f 100644 --- a/Assets/Resources/Materials/Game/Circuits/Display/Display 0.mat +++ b/Assets/Resources/Materials/Game/Circuits/Display/Display 0.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Display 0 m_Shader: {fileID: -6465566751694194690, guid: dba5294ee4291d841a5c97b4978370b2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -147,4 +150,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Resources/Materials/Game/Circuits/Display/Display 1.mat b/Assets/Resources/Materials/Game/Circuits/Display/Display 1.mat index 7e30076..1991acb 100644 --- a/Assets/Resources/Materials/Game/Circuits/Display/Display 1.mat +++ b/Assets/Resources/Materials/Game/Circuits/Display/Display 1.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Display 1 m_Shader: {fileID: -6465566751694194690, guid: dba5294ee4291d841a5c97b4978370b2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -155,4 +158,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Resources/Materials/Game/Circuits/Display/Display 2.mat b/Assets/Resources/Materials/Game/Circuits/Display/Display 2.mat index f8f6008..78899a6 100644 --- a/Assets/Resources/Materials/Game/Circuits/Display/Display 2.mat +++ b/Assets/Resources/Materials/Game/Circuits/Display/Display 2.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: Display 2 m_Shader: {fileID: -6465566751694194690, guid: dba5294ee4291d841a5c97b4978370b2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Display/Display 3.mat b/Assets/Resources/Materials/Game/Circuits/Display/Display 3.mat index ee5e8c4..a63d0cb 100644 --- a/Assets/Resources/Materials/Game/Circuits/Display/Display 3.mat +++ b/Assets/Resources/Materials/Game/Circuits/Display/Display 3.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: Display 3 m_Shader: {fileID: -6465566751694194690, guid: dba5294ee4291d841a5c97b4978370b2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Display/Display 4.mat b/Assets/Resources/Materials/Game/Circuits/Display/Display 4.mat index 3e7cd87..82a49fe 100644 --- a/Assets/Resources/Materials/Game/Circuits/Display/Display 4.mat +++ b/Assets/Resources/Materials/Game/Circuits/Display/Display 4.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: Display 4 m_Shader: {fileID: -6465566751694194690, guid: dba5294ee4291d841a5c97b4978370b2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Circuits/Display/Display 5.mat b/Assets/Resources/Materials/Game/Circuits/Display/Display 5.mat index b972715..014c392 100644 --- a/Assets/Resources/Materials/Game/Circuits/Display/Display 5.mat +++ b/Assets/Resources/Materials/Game/Circuits/Display/Display 5.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Display 5 m_Shader: {fileID: -6465566751694194690, guid: dba5294ee4291d841a5c97b4978370b2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -155,4 +158,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Resources/Materials/Game/Circuits/Display/Display 6.mat b/Assets/Resources/Materials/Game/Circuits/Display/Display 6.mat index 7319f09..c0fdf4e 100644 --- a/Assets/Resources/Materials/Game/Circuits/Display/Display 6.mat +++ b/Assets/Resources/Materials/Game/Circuits/Display/Display 6.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Display 6 m_Shader: {fileID: -6465566751694194690, guid: dba5294ee4291d841a5c97b4978370b2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -155,4 +158,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Resources/Materials/Game/Circuits/Display/Display 7.mat b/Assets/Resources/Materials/Game/Circuits/Display/Display 7.mat index 04c725f..bf878b4 100644 --- a/Assets/Resources/Materials/Game/Circuits/Display/Display 7.mat +++ b/Assets/Resources/Materials/Game/Circuits/Display/Display 7.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Display 7 m_Shader: {fileID: -6465566751694194690, guid: dba5294ee4291d841a5c97b4978370b2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -155,4 +158,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Resources/Materials/Game/Circuits/Display/Display 8.mat b/Assets/Resources/Materials/Game/Circuits/Display/Display 8.mat index b6e5b1f..84211f0 100644 --- a/Assets/Resources/Materials/Game/Circuits/Display/Display 8.mat +++ b/Assets/Resources/Materials/Game/Circuits/Display/Display 8.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: Display 8 m_Shader: {fileID: -6465566751694194690, guid: dba5294ee4291d841a5c97b4978370b2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Cable/Cable 0.mat b/Assets/Resources/Materials/Game/Connections/Cable/Cable 0.mat index 9a34f84..b110757 100644 --- a/Assets/Resources/Materials/Game/Connections/Cable/Cable 0.mat +++ b/Assets/Resources/Materials/Game/Connections/Cable/Cable 0.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Cable 0 m_Shader: {fileID: -6465566751694194690, guid: 93892b9817f277942b1b0e12c93258f5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} 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/Resources/Materials/Game/Connections/Cable/Cable 1.mat b/Assets/Resources/Materials/Game/Connections/Cable/Cable 1.mat index 86d3dbb..65241a5 100644 --- a/Assets/Resources/Materials/Game/Connections/Cable/Cable 1.mat +++ b/Assets/Resources/Materials/Game/Connections/Cable/Cable 1.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: Cable 1 m_Shader: {fileID: -6465566751694194690, guid: 93892b9817f277942b1b0e12c93258f5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Cable/Cable 2.mat b/Assets/Resources/Materials/Game/Connections/Cable/Cable 2.mat index 51b28c9..a433961 100644 --- a/Assets/Resources/Materials/Game/Connections/Cable/Cable 2.mat +++ b/Assets/Resources/Materials/Game/Connections/Cable/Cable 2.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: Cable 2 m_Shader: {fileID: -6465566751694194690, guid: 93892b9817f277942b1b0e12c93258f5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Cable/Cable 3.mat b/Assets/Resources/Materials/Game/Connections/Cable/Cable 3.mat index 78c6b58..6c4bdfa 100644 --- a/Assets/Resources/Materials/Game/Connections/Cable/Cable 3.mat +++ b/Assets/Resources/Materials/Game/Connections/Cable/Cable 3.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: Cable 3 m_Shader: {fileID: -6465566751694194690, guid: 93892b9817f277942b1b0e12c93258f5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Cable/Cable 4.mat b/Assets/Resources/Materials/Game/Connections/Cable/Cable 4.mat index 7fccfb5..c5681c2 100644 --- a/Assets/Resources/Materials/Game/Connections/Cable/Cable 4.mat +++ b/Assets/Resources/Materials/Game/Connections/Cable/Cable 4.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: Cable 4 m_Shader: {fileID: -6465566751694194690, guid: 93892b9817f277942b1b0e12c93258f5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Cable/Cable 5.mat b/Assets/Resources/Materials/Game/Connections/Cable/Cable 5.mat index 2f8fd57..ed06ec5 100644 --- a/Assets/Resources/Materials/Game/Connections/Cable/Cable 5.mat +++ b/Assets/Resources/Materials/Game/Connections/Cable/Cable 5.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: Cable 5 m_Shader: {fileID: -6465566751694194690, guid: 93892b9817f277942b1b0e12c93258f5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Cable/Cable 6.mat b/Assets/Resources/Materials/Game/Connections/Cable/Cable 6.mat index f1e6711..6668e36 100644 --- a/Assets/Resources/Materials/Game/Connections/Cable/Cable 6.mat +++ b/Assets/Resources/Materials/Game/Connections/Cable/Cable 6.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: Cable 6 m_Shader: {fileID: -6465566751694194690, guid: 93892b9817f277942b1b0e12c93258f5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Cable/Cable 7.mat b/Assets/Resources/Materials/Game/Connections/Cable/Cable 7.mat index 1ba6b7e..0c798af 100644 --- a/Assets/Resources/Materials/Game/Connections/Cable/Cable 7.mat +++ b/Assets/Resources/Materials/Game/Connections/Cable/Cable 7.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: Cable 7 m_Shader: {fileID: -6465566751694194690, guid: 93892b9817f277942b1b0e12c93258f5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Cable/Cable 8.mat b/Assets/Resources/Materials/Game/Connections/Cable/Cable 8.mat index 699fdb1..2194ded 100644 --- a/Assets/Resources/Materials/Game/Connections/Cable/Cable 8.mat +++ b/Assets/Resources/Materials/Game/Connections/Cable/Cable 8.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: Cable 8 m_Shader: {fileID: -6465566751694194690, guid: 93892b9817f277942b1b0e12c93258f5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Charge/Charge 0.mat b/Assets/Resources/Materials/Game/Connections/Charge/Charge 0.mat index 8bc51fb..207d61f 100644 --- a/Assets/Resources/Materials/Game/Connections/Charge/Charge 0.mat +++ b/Assets/Resources/Materials/Game/Connections/Charge/Charge 0.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Charge 0 m_Shader: {fileID: -6465566751694194690, guid: 5393ddbc2201eb14a84f5e1881699623, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -125,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Resources/Materials/Game/Connections/Charge/Charge 1.mat b/Assets/Resources/Materials/Game/Connections/Charge/Charge 1.mat index 9057162..096c86f 100644 --- a/Assets/Resources/Materials/Game/Connections/Charge/Charge 1.mat +++ b/Assets/Resources/Materials/Game/Connections/Charge/Charge 1.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: Charge 1 m_Shader: {fileID: -6465566751694194690, guid: 5393ddbc2201eb14a84f5e1881699623, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Charge/Charge 2.mat b/Assets/Resources/Materials/Game/Connections/Charge/Charge 2.mat index accb923..236e666 100644 --- a/Assets/Resources/Materials/Game/Connections/Charge/Charge 2.mat +++ b/Assets/Resources/Materials/Game/Connections/Charge/Charge 2.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: Charge 2 m_Shader: {fileID: -6465566751694194690, guid: 5393ddbc2201eb14a84f5e1881699623, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Charge/Charge 3.mat b/Assets/Resources/Materials/Game/Connections/Charge/Charge 3.mat index c1721c6..e6c909f 100644 --- a/Assets/Resources/Materials/Game/Connections/Charge/Charge 3.mat +++ b/Assets/Resources/Materials/Game/Connections/Charge/Charge 3.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: Charge 3 m_Shader: {fileID: -6465566751694194690, guid: 5393ddbc2201eb14a84f5e1881699623, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Charge/Charge 4.mat b/Assets/Resources/Materials/Game/Connections/Charge/Charge 4.mat index b60d61e..7d89c9b 100644 --- a/Assets/Resources/Materials/Game/Connections/Charge/Charge 4.mat +++ b/Assets/Resources/Materials/Game/Connections/Charge/Charge 4.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: Charge 4 m_Shader: {fileID: -6465566751694194690, guid: 5393ddbc2201eb14a84f5e1881699623, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Charge/Charge 5.mat b/Assets/Resources/Materials/Game/Connections/Charge/Charge 5.mat index 693af93..a1f9a7f 100644 --- a/Assets/Resources/Materials/Game/Connections/Charge/Charge 5.mat +++ b/Assets/Resources/Materials/Game/Connections/Charge/Charge 5.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: Charge 5 m_Shader: {fileID: -6465566751694194690, guid: 5393ddbc2201eb14a84f5e1881699623, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Charge/Charge 6.mat b/Assets/Resources/Materials/Game/Connections/Charge/Charge 6.mat index 52ddb76..02293c7 100644 --- a/Assets/Resources/Materials/Game/Connections/Charge/Charge 6.mat +++ b/Assets/Resources/Materials/Game/Connections/Charge/Charge 6.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: Charge 6 m_Shader: {fileID: -6465566751694194690, guid: 5393ddbc2201eb14a84f5e1881699623, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Charge/Charge 7.mat b/Assets/Resources/Materials/Game/Connections/Charge/Charge 7.mat index b861dcc..d2db18c 100644 --- a/Assets/Resources/Materials/Game/Connections/Charge/Charge 7.mat +++ b/Assets/Resources/Materials/Game/Connections/Charge/Charge 7.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: Charge 7 m_Shader: {fileID: -6465566751694194690, guid: 5393ddbc2201eb14a84f5e1881699623, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Game/Connections/Charge/Charge 8.mat b/Assets/Resources/Materials/Game/Connections/Charge/Charge 8.mat index 1dbb0b0..fa8c463 100644 --- a/Assets/Resources/Materials/Game/Connections/Charge/Charge 8.mat +++ b/Assets/Resources/Materials/Game/Connections/Charge/Charge 8.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: Charge 8 m_Shader: {fileID: -6465566751694194690, guid: 5393ddbc2201eb14a84f5e1881699623, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Island/Grass Objects.mat b/Assets/Resources/Materials/Island/Grass Objects.mat index 6c83bff..e82230a 100644 --- a/Assets/Resources/Materials/Island/Grass Objects.mat +++ b/Assets/Resources/Materials/Island/Grass Objects.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: Grass Objects m_Shader: {fileID: -6465566751694194690, guid: 38c09e36bed3d42f3a20ec4a030aa463, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Island/Island Dirt.mat b/Assets/Resources/Materials/Island/Island Dirt.mat index 7bcfb4b..746e8a7 100644 --- a/Assets/Resources/Materials/Island/Island Dirt.mat +++ b/Assets/Resources/Materials/Island/Island Dirt.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: Island Dirt m_Shader: {fileID: -6465566751694194690, guid: 38c09e36bed3d42f3a20ec4a030aa463, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Island/Island Grass.mat b/Assets/Resources/Materials/Island/Island Grass.mat index 03c7fb6..df1f2b1 100644 --- a/Assets/Resources/Materials/Island/Island Grass.mat +++ b/Assets/Resources/Materials/Island/Island Grass.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: Island Grass m_Shader: {fileID: -6465566751694194690, guid: 38c09e36bed3d42f3a20ec4a030aa463, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Island/Leaves.mat b/Assets/Resources/Materials/Island/Leaves.mat index 3fe1dbd..62e8311 100644 --- a/Assets/Resources/Materials/Island/Leaves.mat +++ b/Assets/Resources/Materials/Island/Leaves.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Leaves m_Shader: {fileID: -6465566751694194690, guid: 38c09e36bed3d42f3a20ec4a030aa463, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -102,4 +105,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Resources/Materials/Island/Log.mat b/Assets/Resources/Materials/Island/Log.mat index 835bc0c..5b8ac9a 100644 --- a/Assets/Resources/Materials/Island/Log.mat +++ b/Assets/Resources/Materials/Island/Log.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Log m_Shader: {fileID: -6465566751694194690, guid: 38c09e36bed3d42f3a20ec4a030aa463, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -102,4 +105,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 diff --git a/Assets/Resources/Materials/Island/Stones.mat b/Assets/Resources/Materials/Island/Stones.mat index c8de7cf..7f84d41 100644 --- a/Assets/Resources/Materials/Island/Stones.mat +++ b/Assets/Resources/Materials/Island/Stones.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: Stones m_Shader: {fileID: -6465566751694194690, guid: 38c09e36bed3d42f3a20ec4a030aa463, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Resources/Materials/Island/Table.mat b/Assets/Resources/Materials/Island/Table.mat index f8d7259..706e1c4 100644 --- a/Assets/Resources/Materials/Island/Table.mat +++ b/Assets/Resources/Materials/Island/Table.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: Table m_Shader: {fileID: -6465566751694194690, guid: 38c09e36bed3d42f3a20ec4a030aa463, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Packages/manifest.json b/Packages/manifest.json index 3dc0f15..888e655 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,14 +1,14 @@ { "dependencies": { - "com.unity.collab-proxy": "1.15.18", + "com.unity.collab-proxy": "1.17.2", "com.unity.feature.development": "1.0.1", - "com.unity.ide.rider": "3.0.14", - "com.unity.ide.visualstudio": "2.0.15", + "com.unity.ide.rider": "3.0.15", + "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", - "com.unity.render-pipelines.universal": "12.1.7", - "com.unity.test-framework": "1.1.31", + "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.1", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.7.8", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 398e04c..4e2c4dd 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.burst": { - "version": "1.6.5", + "version": "1.7.3", "depth": 1, "source": "registry", "dependencies": { @@ -10,7 +10,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.15.18", + "version": "1.17.2", "depth": 0, "source": "registry", "dependencies": { @@ -37,17 +37,17 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.ide.visualstudio": "2.0.15", - "com.unity.ide.rider": "3.0.14", + "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ide.rider": "3.0.15", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.1.1", - "com.unity.test-framework": "1.1.31", - "com.unity.testtools.codecoverage": "1.0.1" + "com.unity.test-framework": "1.1.33", + "com.unity.testtools.codecoverage": "1.1.1" } }, "com.unity.ide.rider": { - "version": "3.0.14", + "version": "3.0.15", "depth": 0, "source": "registry", "dependencies": { @@ -56,7 +56,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.15", + "version": "2.0.16", "depth": 0, "source": "registry", "dependencies": { @@ -93,7 +93,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.7", + "version": "13.1.8", "depth": 1, "source": "builtin", "dependencies": { @@ -103,25 +103,25 @@ } }, "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.5.0", - "com.unity.render-pipelines.core": "12.1.7", - "com.unity.shadergraph": "12.1.7" + "com.unity.burst": "1.7.3", + "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.4.0", + "version": "1.4.2", "depth": 1, "source": "registry", "dependencies": { @@ -132,23 +132,23 @@ "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "1.0.3", + "version": "2.0.1", "depth": 2, "source": "registry", "dependencies": {}, "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.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -159,7 +159,7 @@ "url": "https://packages.unity.com" }, "com.unity.testtools.codecoverage": { - "version": "1.0.1", + "version": "1.1.1", "depth": 1, "source": "registry", "dependencies": { @@ -178,7 +178,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.7.1", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json b/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json index ad11087..3c7b4c1 100644 --- a/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json +++ b/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json @@ -1,6 +1,4 @@ { - "m_Name": "Settings", - "m_Path": "ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json", "m_Dictionary": { "m_DictionaryValues": [] } diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index bdb3ba5..e272a29 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.5f1 -m_EditorVersionWithRevision: 2021.3.5f1 (40eb3a945986) +m_EditorVersion: 2022.1.15f1 +m_EditorVersionWithRevision: 2022.1.15f1 (42973686a05c) 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