From 216e462bc8742281e3290b380229811ff19cf529 Mon Sep 17 00:00:00 2001 From: 3hreeman Date: Tue, 21 May 2024 11:01:41 +0900 Subject: [PATCH] entity sample / physics sample editor version updated --- .../Assets/Baking/AutoAuthoring/Blue.mat | 6 +- .../Assets/Baking/AutoAuthoring/Green.mat | 6 +- .../Assets/Baking/AutoAuthoring/Red.mat | 6 +- EntitiesSamples/Assets/Baking/Default.mat | 6 +- .../Assets/Baking/PrefabReference/Green.mat | 6 +- .../Boids/SampleAssets/Materials/Fish.mat | 6 +- .../Boids/SampleAssets/Materials/Floor1.mat | 6 +- .../SampleAssets/Materials/InstanceMat.mat | 6 +- .../SampleAssets/Materials/OuterWall2.mat | 6 +- .../Boids/SampleAssets/Materials/RedFish.mat | 6 +- .../Boids/SampleAssets/Materials/Rock.mat | 6 +- .../Boids/SampleAssets/Materials/Seaweed.mat | 6 +- .../Boids/SampleAssets/Materials/Shark.mat | 6 +- .../Boids/SampleAssets/Materials/Surface.mat | 6 +- .../Assets/DefaultVolumeProfile.asset | 15 ++++ .../Assets/DefaultVolumeProfile.asset.meta | 8 ++ .../Graphical/RenderSwap/MaterialOff.mat | 6 +- .../Graphical/RenderSwap/MaterialOn.mat | 6 +- .../Graphical/ShaderGraph/ShaderBox.mat | 9 ++- .../Warrior/Materials/MAT_Warrior_Red.mat | 4 +- .../12. FixedTimestep/InstanceMat.mat | 6 +- .../Assets/HelloCube/_Common/Default.mat | 6 +- .../HelloCube/_Common/Materials/Box.mat | 6 +- .../HelloCube/_Common/Materials/Default.mat | 6 +- .../HelloCube/_Common/Materials/Target.mat | 6 +- .../HelloCube/_Common/Materials/Unit.mat | 6 +- .../Assets/Settings/URP-Balanced.asset | 52 ++++++++++++- .../Settings/URP-HighFidelity-Renderer.asset | 17 ++++- .../Assets/Settings/URP-HighFidelity.asset | 52 ++++++++++++- .../Assets/Settings/URP-Performant.asset | 52 ++++++++++++- ...niversalRenderPipelineGlobalSettings.asset | 37 +++++++++- .../SampleAssets/BackgroundMaterial.mat | 4 +- .../SampleAssets/ReferencedMaterial.mat | 6 +- .../PrefabAndSceneReferences/Blue.mat | 6 +- .../PrefabAndSceneReferences/Green.mat | 6 +- .../PrefabAndSceneReferences/Grey.mat | 6 +- .../PrefabAndSceneReferences/Orange.mat | 6 +- .../PrefabAndSceneReferences/Red.mat | 6 +- .../Aircondition_Unit_Rooftop_A.mat | 23 +++++- .../Aircondition_Unit_Rooftop_B.mat | 23 +++++- .../Aircondition_Units_A.mat | 23 +++++- .../Aircondition_Units_B.mat | 23 +++++- .../Aircondition_Units_C.mat | 23 +++++- .../Aircondition_Units_C_AnimSupport.mat | 23 +++++- .../Buildings_Tileset_A.mat | 23 +++++- .../Buildings_Tileset_A_Railing.mat | 23 +++++- .../Buildings_Tileset_A_Tarp.mat | 23 +++++- .../Environment/Floorlight_A/Floorlight_A.mat | 23 +++++- .../Laundry_Collection_A.mat | 23 +++++- .../Environment/Neon_Signs_A/Neon_Signs_A.mat | 23 +++++- .../Pagoda_Decoration_A.mat | 23 +++++- .../Environment/Pagoda_Tileset_A/Pagoda_A.mat | 23 +++++- .../Pagoda_Ceiling_Tiling_A.mat | 23 +++++- .../Pagoda_Tileset_A/Pagoda_RoofTiles_A.mat | 23 +++++- .../Pagoda_Tileset_A/Pagoda_Roof_Trims_A.mat | 23 +++++- .../Pagoda_Tileset_A/Pagoda_Tileset_A.mat | 23 +++++- .../Pagoda_Tileset_A/Pagoda_Trims_A.mat | 23 +++++- .../Environment/Pipes_A/Pipes_A_Blue.mat | 23 +++++- .../Environment/Pipes_A/Pipes_A_Red.mat | 23 +++++- .../Environment/Pipes_A/Pipes_A_White.mat | 23 +++++- .../Satellite_Dishes_A/Satellite_Dish_A.mat | 23 +++++- .../Satellite_Dishes_A/Satellite_Dish_B.mat | 23 +++++- .../Satellite_Dishes_A/Satellite_Dish_C.mat | 23 +++++- .../Satellite_Dishes_A/Satellite_Dishes_A.mat | 23 +++++- .../Scaffolding_A/Scaffolding_A.mat | 23 +++++- .../Environment/Trash_A/Trash_Blend_A.mat | 23 +++++- .../Window_Collection_A.mat | 23 +++++- .../Window_Collection_A_Emissive.mat | 23 +++++- .../Window_Collection_A_Glass.mat | 23 +++++- .../Materials/Rendering/_ShadowCaster.mat | 3 +- .../8. Complete/Buildings/High.mat | 6 +- .../8. Complete/Buildings/Low.mat | 6 +- .../8. Complete/Buildings/Medium.mat | 6 +- .../Assets/Tutorials/Kickball/Common/Ball.mat | 6 +- .../Tutorials/Kickball/Common/Ground.mat | 6 +- .../Tutorials/Kickball/Common/Player.mat | 6 +- .../Assets/Tutorials/Tanks/Common/Default.mat | 6 +- EntitiesSamples/Packages/manifest.json | 9 +-- EntitiesSamples/Packages/packages-lock.json | 73 +++++++++---------- .../ProjectSettings/MultiplayerManager.asset | 7 ++ .../ProjectSettings/ProjectVersion.txt | 4 +- .../ProjectSettings/ShaderGraphSettings.asset | 1 - .../ProjectSettings/URPProjectSettings.asset | 2 +- .../Materials/Material.Ball.Black.mat | 6 +- .../Materials/Material.Ball.Ghost.mat | 6 +- .../Materials/Material.Ball.Red.mat | 6 +- .../Materials/Material.Ball.Strip.mat | 6 +- .../Materials/Material.Ball.White.mat | 6 +- .../Materials/Material.Ball.Yellow.mat | 6 +- .../Materials/PlanetMaterial.mat | 6 +- .../Materials/TruckGlass.mat | 4 +- .../Textures/BigRigTrailer.mat | 6 +- .../Textures/BigRigTyre.mat | 6 +- .../Truck_Flatbed_Trailer_01/Textures/Cab.mat | 6 +- .../Textures/TruckCabInterior.mat | 6 +- .../Textures/TruckGlass.mat | 4 +- .../Textures/Truck_Military-Windows.mat | 4 +- .../Textures/Truck_Military.mat | 6 +- .../Prefabs/Models/Vehicle.mat | 6 +- .../Prefabs/Models/VehicleChassis.mat | 6 +- .../Assets/6. Events/Materials/Black.mat | 6 +- .../Assets/6. Events/Materials/Blue.mat | 6 +- .../Assets/6. Events/Materials/Green.mat | 6 +- .../Materials/PhysicsTriggerTransparent.mat | 4 +- .../Assets/6. Events/Materials/Red.mat | 6 +- .../Assets/7. Query/MeshDisplayMaterial.mat | 4 +- PhysicsSamples/Assets/7. Query/Window.mat | 4 +- .../Assets/Common/Materials/Colorful.mat | 6 +- .../Materials/PhysicsDynamicMaterial.mat | 6 +- .../Materials/PhysicsGhostDynamicMaterial.mat | 6 +- .../PhysicsGhostKinematicMaterial.mat | 6 +- .../Common/Materials/PhysicsHoverMaterial.mat | 6 +- .../Materials/PhysicsKinematicMaterial.mat | 6 +- .../Common/UniversalRenderPipelineAsset.asset | 56 +++++++++++++- ...niversalRenderPipelineAsset_Renderer.asset | 19 ++++- .../Assets/DefaultVolumeProfile.asset | 15 ++++ .../Assets/DefaultVolumeProfile.asset.meta | 8 ++ ...niversalRenderPipelineGlobalSettings.asset | 38 ++++++++-- PhysicsSamples/Packages/manifest.json | 1 - .../ProjectSettings/MultiplayerManager.asset | 7 ++ .../ProjectSettings/ProjectVersion.txt | 4 +- .../ProjectSettings/URPProjectSettings.asset | 2 +- 122 files changed, 1329 insertions(+), 261 deletions(-) create mode 100644 EntitiesSamples/Assets/DefaultVolumeProfile.asset create mode 100644 EntitiesSamples/Assets/DefaultVolumeProfile.asset.meta create mode 100644 EntitiesSamples/ProjectSettings/MultiplayerManager.asset create mode 100644 PhysicsSamples/Assets/DefaultVolumeProfile.asset create mode 100644 PhysicsSamples/Assets/DefaultVolumeProfile.asset.meta create mode 100644 PhysicsSamples/ProjectSettings/MultiplayerManager.asset diff --git a/EntitiesSamples/Assets/Baking/AutoAuthoring/Blue.mat b/EntitiesSamples/Assets/Baking/AutoAuthoring/Blue.mat index e291d6bb5..9a370c0fd 100644 --- a/EntitiesSamples/Assets/Baking/AutoAuthoring/Blue.mat +++ b/EntitiesSamples/Assets/Baking/AutoAuthoring/Blue.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Baking/AutoAuthoring/Green.mat b/EntitiesSamples/Assets/Baking/AutoAuthoring/Green.mat index f5d340e95..f38eda102 100644 --- a/EntitiesSamples/Assets/Baking/AutoAuthoring/Green.mat +++ b/EntitiesSamples/Assets/Baking/AutoAuthoring/Green.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Baking/AutoAuthoring/Red.mat b/EntitiesSamples/Assets/Baking/AutoAuthoring/Red.mat index ce92c772b..cf7dd6282 100644 --- a/EntitiesSamples/Assets/Baking/AutoAuthoring/Red.mat +++ b/EntitiesSamples/Assets/Baking/AutoAuthoring/Red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Baking/Default.mat b/EntitiesSamples/Assets/Baking/Default.mat index be7936c61..39cb66cd0 100644 --- a/EntitiesSamples/Assets/Baking/Default.mat +++ b/EntitiesSamples/Assets/Baking/Default.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -118,6 +119,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7955112743622329414 MonoBehaviour: m_ObjectHideFlags: 11 @@ -130,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/EntitiesSamples/Assets/Baking/PrefabReference/Green.mat b/EntitiesSamples/Assets/Baking/PrefabReference/Green.mat index 79c9dc367..6df463aa8 100644 --- a/EntitiesSamples/Assets/Baking/PrefabReference/Green.mat +++ b/EntitiesSamples/Assets/Baking/PrefabReference/Green.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Fish.mat b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Fish.mat index f5a82e18f..0ea61b7e4 100644 --- a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Fish.mat +++ b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Fish.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -189,3 +190,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.16176468, g: 0.16176468, b: 0.16176468, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Floor1.mat b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Floor1.mat index dc0d8ef7c..d2310df2f 100644 --- a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Floor1.mat +++ b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Floor1.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -125,6 +126,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &5030888136031534409 MonoBehaviour: m_ObjectHideFlags: 11 @@ -137,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/InstanceMat.mat b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/InstanceMat.mat index 6eb063a6c..45fd07e35 100644 --- a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/InstanceMat.mat +++ b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/InstanceMat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -138,3 +139,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/OuterWall2.mat b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/OuterWall2.mat index af16228c6..6fc6aa06f 100644 --- a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/OuterWall2.mat +++ b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/OuterWall2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -33,7 +33,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -139,3 +140,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/RedFish.mat b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/RedFish.mat index 701529e88..9d8f7138d 100644 --- a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/RedFish.mat +++ b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/RedFish.mat @@ -22,7 +22,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -150,6 +151,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.16176468, g: 0.16176468, b: 0.16176468, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3014609738461782787 MonoBehaviour: m_ObjectHideFlags: 11 @@ -162,4 +164,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Rock.mat b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Rock.mat index c717e8bf8..a4da0dfe7 100644 --- a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Rock.mat +++ b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Rock.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -35,7 +35,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -141,3 +142,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Seaweed.mat b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Seaweed.mat index f627b8d8e..9e3361871 100644 --- a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Seaweed.mat +++ b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Seaweed.mat @@ -19,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -127,6 +128,7 @@ Material: - _Color: {r: 0.21453287, g: 0.45588237, b: 0.30607924, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1231831338894256371 MonoBehaviour: m_ObjectHideFlags: 11 @@ -139,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Shark.mat b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Shark.mat index 45b3d3f24..98735a828 100644 --- a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Shark.mat +++ b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Shark.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -33,7 +33,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -140,3 +141,4 @@ Material: - _Color: {r: 0.9632353, g: 0.9632353, b: 0.9632353, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Surface.mat b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Surface.mat index c47a661b6..3487aa394 100644 --- a/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Surface.mat +++ b/EntitiesSamples/Assets/Boids/SampleAssets/Materials/Surface.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -33,7 +33,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -139,3 +140,4 @@ Material: - _EmissionColor: {r: 0.3954547, g: 6.08158, b: 7.507028, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/DefaultVolumeProfile.asset b/EntitiesSamples/Assets/DefaultVolumeProfile.asset new file mode 100644 index 000000000..36c3781ad --- /dev/null +++ b/EntitiesSamples/Assets/DefaultVolumeProfile.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: DefaultVolumeProfile + m_EditorClassIdentifier: + components: [] diff --git a/EntitiesSamples/Assets/DefaultVolumeProfile.asset.meta b/EntitiesSamples/Assets/DefaultVolumeProfile.asset.meta new file mode 100644 index 000000000..76ffd3872 --- /dev/null +++ b/EntitiesSamples/Assets/DefaultVolumeProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2f1c8733e80516942a6aa63991e9d3e6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/EntitiesSamples/Assets/Graphical/RenderSwap/MaterialOff.mat b/EntitiesSamples/Assets/Graphical/RenderSwap/MaterialOff.mat index d7b106f01..fd1568b31 100644 --- a/EntitiesSamples/Assets/Graphical/RenderSwap/MaterialOff.mat +++ b/EntitiesSamples/Assets/Graphical/RenderSwap/MaterialOff.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Graphical/RenderSwap/MaterialOn.mat b/EntitiesSamples/Assets/Graphical/RenderSwap/MaterialOn.mat index cf97197b2..93d410a7a 100644 --- a/EntitiesSamples/Assets/Graphical/RenderSwap/MaterialOn.mat +++ b/EntitiesSamples/Assets/Graphical/RenderSwap/MaterialOn.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Graphical/ShaderGraph/ShaderBox.mat b/EntitiesSamples/Assets/Graphical/ShaderGraph/ShaderBox.mat index 236d751e5..ce407a64b 100644 --- a/EntitiesSamples/Assets/Graphical/ShaderGraph/ShaderBox.mat +++ b/EntitiesSamples/Assets/Graphical/ShaderGraph/ShaderBox.mat @@ -8,7 +8,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ShaderBox - m_Shader: {fileID: -6465566751694194690, guid: e54fa994ecd491644bbe412b28805a08, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: e54fa994ecd491644bbe412b28805a08, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -18,7 +19,8 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -44,6 +46,7 @@ Material: - Color_5e06a8bc7fbe4284bef1dcf16b184948: {r: 0, g: 0, b: 1, a: 0} - Color_d9b47626e873463fbd997c9a6a857bf2: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &180254860914502521 MonoBehaviour: m_ObjectHideFlags: 11 @@ -56,4 +59,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/EntitiesSamples/Assets/Graphical/_Common/Warrior/Materials/MAT_Warrior_Red.mat b/EntitiesSamples/Assets/Graphical/_Common/Warrior/Materials/MAT_Warrior_Red.mat index d5d75e1b9..d62d891be 100644 --- a/EntitiesSamples/Assets/Graphical/_Common/Warrior/Materials/MAT_Warrior_Red.mat +++ b/EntitiesSamples/Assets/Graphical/_Common/Warrior/Materials/MAT_Warrior_Red.mat @@ -24,6 +24,7 @@ Material: RenderType: TransparentCutout disabledShaderPasses: - ALWAYS + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -142,6 +143,7 @@ Material: - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6973996713489322478 MonoBehaviour: m_ObjectHideFlags: 11 @@ -154,4 +156,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/EntitiesSamples/Assets/HelloCube/12. FixedTimestep/InstanceMat.mat b/EntitiesSamples/Assets/HelloCube/12. FixedTimestep/InstanceMat.mat index 6eb063a6c..45fd07e35 100644 --- a/EntitiesSamples/Assets/HelloCube/12. FixedTimestep/InstanceMat.mat +++ b/EntitiesSamples/Assets/HelloCube/12. FixedTimestep/InstanceMat.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -138,3 +139,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/HelloCube/_Common/Default.mat b/EntitiesSamples/Assets/HelloCube/_Common/Default.mat index be7936c61..39cb66cd0 100644 --- a/EntitiesSamples/Assets/HelloCube/_Common/Default.mat +++ b/EntitiesSamples/Assets/HelloCube/_Common/Default.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -118,6 +119,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7955112743622329414 MonoBehaviour: m_ObjectHideFlags: 11 @@ -130,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/EntitiesSamples/Assets/HelloCube/_Common/Materials/Box.mat b/EntitiesSamples/Assets/HelloCube/_Common/Materials/Box.mat index 611da85d4..7e8442b39 100644 --- a/EntitiesSamples/Assets/HelloCube/_Common/Materials/Box.mat +++ b/EntitiesSamples/Assets/HelloCube/_Common/Materials/Box.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -132,3 +133,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/HelloCube/_Common/Materials/Default.mat b/EntitiesSamples/Assets/HelloCube/_Common/Materials/Default.mat index be7936c61..39cb66cd0 100644 --- a/EntitiesSamples/Assets/HelloCube/_Common/Materials/Default.mat +++ b/EntitiesSamples/Assets/HelloCube/_Common/Materials/Default.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -118,6 +119,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7955112743622329414 MonoBehaviour: m_ObjectHideFlags: 11 @@ -130,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/EntitiesSamples/Assets/HelloCube/_Common/Materials/Target.mat b/EntitiesSamples/Assets/HelloCube/_Common/Materials/Target.mat index 084e88bb4..0c0c6f1cb 100644 --- a/EntitiesSamples/Assets/HelloCube/_Common/Materials/Target.mat +++ b/EntitiesSamples/Assets/HelloCube/_Common/Materials/Target.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/HelloCube/_Common/Materials/Unit.mat b/EntitiesSamples/Assets/HelloCube/_Common/Materials/Unit.mat index e62fa20ef..26d891352 100644 --- a/EntitiesSamples/Assets/HelloCube/_Common/Materials/Unit.mat +++ b/EntitiesSamples/Assets/HelloCube/_Common/Materials/Unit.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -118,6 +119,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &4405367197849521254 MonoBehaviour: m_ObjectHideFlags: 11 @@ -130,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/EntitiesSamples/Assets/Settings/URP-Balanced.asset b/EntitiesSamples/Assets/Settings/URP-Balanced.asset index abcb87f94..f40827fec 100644 --- a/EntitiesSamples/Assets/Settings/URP-Balanced.asset +++ b/EntitiesSamples/Assets/Settings/URP-Balanced.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: URP-Balanced m_EditorClassIdentifier: - k_AssetVersion: 11 - k_AssetPreviousVersion: 11 + k_AssetVersion: 12 + k_AssetPreviousVersion: 12 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -32,6 +32,11 @@ MonoBehaviour: m_FsrSharpness: 0.92 m_EnableLODCrossFade: 1 m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 + m_LightProbeSystem: 0 + m_ProbeVolumeMemoryBudget: 1024 + m_SupportProbeVolumeStreaming: 0 + m_ProbeVolumeSHBands: 1 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 2048 @@ -71,14 +76,57 @@ MonoBehaviour: m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 + m_SupportScreenSpaceLensFlare: 1 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_VolumeFrameworkUpdateMode: 0 + m_VolumeProfile: {fileID: 0} m_Textures: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + apvScenesData: + m_ObsoleteSerializedBakingSets: [] + sceneToBakingSet: + m_Keys: [] + m_Values: [] + bakingSets: [] + sceneBounds: + m_Keys: [] + m_Values: [] + hasProbeVolumes: + m_Keys: [] + m_Values: + m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 1 + m_PrefilterXRKeywords: 0 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 1 + m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilterDebugKeywords: 0 + m_PrefilterWriteRenderingLayers: 0 + m_PrefilterHDROutput: 0 + m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAOSourceDepthLow: 0 + m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOSampleCountLow: 0 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 0 + m_PrefilterDBufferMRT1: 0 + m_PrefilterDBufferMRT2: 0 + m_PrefilterDBufferMRT3: 0 + m_PrefilterSoftShadowsQualityLow: 0 + m_PrefilterSoftShadowsQualityMedium: 0 + m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterSoftShadows: 0 + m_PrefilterScreenCoord: 0 + m_PrefilterNativeRenderPass: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/EntitiesSamples/Assets/Settings/URP-HighFidelity-Renderer.asset b/EntitiesSamples/Assets/Settings/URP-HighFidelity-Renderer.asset index 48612441a..1c4ec10fb 100644 --- a/EntitiesSamples/Assets/Settings/URP-HighFidelity-Renderer.asset +++ b/EntitiesSamples/Assets/Settings/URP-HighFidelity-Renderer.asset @@ -51,6 +51,21 @@ MonoBehaviour: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} + probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, + type: 3} + probeVolumeResources: + probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae, + type: 3} + probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607, + type: 3} + probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664, + type: 3} + probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7, + type: 3} + probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe, + type: 3} + probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, + type: 3} m_RendererFeatures: - {fileID: -1878332245247344467} m_RendererFeatureMap: adc0de57c6d2eee5 @@ -71,7 +86,7 @@ MonoBehaviour: blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} - objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, + screenSpaceLensFlare: {fileID: 4800000, guid: 701880fecb344ea4c9cd0db3407ab287, type: 3} dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3} diff --git a/EntitiesSamples/Assets/Settings/URP-HighFidelity.asset b/EntitiesSamples/Assets/Settings/URP-HighFidelity.asset index d576fcd18..784a9359f 100644 --- a/EntitiesSamples/Assets/Settings/URP-HighFidelity.asset +++ b/EntitiesSamples/Assets/Settings/URP-HighFidelity.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: URP-HighFidelity m_EditorClassIdentifier: - k_AssetVersion: 11 - k_AssetPreviousVersion: 11 + k_AssetVersion: 12 + k_AssetPreviousVersion: 12 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -32,6 +32,11 @@ MonoBehaviour: m_FsrSharpness: 0.92 m_EnableLODCrossFade: 1 m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 + m_LightProbeSystem: 0 + m_ProbeVolumeMemoryBudget: 1024 + m_SupportProbeVolumeStreaming: 0 + m_ProbeVolumeSHBands: 1 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 4096 @@ -71,14 +76,57 @@ MonoBehaviour: m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 + m_SupportScreenSpaceLensFlare: 1 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_VolumeFrameworkUpdateMode: 0 + m_VolumeProfile: {fileID: 0} m_Textures: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + apvScenesData: + m_ObsoleteSerializedBakingSets: [] + sceneToBakingSet: + m_Keys: [] + m_Values: [] + bakingSets: [] + sceneBounds: + m_Keys: [] + m_Values: [] + hasProbeVolumes: + m_Keys: [] + m_Values: + m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 1 + m_PrefilterXRKeywords: 0 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 1 + m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilterDebugKeywords: 0 + m_PrefilterWriteRenderingLayers: 0 + m_PrefilterHDROutput: 0 + m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAOSourceDepthLow: 0 + m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOSampleCountLow: 0 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 0 + m_PrefilterDBufferMRT1: 0 + m_PrefilterDBufferMRT2: 0 + m_PrefilterDBufferMRT3: 0 + m_PrefilterSoftShadowsQualityLow: 0 + m_PrefilterSoftShadowsQualityMedium: 0 + m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterSoftShadows: 0 + m_PrefilterScreenCoord: 0 + m_PrefilterNativeRenderPass: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 1 diff --git a/EntitiesSamples/Assets/Settings/URP-Performant.asset b/EntitiesSamples/Assets/Settings/URP-Performant.asset index 5f511b443..f29be2c2f 100644 --- a/EntitiesSamples/Assets/Settings/URP-Performant.asset +++ b/EntitiesSamples/Assets/Settings/URP-Performant.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: URP-Performant m_EditorClassIdentifier: - k_AssetVersion: 11 - k_AssetPreviousVersion: 11 + k_AssetVersion: 12 + k_AssetPreviousVersion: 12 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -32,6 +32,11 @@ MonoBehaviour: m_FsrSharpness: 0.92 m_EnableLODCrossFade: 1 m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 + m_LightProbeSystem: 0 + m_ProbeVolumeMemoryBudget: 1024 + m_SupportProbeVolumeStreaming: 0 + m_ProbeVolumeSHBands: 1 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 0 m_MainLightShadowmapResolution: 1024 @@ -71,14 +76,57 @@ MonoBehaviour: m_ColorGradingMode: 0 m_ColorGradingLutSize: 16 m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 + m_SupportScreenSpaceLensFlare: 1 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_VolumeFrameworkUpdateMode: 0 + m_VolumeProfile: {fileID: 0} m_Textures: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + apvScenesData: + m_ObsoleteSerializedBakingSets: [] + sceneToBakingSet: + m_Keys: [] + m_Values: [] + bakingSets: [] + sceneBounds: + m_Keys: [] + m_Values: [] + hasProbeVolumes: + m_Keys: [] + m_Values: + m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 1 + m_PrefilterXRKeywords: 0 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 1 + m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilterDebugKeywords: 0 + m_PrefilterWriteRenderingLayers: 0 + m_PrefilterHDROutput: 0 + m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAOSourceDepthLow: 0 + m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOSampleCountLow: 0 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 0 + m_PrefilterDBufferMRT1: 0 + m_PrefilterDBufferMRT2: 0 + m_PrefilterDBufferMRT3: 0 + m_PrefilterSoftShadowsQualityLow: 0 + m_PrefilterSoftShadowsQualityMedium: 0 + m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterSoftShadows: 0 + m_PrefilterScreenCoord: 0 + m_PrefilterNativeRenderPass: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/EntitiesSamples/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/EntitiesSamples/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 0c0350ed1..0f1ae13fb 100644 --- a/EntitiesSamples/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/EntitiesSamples/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -12,7 +12,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 3 + m_Settings: + m_SettingsList: [] + m_RuntimeSettings: [] + m_AssetVersion: 5 + m_DefaultVolumeProfile: {fileID: 11400000, guid: 2f1c8733e80516942a6aa63991e9d3e6, + type: 2} m_RenderingLayerNames: - Light Layer default - Light Layer 1 @@ -31,11 +36,35 @@ MonoBehaviour: lightLayerName5: Light Layer 5 lightLayerName6: Light Layer 6 lightLayerName7: Light Layer 7 + apvScenesData: + m_ObsoleteSerializedBakingSets: [] + sceneToBakingSet: + m_Keys: [] + m_Values: [] + bakingSets: [] + sceneBounds: + m_Keys: [] + m_Values: [] + hasProbeVolumes: + m_Keys: [] + m_Values: + m_ShaderStrippingSetting: + m_Version: 0 + m_ExportShaderVariants: 1 + m_ShaderVariantLogLevel: 0 + m_StripRuntimeDebugShaders: 1 + m_URPShaderStrippingSetting: + m_Version: 0 + m_StripUnusedPostProcessingVariants: 1 + m_StripUnusedVariants: 1 + m_StripScreenCoordOverrideVariants: 1 + m_ShaderVariantLogLevel: 0 + m_ExportShaderVariants: 1 m_StripDebugVariants: 1 m_StripUnusedPostProcessingVariants: 1 m_StripUnusedVariants: 1 - m_StripUnusedLODCrossFadeVariants: 1 m_StripScreenCoordOverrideVariants: 1 supportRuntimeDebugDisplay: 0 - m_ShaderVariantLogLevel: 0 - m_ExportShaderVariants: 1 + references: + version: 2 + RefIds: [] diff --git a/EntitiesSamples/Assets/Streaming/AssetManagement/SampleAssets/BackgroundMaterial.mat b/EntitiesSamples/Assets/Streaming/AssetManagement/SampleAssets/BackgroundMaterial.mat index 7f4d3040d..da562b157 100644 --- a/EntitiesSamples/Assets/Streaming/AssetManagement/SampleAssets/BackgroundMaterial.mat +++ b/EntitiesSamples/Assets/Streaming/AssetManagement/SampleAssets/BackgroundMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -36,6 +36,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/AssetManagement/SampleAssets/ReferencedMaterial.mat b/EntitiesSamples/Assets/Streaming/AssetManagement/SampleAssets/ReferencedMaterial.mat index cb7affe41..f1958d912 100644 --- a/EntitiesSamples/Assets/Streaming/AssetManagement/SampleAssets/ReferencedMaterial.mat +++ b/EntitiesSamples/Assets/Streaming/AssetManagement/SampleAssets/ReferencedMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Blue.mat b/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Blue.mat index f7f7f6eca..7b9faf42a 100644 --- a/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Blue.mat +++ b/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Blue.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Green.mat b/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Green.mat index 74df33196..62e539b0d 100644 --- a/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Green.mat +++ b/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Green.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Grey.mat b/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Grey.mat index 0441030a2..df8762a8f 100644 --- a/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Grey.mat +++ b/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Grey.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Orange.mat b/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Orange.mat index 5c96f8588..d68e20ac8 100644 --- a/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Orange.mat +++ b/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Orange.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Red.mat b/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Red.mat index 0b6e93cf1..8073cd854 100644 --- a/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Red.mat +++ b/EntitiesSamples/Assets/Streaming/PrefabAndSceneReferences/Red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Unit_Rooftop_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Unit_Rooftop_A.mat index e4bb9b09c..53698e5fd 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Unit_Rooftop_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Unit_Rooftop_A.mat @@ -15,14 +15,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Aircondition_Unit_Rooftop_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +39,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +183,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -357,3 +362,17 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &8777103672290837099 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Unit_Rooftop_B.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Unit_Rooftop_B.mat index 526b10d3c..b171d03fa 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Unit_Rooftop_B.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Unit_Rooftop_B.mat @@ -13,16 +13,32 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 2 +--- !u!114 &-604458094891439725 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Aircondition_Unit_Rooftop_B m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +52,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +196,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -357,3 +375,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_A.mat index 68d51d156..a66e2c9c9 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_A.mat @@ -15,14 +15,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Aircondition_Units_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +39,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +183,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -357,3 +362,17 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &609238168339435974 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_B.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_B.mat index 8421460cd..5b41d5fc5 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_B.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_B.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Aircondition_Units_B m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -23,6 +26,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,6 +170,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -344,6 +349,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &996453960704542652 MonoBehaviour: m_ObjectHideFlags: 11 @@ -357,3 +363,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 2 +--- !u!114 &2369133322714771472 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_C.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_C.mat index 844bbfff2..f97f61211 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_C.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_C.mat @@ -15,14 +15,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Aircondition_Units_C m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +39,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +183,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -357,3 +362,17 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &6911102800240573358 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_C_AnimSupport.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_C_AnimSupport.mat index 4eed5b383..9dd1d5226 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_C_AnimSupport.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Aircondition_Units_A/Aircondition_Units_C_AnimSupport.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Aircondition_Units_C_AnimSupport m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -23,6 +26,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,6 +170,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -348,6 +353,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2344709291104643345 MonoBehaviour: m_ObjectHideFlags: 11 @@ -361,3 +367,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 2 +--- !u!114 &5106017952820386911 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A.mat index 228b87d03..97443d945 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Buildings_Tileset_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -23,6 +26,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,6 +170,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -348,6 +353,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7115214386207723819 MonoBehaviour: m_ObjectHideFlags: 11 @@ -361,3 +367,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 2 +--- !u!114 &7276722675682109829 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Railing.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Railing.mat index 05aa7cccc..e59f7794e 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Railing.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Railing.mat @@ -13,16 +13,32 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 2 +--- !u!114 &-446224988738635793 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Buildings_Tileset_A_Railing m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +52,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +196,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -358,3 +376,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Tarp.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Tarp.mat index c5e87b2b4..4df7ff97b 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Tarp.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Building_Tileset_A/Buildings_Tileset_A_Tarp.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Buildings_Tileset_A_Tarp m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -23,6 +26,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,6 +170,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -349,6 +354,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3021955407357784419 MonoBehaviour: m_ObjectHideFlags: 11 @@ -362,3 +368,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 2 +--- !u!114 &7701877381023659823 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Floorlight_A/Floorlight_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Floorlight_A/Floorlight_A.mat index 9f9676f09..f5d4e9df0 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Floorlight_A/Floorlight_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Floorlight_A/Floorlight_A.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8774216200052837047 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!114 &-497275459097214073 MonoBehaviour: m_ObjectHideFlags: 11 @@ -15,14 +28,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Floorlight_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +52,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +196,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -358,3 +376,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Laundry_Collection_A/Laundry_Collection_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Laundry_Collection_A/Laundry_Collection_A.mat index 096f7a3e2..717fe36d5 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Laundry_Collection_A/Laundry_Collection_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Laundry_Collection_A/Laundry_Collection_A.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7171970805950755925 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!114 &-4856390327495306590 MonoBehaviour: m_ObjectHideFlags: 11 @@ -15,14 +28,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Laundry_Collection_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +52,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +196,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -358,3 +376,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Neon_Signs_A/Neon_Signs_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Neon_Signs_A/Neon_Signs_A.mat index 3ff7fb0e6..51f275e64 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Neon_Signs_A/Neon_Signs_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Neon_Signs_A/Neon_Signs_A.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8849291696945554484 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!114 &-1666131991485055872 MonoBehaviour: m_ObjectHideFlags: 11 @@ -15,14 +28,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Neon_Signs_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +52,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +196,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -362,3 +380,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Decoration_A/Pagoda_Decoration_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Decoration_A/Pagoda_Decoration_A.mat index 8060d72c9..dafb7fb30 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Decoration_A/Pagoda_Decoration_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Decoration_A/Pagoda_Decoration_A.mat @@ -1,15 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-9058714874804330534 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pagoda_Decoration_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -23,6 +39,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,6 +183,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -344,6 +362,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1189899733165644110 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_A.mat index 9a6211fab..ab49c57fc 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_A.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pagoda_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -23,6 +26,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,6 +170,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -348,6 +353,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1486775602705138934 MonoBehaviour: m_ObjectHideFlags: 11 @@ -361,3 +367,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 2 +--- !u!114 &8246024378776542811 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Ceiling_Tiling_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Ceiling_Tiling_A.mat index 0c73a7123..2efb919d1 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Ceiling_Tiling_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Ceiling_Tiling_A.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pagoda_Ceiling_Tiling_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -23,6 +26,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,6 +170,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -344,6 +349,20 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &885506728903432346 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!114 &2060384372237996112 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_RoofTiles_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_RoofTiles_A.mat index 4eafba655..25a9d573e 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_RoofTiles_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_RoofTiles_A.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2882999921288359046 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!114 &-1340693527316031038 MonoBehaviour: m_ObjectHideFlags: 11 @@ -15,14 +28,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pagoda_RoofTiles_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +52,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +196,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -361,3 +379,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Roof_Trims_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Roof_Trims_A.mat index 61262e7b8..9780423ea 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Roof_Trims_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Roof_Trims_A.mat @@ -15,14 +15,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pagoda_Roof_Trims_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +39,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +183,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -361,3 +366,17 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &5567055679849938836 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Tileset_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Tileset_A.mat index adc7e1ead..4c89ddb36 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Tileset_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Tileset_A.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pagoda_Tileset_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -23,6 +26,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,6 +170,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -344,6 +349,20 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &898742737069446855 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!114 &7931443250498630734 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Trims_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Trims_A.mat index 62f88b51a..355771622 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Trims_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pagoda_Tileset_A/Pagoda_Trims_A.mat @@ -15,14 +15,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pagoda_Trims_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +39,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +183,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -361,3 +366,17 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &768693853724810007 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pipes_A/Pipes_A_Blue.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pipes_A/Pipes_A_Blue.mat index a54ceb9c7..b48ff615f 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pipes_A/Pipes_A_Blue.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pipes_A/Pipes_A_Blue.mat @@ -15,14 +15,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pipes_A_Blue m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +39,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +183,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -357,3 +362,17 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &9162571484620457025 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pipes_A/Pipes_A_Red.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pipes_A/Pipes_A_Red.mat index 936b4dc01..f325f741a 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pipes_A/Pipes_A_Red.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pipes_A/Pipes_A_Red.mat @@ -13,16 +13,32 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 2 +--- !u!114 &-1252845986157931784 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pipes_A_Red m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +52,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +196,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -357,3 +375,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pipes_A/Pipes_A_White.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pipes_A/Pipes_A_White.mat index 2f9f66f10..3deca8f7a 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pipes_A/Pipes_A_White.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Pipes_A/Pipes_A_White.mat @@ -15,14 +15,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pipes_A_White m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +39,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +183,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -358,3 +363,17 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &2955221050365825214 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_A.mat index b583e78e7..3f4834966 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_A.mat @@ -1,15 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-321963312895219659 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Satellite_Dish_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -23,6 +39,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,6 +183,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -348,6 +366,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3055512164104973148 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_B.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_B.mat index e99ed23b4..60e1f09da 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_B.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_B.mat @@ -13,16 +13,32 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 2 +--- !u!114 &-943040617797445776 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Satellite_Dish_B m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +52,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +196,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -361,3 +379,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_C.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_C.mat index 33830ccb3..87c87e301 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_C.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dish_C.mat @@ -15,14 +15,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Satellite_Dish_C m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +39,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +183,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -361,3 +366,17 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &8656362653801189064 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dishes_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dishes_A.mat index e113435d8..7b9f50acf 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dishes_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Satellite_Dishes_A/Satellite_Dishes_A.mat @@ -13,16 +13,32 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 2 +--- !u!114 &-161767509835757507 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Satellite_Dishes_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +52,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +196,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -361,3 +379,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Scaffolding_A/Scaffolding_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Scaffolding_A/Scaffolding_A.mat index 2107cf675..c9e42d078 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Scaffolding_A/Scaffolding_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Scaffolding_A/Scaffolding_A.mat @@ -15,14 +15,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Scaffolding_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +39,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +183,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -362,3 +367,17 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &8297230322402436654 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Trash_A/Trash_Blend_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Trash_A/Trash_Blend_A.mat index 439a108f3..5b59e68a8 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Trash_A/Trash_Blend_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Trash_A/Trash_Blend_A.mat @@ -1,15 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-27864715882078328 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Trash_Blend_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -20,6 +36,7 @@ Material: disabledShaderPasses: - MOTIONVECTORS - TransparentBackface + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -339,6 +356,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -685,6 +703,7 @@ Material: - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} - _uv_scale: {r: 0.1, g: 1, b: 0.1, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1161673879726810070 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Window_Collection_A/Window_Collection_A.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Window_Collection_A/Window_Collection_A.mat index dbf12e371..7fa461fd6 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Window_Collection_A/Window_Collection_A.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Window_Collection_A/Window_Collection_A.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3878852587966922331 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!114 &-3399956598296182576 MonoBehaviour: m_ObjectHideFlags: 11 @@ -15,14 +28,17 @@ MonoBehaviour: version: 2 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Window_Collection_A m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -36,6 +52,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -179,6 +196,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -357,3 +375,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Window_Collection_A/Window_Collection_A_Emissive.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Window_Collection_A/Window_Collection_A_Emissive.mat index ae064bb3d..d3e7ee201 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Window_Collection_A/Window_Collection_A_Emissive.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Window_Collection_A/Window_Collection_A_Emissive.mat @@ -2,14 +2,17 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Window_Collection_A_Emissive m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -23,6 +26,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,6 +170,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -344,6 +349,20 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &2615388714215453194 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!114 &2759289826851058182 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Window_Collection_A/Window_Collection_A_Glass.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Window_Collection_A/Window_Collection_A_Glass.mat index d3009fa83..5970e195b 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Window_Collection_A/Window_Collection_A_Glass.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Environment/Window_Collection_A/Window_Collection_A_Glass.mat @@ -1,15 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4207053981476043110 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Window_Collection_A_Glass m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -23,6 +39,7 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,6 +183,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - Vector1_9154D9D: 1 - _AORemapMax: 1 @@ -348,6 +366,7 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2534985893394603880 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Rendering/_ShadowCaster.mat b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Rendering/_ShadowCaster.mat index a37018a9c..57fabf6d2 100644 --- a/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Rendering/_ShadowCaster.mat +++ b/EntitiesSamples/Assets/Streaming/RuntimeContentManager/Environment/Materials/Rendering/_ShadowCaster.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!114 &-1317402167762021759 MonoBehaviour: m_ObjectHideFlags: 11 @@ -342,3 +342,4 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/SceneManagement/8. Complete/Buildings/High.mat b/EntitiesSamples/Assets/Streaming/SceneManagement/8. Complete/Buildings/High.mat index 0fc9749a7..fb25ae067 100644 --- a/EntitiesSamples/Assets/Streaming/SceneManagement/8. Complete/Buildings/High.mat +++ b/EntitiesSamples/Assets/Streaming/SceneManagement/8. Complete/Buildings/High.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/SceneManagement/8. Complete/Buildings/Low.mat b/EntitiesSamples/Assets/Streaming/SceneManagement/8. Complete/Buildings/Low.mat index 4a810a731..9fc34fa08 100644 --- a/EntitiesSamples/Assets/Streaming/SceneManagement/8. Complete/Buildings/Low.mat +++ b/EntitiesSamples/Assets/Streaming/SceneManagement/8. Complete/Buildings/Low.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Streaming/SceneManagement/8. Complete/Buildings/Medium.mat b/EntitiesSamples/Assets/Streaming/SceneManagement/8. Complete/Buildings/Medium.mat index 315b6ad56..f4ebbfa9a 100644 --- a/EntitiesSamples/Assets/Streaming/SceneManagement/8. Complete/Buildings/Medium.mat +++ b/EntitiesSamples/Assets/Streaming/SceneManagement/8. Complete/Buildings/Medium.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Tutorials/Kickball/Common/Ball.mat b/EntitiesSamples/Assets/Tutorials/Kickball/Common/Ball.mat index c6b2bcb24..d87451c33 100644 --- a/EntitiesSamples/Assets/Tutorials/Kickball/Common/Ball.mat +++ b/EntitiesSamples/Assets/Tutorials/Kickball/Common/Ball.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Tutorials/Kickball/Common/Ground.mat b/EntitiesSamples/Assets/Tutorials/Kickball/Common/Ground.mat index ab9143525..05c0e72c2 100644 --- a/EntitiesSamples/Assets/Tutorials/Kickball/Common/Ground.mat +++ b/EntitiesSamples/Assets/Tutorials/Kickball/Common/Ground.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Tutorials/Kickball/Common/Player.mat b/EntitiesSamples/Assets/Tutorials/Kickball/Common/Player.mat index 975a3c4fe..e11ce32ca 100644 --- a/EntitiesSamples/Assets/Tutorials/Kickball/Common/Player.mat +++ b/EntitiesSamples/Assets/Tutorials/Kickball/Common/Player.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -131,3 +132,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/EntitiesSamples/Assets/Tutorials/Tanks/Common/Default.mat b/EntitiesSamples/Assets/Tutorials/Tanks/Common/Default.mat index be7936c61..39cb66cd0 100644 --- a/EntitiesSamples/Assets/Tutorials/Tanks/Common/Default.mat +++ b/EntitiesSamples/Assets/Tutorials/Tanks/Common/Default.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -118,6 +119,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7955112743622329414 MonoBehaviour: m_ObjectHideFlags: 11 @@ -130,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/EntitiesSamples/Packages/manifest.json b/EntitiesSamples/Packages/manifest.json index ff0e56176..1670aa6de 100644 --- a/EntitiesSamples/Packages/manifest.json +++ b/EntitiesSamples/Packages/manifest.json @@ -2,14 +2,13 @@ "dependencies": { "com.unity.collab-proxy": "2.3.1", "com.unity.entities.graphics": "1.2.0", - "com.unity.feature.development": "1.0.1", + "com.unity.feature.development": "1.0.2", "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.ide.vscode": "1.2.5", - "com.unity.render-pipelines.universal": "14.0.10", - "com.unity.textmeshpro": "3.0.6", - "com.unity.ugui": "1.0.0", + "com.unity.render-pipelines.universal": "16.0.6", + "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.9.2", + "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/EntitiesSamples/Packages/packages-lock.json b/EntitiesSamples/Packages/packages-lock.json index 291056727..77c7350d0 100644 --- a/EntitiesSamples/Packages/packages-lock.json +++ b/EntitiesSamples/Packages/packages-lock.json @@ -68,23 +68,22 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "2.0.3", - "depth": 4, + "version": "2.0.5", + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.feature.development": { - "version": "1.0.1", + "version": "1.0.2", "depth": 0, "source": "builtin", "dependencies": { "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.rider": "3.0.28", - "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.2", - "com.unity.test-framework": "1.1.33", + "com.unity.test-framework": "1.3.9", "com.unity.testtools.codecoverage": "1.2.5" } }, @@ -106,13 +105,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.ide.vscode": { - "version": "1.2.5", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.mathematics": { "version": "1.3.1", "depth": 2, @@ -142,38 +134,41 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.10", + "version": "16.0.6", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.ugui": "1.0.0", + "com.unity.mathematics": "1.2.4", + "com.unity.ugui": "2.0.0", "com.unity.modules.physics": "1.0.0", "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.rendering.light-transport": "1.0.0" } }, "com.unity.render-pipelines.universal": { - "version": "14.0.10", + "version": "16.0.6", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.8.9", - "com.unity.render-pipelines.core": "14.0.10", - "com.unity.shadergraph": "14.0.10", - "com.unity.render-pipelines.universal-config": "14.0.9" + "com.unity.render-pipelines.core": "16.0.6", + "com.unity.shadergraph": "16.0.6" } }, - "com.unity.render-pipelines.universal-config": { - "version": "14.0.9", - "depth": 1, + "com.unity.rendering.light-transport": { + "version": "1.0.1", + "depth": 2, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.9" + "com.unity.collections": "1.4.0", + "com.unity.mathematics": "1.2.4", + "com.unity.render-pipelines.core": "16.0.1" } }, "com.unity.scriptablebuildpipeline": { - "version": "1.21.21", + "version": "1.21.22", "depth": 2, "source": "registry", "dependencies": {}, @@ -204,11 +199,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.10", + "version": "16.0.6", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.10", + "com.unity.render-pipelines.core": "16.0.6", "com.unity.searcher": "4.9.2" } }, @@ -243,17 +238,8 @@ }, "url": "https://packages.unity.com" }, - "com.unity.textmeshpro": { - "version": "3.0.6", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -271,6 +257,12 @@ }, "url": "https://packages.unity.com" }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -318,6 +310,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -398,7 +396,8 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/EntitiesSamples/ProjectSettings/MultiplayerManager.asset b/EntitiesSamples/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 000000000..8073753a0 --- /dev/null +++ b/EntitiesSamples/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_ActiveMultiplayerRole: 0 diff --git a/EntitiesSamples/ProjectSettings/ProjectVersion.txt b/EntitiesSamples/ProjectSettings/ProjectVersion.txt index 759df3ac6..cd8dbd1cc 100644 --- a/EntitiesSamples/ProjectSettings/ProjectVersion.txt +++ b/EntitiesSamples/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.23f1 -m_EditorVersionWithRevision: 2022.3.23f1 (dbb3f7c5b5c6) +m_EditorVersion: 2023.2.19f1 +m_EditorVersionWithRevision: 2023.2.19f1 (95c298372b1e) diff --git a/EntitiesSamples/ProjectSettings/ShaderGraphSettings.asset b/EntitiesSamples/ProjectSettings/ShaderGraphSettings.asset index 3250b068e..9b28428b9 100644 --- a/EntitiesSamples/ProjectSettings/ShaderGraphSettings.asset +++ b/EntitiesSamples/ProjectSettings/ShaderGraphSettings.asset @@ -12,6 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} m_Name: m_EditorClassIdentifier: - shaderVariantLimit: 128 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 diff --git a/EntitiesSamples/ProjectSettings/URPProjectSettings.asset b/EntitiesSamples/ProjectSettings/URPProjectSettings.asset index cd7fd8c61..08faf0336 100644 --- a/EntitiesSamples/ProjectSettings/URPProjectSettings.asset +++ b/EntitiesSamples/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 7 + m_LastMaterialVersion: 9 diff --git a/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Black.mat b/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Black.mat index 04c52e20b..d44973ba4 100644 --- a/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Black.mat +++ b/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Black.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -122,6 +123,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &672449181531631560 MonoBehaviour: m_ObjectHideFlags: 11 @@ -134,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Ghost.mat b/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Ghost.mat index 10f9cdaaf..62a045851 100644 --- a/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Ghost.mat +++ b/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Ghost.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -106,6 +107,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7562731890861158497 MonoBehaviour: m_ObjectHideFlags: 11 @@ -118,4 +120,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Red.mat b/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Red.mat index 398931de7..6ced26631 100644 --- a/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Red.mat +++ b/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Red.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -33,7 +33,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0.030468838, b: 0.03386589, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Strip.mat b/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Strip.mat index 0dec94063..c02fd0b2a 100644 --- a/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Strip.mat +++ b/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Strip.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.White.mat b/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.White.mat index 954b2a298..c90a98b92 100644 --- a/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.White.mat +++ b/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.White.mat @@ -19,7 +19,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -122,6 +123,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &4107150003659974145 MonoBehaviour: m_ObjectHideFlags: 11 @@ -134,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Yellow.mat b/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Yellow.mat index a940d7f2b..2fd61a0a4 100644 --- a/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Yellow.mat +++ b/PhysicsSamples/Assets/11. Immediate Mode/Materials/Material.Ball.Yellow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -33,7 +33,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -136,3 +137,4 @@ Material: - _EmissionColor: {r: 0, g: 0.030468838, b: 0.03386589, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/12. Planet Gravity/Materials/PlanetMaterial.mat b/PhysicsSamples/Assets/12. Planet Gravity/Materials/PlanetMaterial.mat index 1976f37a6..e64deb78b 100644 --- a/PhysicsSamples/Assets/12. Planet Gravity/Materials/PlanetMaterial.mat +++ b/PhysicsSamples/Assets/12. Planet Gravity/Materials/PlanetMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,3 +134,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Materials/TruckGlass.mat b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Materials/TruckGlass.mat index 6a83695a6..5c2625950 100644 --- a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Materials/TruckGlass.mat +++ b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Materials/TruckGlass.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -37,6 +37,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -137,3 +138,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/BigRigTrailer.mat b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/BigRigTrailer.mat index 35471d0f2..4fa755107 100644 --- a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/BigRigTrailer.mat +++ b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/BigRigTrailer.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -33,7 +33,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -134,3 +135,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/BigRigTyre.mat b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/BigRigTyre.mat index d077b8a5b..f567bb05e 100644 --- a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/BigRigTyre.mat +++ b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/BigRigTyre.mat @@ -20,7 +20,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -121,6 +122,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7998616083018859784 MonoBehaviour: m_ObjectHideFlags: 11 @@ -133,4 +135,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/Cab.mat b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/Cab.mat index 28e9edfdf..51d1d9b80 100644 --- a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/Cab.mat +++ b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/Cab.mat @@ -20,7 +20,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -121,6 +122,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1949370866653418458 MonoBehaviour: m_ObjectHideFlags: 11 @@ -133,4 +135,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/TruckCabInterior.mat b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/TruckCabInterior.mat index 3a7f08d02..79cf31456 100644 --- a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/TruckCabInterior.mat +++ b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/TruckCabInterior.mat @@ -20,7 +20,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -121,6 +122,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &910536405659228953 MonoBehaviour: m_ObjectHideFlags: 11 @@ -133,4 +135,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/TruckGlass.mat b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/TruckGlass.mat index 72977a3a8..dd4f574ed 100644 --- a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/TruckGlass.mat +++ b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Flatbed_Trailer_01/Textures/TruckGlass.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -37,6 +37,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -137,3 +138,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Military/Textures/Truck_Military-Windows.mat b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Military/Textures/Truck_Military-Windows.mat index 41ce61283..1aa34d012 100644 --- a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Military/Textures/Truck_Military-Windows.mat +++ b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Military/Textures/Truck_Military-Windows.mat @@ -24,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -124,6 +125,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &4761953539182009676 MonoBehaviour: m_ObjectHideFlags: 11 @@ -136,4 +138,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Military/Textures/Truck_Military.mat b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Military/Textures/Truck_Military.mat index 4a0087efe..eccf0bbba 100644 --- a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Military/Textures/Truck_Military.mat +++ b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/RocketBox/Truck_Military/Textures/Truck_Military.mat @@ -20,7 +20,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -121,6 +122,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1629446018878698681 MonoBehaviour: m_ObjectHideFlags: 11 @@ -133,4 +135,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/Vehicle.mat b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/Vehicle.mat index 667f011d5..07025eac7 100644 --- a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/Vehicle.mat +++ b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/Vehicle.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,3 +134,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/VehicleChassis.mat b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/VehicleChassis.mat index ba7c220f0..2f923a436 100644 --- a/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/VehicleChassis.mat +++ b/PhysicsSamples/Assets/13. Raycast Car/Prefabs/Models/VehicleChassis.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -32,7 +32,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -133,3 +134,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/6. Events/Materials/Black.mat b/PhysicsSamples/Assets/6. Events/Materials/Black.mat index 66239789e..f8e3dac3b 100644 --- a/PhysicsSamples/Assets/6. Events/Materials/Black.mat +++ b/PhysicsSamples/Assets/6. Events/Materials/Black.mat @@ -21,7 +21,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -125,6 +126,7 @@ Material: - _EmissionColor: {r: 0.0045564175, g: 0.0045564175, b: 0.0045564175, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2365288920973924441 MonoBehaviour: m_ObjectHideFlags: 11 @@ -137,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/PhysicsSamples/Assets/6. Events/Materials/Blue.mat b/PhysicsSamples/Assets/6. Events/Materials/Blue.mat index e0b714cc5..53a61223d 100644 --- a/PhysicsSamples/Assets/6. Events/Materials/Blue.mat +++ b/PhysicsSamples/Assets/6. Events/Materials/Blue.mat @@ -21,7 +21,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -125,6 +126,7 @@ Material: - _EmissionColor: {r: 0.0021182187, g: 0.017713899, b: 0.009562499, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2365288920973924441 MonoBehaviour: m_ObjectHideFlags: 11 @@ -137,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/PhysicsSamples/Assets/6. Events/Materials/Green.mat b/PhysicsSamples/Assets/6. Events/Materials/Green.mat index 17537536d..10446971a 100644 --- a/PhysicsSamples/Assets/6. Events/Materials/Green.mat +++ b/PhysicsSamples/Assets/6. Events/Materials/Green.mat @@ -21,7 +21,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -125,6 +126,7 @@ Material: - _EmissionColor: {r: 0.0490081, g: 0.04062883, b: 0.013259686, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2365288920973924441 MonoBehaviour: m_ObjectHideFlags: 11 @@ -137,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/PhysicsSamples/Assets/6. Events/Materials/PhysicsTriggerTransparent.mat b/PhysicsSamples/Assets/6. Events/Materials/PhysicsTriggerTransparent.mat index 7133cac05..3e03c125d 100644 --- a/PhysicsSamples/Assets/6. Events/Materials/PhysicsTriggerTransparent.mat +++ b/PhysicsSamples/Assets/6. Events/Materials/PhysicsTriggerTransparent.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -39,6 +39,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -163,3 +164,4 @@ Material: - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/6. Events/Materials/Red.mat b/PhysicsSamples/Assets/6. Events/Materials/Red.mat index 2e9a2b7ab..2b51ce1fb 100644 --- a/PhysicsSamples/Assets/6. Events/Materials/Red.mat +++ b/PhysicsSamples/Assets/6. Events/Materials/Red.mat @@ -21,7 +21,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -125,6 +126,7 @@ Material: - _EmissionColor: {r: 0.0058387686, g: 0.011458985, b: 0.017713899, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2365288920973924441 MonoBehaviour: m_ObjectHideFlags: 11 @@ -137,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/PhysicsSamples/Assets/7. Query/MeshDisplayMaterial.mat b/PhysicsSamples/Assets/7. Query/MeshDisplayMaterial.mat index a8f68fb5c..eaf89425e 100644 --- a/PhysicsSamples/Assets/7. Query/MeshDisplayMaterial.mat +++ b/PhysicsSamples/Assets/7. Query/MeshDisplayMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -38,6 +38,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -138,3 +139,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/7. Query/Window.mat b/PhysicsSamples/Assets/7. Query/Window.mat index e3e0a7bf4..e8abaac79 100644 --- a/PhysicsSamples/Assets/7. Query/Window.mat +++ b/PhysicsSamples/Assets/7. Query/Window.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -38,6 +38,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -138,3 +139,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/Common/Materials/Colorful.mat b/PhysicsSamples/Assets/Common/Materials/Colorful.mat index 54cb6ec7f..ddccb1651 100644 --- a/PhysicsSamples/Assets/Common/Materials/Colorful.mat +++ b/PhysicsSamples/Assets/Common/Materials/Colorful.mat @@ -20,7 +20,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -121,6 +122,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3676710219935537556 MonoBehaviour: m_ObjectHideFlags: 11 @@ -133,4 +135,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/PhysicsSamples/Assets/Common/Materials/PhysicsDynamicMaterial.mat b/PhysicsSamples/Assets/Common/Materials/PhysicsDynamicMaterial.mat index 0675f6dc8..7a605661f 100644 --- a/PhysicsSamples/Assets/Common/Materials/PhysicsDynamicMaterial.mat +++ b/PhysicsSamples/Assets/Common/Materials/PhysicsDynamicMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -34,7 +34,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -171,3 +172,4 @@ Material: - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SubLineColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/Common/Materials/PhysicsGhostDynamicMaterial.mat b/PhysicsSamples/Assets/Common/Materials/PhysicsGhostDynamicMaterial.mat index 98f3fb21b..10883980c 100644 --- a/PhysicsSamples/Assets/Common/Materials/PhysicsGhostDynamicMaterial.mat +++ b/PhysicsSamples/Assets/Common/Materials/PhysicsGhostDynamicMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -34,7 +34,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -171,3 +172,4 @@ Material: - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SubLineColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/Common/Materials/PhysicsGhostKinematicMaterial.mat b/PhysicsSamples/Assets/Common/Materials/PhysicsGhostKinematicMaterial.mat index fb6401d15..42209be37 100644 --- a/PhysicsSamples/Assets/Common/Materials/PhysicsGhostKinematicMaterial.mat +++ b/PhysicsSamples/Assets/Common/Materials/PhysicsGhostKinematicMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -34,7 +34,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -145,3 +146,4 @@ Material: - _EmissionColor: {r: 0.045186203, g: 0.048171822, b: 0.3515327, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/Common/Materials/PhysicsHoverMaterial.mat b/PhysicsSamples/Assets/Common/Materials/PhysicsHoverMaterial.mat index 05fd86919..9d09294d8 100644 --- a/PhysicsSamples/Assets/Common/Materials/PhysicsHoverMaterial.mat +++ b/PhysicsSamples/Assets/Common/Materials/PhysicsHoverMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -34,7 +34,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -171,3 +172,4 @@ Material: - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SubLineColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/Common/Materials/PhysicsKinematicMaterial.mat b/PhysicsSamples/Assets/Common/Materials/PhysicsKinematicMaterial.mat index f37d32d7a..693cd2051 100644 --- a/PhysicsSamples/Assets/Common/Materials/PhysicsKinematicMaterial.mat +++ b/PhysicsSamples/Assets/Common/Materials/PhysicsKinematicMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -34,7 +34,8 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -145,3 +146,4 @@ Material: - _EmissionColor: {r: 0, g: 0.0004552905, b: 0.09758736, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/PhysicsSamples/Assets/Common/UniversalRenderPipelineAsset.asset b/PhysicsSamples/Assets/Common/UniversalRenderPipelineAsset.asset index 342c8f97c..25c65eaa9 100644 --- a/PhysicsSamples/Assets/Common/UniversalRenderPipelineAsset.asset +++ b/PhysicsSamples/Assets/Common/UniversalRenderPipelineAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRenderPipelineAsset m_EditorClassIdentifier: - k_AssetVersion: 11 - k_AssetPreviousVersion: 11 + k_AssetVersion: 12 + k_AssetPreviousVersion: 12 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -32,6 +32,11 @@ MonoBehaviour: m_FsrSharpness: 0.92 m_EnableLODCrossFade: 1 m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 + m_LightProbeSystem: 0 + m_ProbeVolumeMemoryBudget: 1024 + m_SupportProbeVolumeStreaming: 0 + m_ProbeVolumeSHBands: 1 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 2048 @@ -52,29 +57,76 @@ MonoBehaviour: m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 0 m_ConservativeEnclosingSphere: 0 m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 2 m_AdditionalLightsCookieResolution: 2048 m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 + m_SupportsLightCookies: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 m_UseFastSRGBLinearConversion: 0 + m_SupportDataDrivenLensFlare: 1 + m_SupportScreenSpaceLensFlare: 1 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_VolumeFrameworkUpdateMode: 0 + m_VolumeProfile: {fileID: 0} m_Textures: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + apvScenesData: + m_ObsoleteSerializedBakingSets: [] + sceneToBakingSet: + m_Keys: [] + m_Values: [] + bakingSets: [] + sceneBounds: + m_Keys: [] + m_Values: [] + hasProbeVolumes: + m_Keys: [] + m_Values: + m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 1 + m_PrefilterXRKeywords: 0 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 1 + m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilterDebugKeywords: 0 + m_PrefilterWriteRenderingLayers: 0 + m_PrefilterHDROutput: 0 + m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAOSourceDepthLow: 0 + m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOSampleCountLow: 0 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 0 + m_PrefilterDBufferMRT1: 0 + m_PrefilterDBufferMRT2: 0 + m_PrefilterDBufferMRT3: 0 + m_PrefilterSoftShadowsQualityLow: 0 + m_PrefilterSoftShadowsQualityMedium: 0 + m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilterSoftShadows: 0 + m_PrefilterScreenCoord: 0 + m_PrefilterNativeRenderPass: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/PhysicsSamples/Assets/Common/UniversalRenderPipelineAsset_Renderer.asset b/PhysicsSamples/Assets/Common/UniversalRenderPipelineAsset_Renderer.asset index cacebdc3c..e156912bb 100644 --- a/PhysicsSamples/Assets/Common/UniversalRenderPipelineAsset_Renderer.asset +++ b/PhysicsSamples/Assets/Common/UniversalRenderPipelineAsset_Renderer.asset @@ -16,6 +16,21 @@ MonoBehaviour: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} + probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, + type: 3} + probeVolumeResources: + probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae, + type: 3} + probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607, + type: 3} + probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664, + type: 3} + probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7, + type: 3} + probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe, + type: 3} + probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, + type: 3} m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 @@ -36,7 +51,9 @@ MonoBehaviour: blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} - objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, + screenSpaceLensFlare: {fileID: 4800000, guid: 701880fecb344ea4c9cd0db3407ab287, + type: 3} + dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3} m_AssetVersion: 2 m_OpaqueLayerMask: diff --git a/PhysicsSamples/Assets/DefaultVolumeProfile.asset b/PhysicsSamples/Assets/DefaultVolumeProfile.asset new file mode 100644 index 000000000..36c3781ad --- /dev/null +++ b/PhysicsSamples/Assets/DefaultVolumeProfile.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: DefaultVolumeProfile + m_EditorClassIdentifier: + components: [] diff --git a/PhysicsSamples/Assets/DefaultVolumeProfile.asset.meta b/PhysicsSamples/Assets/DefaultVolumeProfile.asset.meta new file mode 100644 index 000000000..6fa100f22 --- /dev/null +++ b/PhysicsSamples/Assets/DefaultVolumeProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd10788ce2d23804b8d61025a93c3f31 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/PhysicsSamples/Assets/UniversalRenderPipelineGlobalSettings.asset b/PhysicsSamples/Assets/UniversalRenderPipelineGlobalSettings.asset index f9a3a4b6f..c6f8ddb35 100644 --- a/PhysicsSamples/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/PhysicsSamples/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -12,7 +12,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 3 + m_Settings: + m_SettingsList: [] + m_RuntimeSettings: [] + m_AssetVersion: 5 + m_DefaultVolumeProfile: {fileID: 11400000, guid: dd10788ce2d23804b8d61025a93c3f31, + type: 2} m_RenderingLayerNames: - Light Layer default - Light Layer 1 @@ -31,12 +36,35 @@ MonoBehaviour: lightLayerName5: Light Layer 5 lightLayerName6: Light Layer 6 lightLayerName7: Light Layer 7 + apvScenesData: + m_ObsoleteSerializedBakingSets: [] + sceneToBakingSet: + m_Keys: [] + m_Values: [] + bakingSets: [] + sceneBounds: + m_Keys: [] + m_Values: [] + hasProbeVolumes: + m_Keys: [] + m_Values: + m_ShaderStrippingSetting: + m_Version: 0 + m_ExportShaderVariants: 1 + m_ShaderVariantLogLevel: 1 + m_StripRuntimeDebugShaders: 1 + m_URPShaderStrippingSetting: + m_Version: 0 + m_StripUnusedPostProcessingVariants: 0 + m_StripUnusedVariants: 0 + m_StripScreenCoordOverrideVariants: 1 + m_ShaderVariantLogLevel: 1 + m_ExportShaderVariants: 1 m_StripDebugVariants: 1 m_StripUnusedPostProcessingVariants: 0 m_StripUnusedVariants: 0 - m_EnableRenderGraph: 0 - m_StripUnusedLODCrossFadeVariants: 1 m_StripScreenCoordOverrideVariants: 1 supportRuntimeDebugDisplay: 0 - m_ShaderVariantLogLevel: 1 - m_ExportShaderVariants: 1 + references: + version: 2 + RefIds: [] diff --git a/PhysicsSamples/Packages/manifest.json b/PhysicsSamples/Packages/manifest.json index cf84fdf4e..3fa53e5c4 100644 --- a/PhysicsSamples/Packages/manifest.json +++ b/PhysicsSamples/Packages/manifest.json @@ -5,7 +5,6 @@ "com.unity.entities.graphics": "1.0.10", "com.unity.ide.rider": "3.0.21", "com.unity.ide.visualstudio": "2.0.18", - "com.unity.ide.vscode": "1.2.5", "com.unity.inputsystem": "1.3.0", "com.unity.performance.profile-analyzer": "1.1.1", "com.unity.physics": "1.0.10", diff --git a/PhysicsSamples/ProjectSettings/MultiplayerManager.asset b/PhysicsSamples/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 000000000..8073753a0 --- /dev/null +++ b/PhysicsSamples/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_ActiveMultiplayerRole: 0 diff --git a/PhysicsSamples/ProjectSettings/ProjectVersion.txt b/PhysicsSamples/ProjectSettings/ProjectVersion.txt index 56ddb83a4..cd8dbd1cc 100644 --- a/PhysicsSamples/ProjectSettings/ProjectVersion.txt +++ b/PhysicsSamples/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.0f1 -m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476) +m_EditorVersion: 2023.2.19f1 +m_EditorVersionWithRevision: 2023.2.19f1 (95c298372b1e) diff --git a/PhysicsSamples/ProjectSettings/URPProjectSettings.asset b/PhysicsSamples/ProjectSettings/URPProjectSettings.asset index cd7fd8c61..08faf0336 100644 --- a/PhysicsSamples/ProjectSettings/URPProjectSettings.asset +++ b/PhysicsSamples/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 7 + m_LastMaterialVersion: 9