diff --git a/Assets/Obi/Samples/Common/SampleResources/Materials/Checker.mat b/Assets/Obi/Samples/Common/SampleResources/Materials/Checker.mat index e2aefe395..1a6c7f865 100644 --- a/Assets/Obi/Samples/Common/SampleResources/Materials/Checker.mat +++ b/Assets/Obi/Samples/Common/SampleResources/Materials/Checker.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -21,18 +21,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Checker - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 1 + m_LightmapFlags: 7 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -95,8 +97,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -105,6 +110,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -116,13 +122,15 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0.3 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Obi/Samples/Common/SampleResources/Materials/CoarseChecker.mat b/Assets/Obi/Samples/Common/SampleResources/Materials/CoarseChecker.mat index ef95fa00a..e7382de57 100644 --- a/Assets/Obi/Samples/Common/SampleResources/Materials/CoarseChecker.mat +++ b/Assets/Obi/Samples/Common/SampleResources/Materials/CoarseChecker.mat @@ -8,17 +8,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: CoarseChecker - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -81,8 +84,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -91,6 +97,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 @@ -112,9 +119,11 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} @@ -136,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 10 diff --git a/Assets/Obi/Samples/Common/SampleResources/Materials/FinishLine.mat b/Assets/Obi/Samples/Common/SampleResources/Materials/FinishLine.mat index ad9a04f8e..bf0656f91 100644 --- a/Assets/Obi/Samples/Common/SampleResources/Materials/FinishLine.mat +++ b/Assets/Obi/Samples/Common/SampleResources/Materials/FinishLine.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3116803505210771524 +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: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -8,23 +21,27 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: FinishLine - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: -1 stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 8fbd9c5f957b8434883cdfce9d6a3c27, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -46,8 +63,8 @@ Material: m_Scale: {x: 5, y: 5} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 8fbd9c5f957b8434883cdfce9d6a3c27, type: 3} - m_Scale: {x: 5, y: 5} + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -61,12 +78,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.2 - _GlossyReflections: 1 @@ -74,13 +118,22 @@ Material: - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.2 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 - _UVSec: 0 - - _ZWrite: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 0, b: 0, a: 1} + - _BaseColor: {r: 1, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.9843137, g: 0.21960784, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/Obi/Samples/Common/SampleResources/Materials/Flesh.mat b/Assets/Obi/Samples/Common/SampleResources/Materials/Flesh.mat index 0c8b428be..4c45ca170 100644 --- a/Assets/Obi/Samples/Common/SampleResources/Materials/Flesh.mat +++ b/Assets/Obi/Samples/Common/SampleResources/Materials/Flesh.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Flesh - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -17,12 +17,18 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -59,12 +65,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 2 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.25 - _GlossyReflections: 1 @@ -72,13 +105,35 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.25 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 0.72530067, b: 0.61960787, a: 1} + - _BaseColor: {r: 1, g: 0.72530067, b: 0.61960775, a: 1} + - _Color: {r: 1, g: 0.72530067, b: 0.61960775, a: 1} - _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 &6128960529012650285 +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: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/Obi/Samples/Common/SampleResources/Materials/Metal.mat b/Assets/Obi/Samples/Common/SampleResources/Materials/Metal.mat index 337a2a7e4..88c40ab73 100644 --- a/Assets/Obi/Samples/Common/SampleResources/Materials/Metal.mat +++ b/Assets/Obi/Samples/Common/SampleResources/Materials/Metal.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Metal - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: @@ -18,12 +18,18 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -60,13 +66,40 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.7 - _GlossyReflections: 1 @@ -74,14 +107,36 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.7 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} - _Color: {r: 0.6, g: 0.6, b: 0.6, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 +--- !u!114 &3941858299620828793 +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: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/Obi/Samples/Common/SampleResources/Materials/TestEnvironment.mat b/Assets/Obi/Samples/Common/SampleResources/Materials/TestEnvironment.mat index 1656355a7..9bcd28ea3 100644 --- a/Assets/Obi/Samples/Common/SampleResources/Materials/TestEnvironment.mat +++ b/Assets/Obi/Samples/Common/SampleResources/Materials/TestEnvironment.mat @@ -8,19 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TestEnvironment - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _EMISSION - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A m_InvalidKeywords: [] - m_LightmapFlags: 1 + m_LightmapFlags: 7 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -69,15 +71,34 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0.5 - _Glossiness: 0.5 @@ -92,9 +113,11 @@ Material: - _SmoothnessTextureChannel: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} @@ -115,4 +138,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 2 + version: 10 diff --git a/Assets/Obi/Samples/Common/SampleResources/Materials/Walls.mat b/Assets/Obi/Samples/Common/SampleResources/Materials/Walls.mat index 21e8d04db..9eaa3f9d6 100644 --- a/Assets/Obi/Samples/Common/SampleResources/Materials/Walls.mat +++ b/Assets/Obi/Samples/Common/SampleResources/Materials/Walls.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3939746429587326896 +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: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -8,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walls - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: @@ -18,12 +31,18 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -46,7 +65,7 @@ Material: m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} - m_Scale: {x: 9, y: 5} + m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -60,13 +79,40 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.3 - _GlossyReflections: 1 @@ -74,14 +120,23 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.3 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 1} + - _BaseColor: {r: 0.49803913, g: 0.49803913, b: 0.49803913, a: 1} + - _Color: {r: 0.49803907, g: 0.49803907, b: 0.49803907, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/Obi/~$README.rtf b/Assets/Obi/~$README.rtf new file mode 100644 index 000000000..acf7160e9 Binary files /dev/null and b/Assets/Obi/~$README.rtf differ diff --git a/Assets/Obi/~$README.rtf.meta b/Assets/Obi/~$README.rtf.meta new file mode 100644 index 000000000..908be610e --- /dev/null +++ b/Assets/Obi/~$README.rtf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c9ce6d38354f41d4ebd283787291dc8f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResRaw/Maps/Map1/Map1.unity b/Assets/ResRaw/Maps/Map1/Map1.unity index da3266d6f..d12ebdb51 100644 --- a/Assets/ResRaw/Maps/Map1/Map1.unity +++ b/Assets/ResRaw/Maps/Map1/Map1.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 0.8050667 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} - m_SkyboxMaterial: {fileID: 1849940596} + m_SkyboxMaterial: {fileID: 2001368536} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -1445,7 +1445,7 @@ MonoBehaviour: _MaximumSpeed: 100 _WarnOnSpeedClamp: 0 _DebugSubsteps: 0 ---- !u!21 &1849940596 +--- !u!21 &2001368536 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -8617,8 +8617,7 @@ MonoBehaviour: WaterObject: {fileID: 718680767} Node: {fileID: 3673832994973231279} GearNode: {fileID: 6022323663597824692} - Water: {fileID: 0} - obiFixedUpdater: {fileID: 0} + Water: {fileID: 718680768} LineRenderer: {fileID: 0} FPS: 0 updateInterval: 0.2 @@ -9766,9 +9765,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 434d88f9b3534406382ff56c0e74bd9a, type: 3} m_Name: m_EditorClassIdentifier: Obi::Obi.ObiLateUpdater - solvers: [] - deltaSmoothing: 0.95 - substeps: 4 --- !u!1 &8631023225256132614 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ResRaw/Prefabs/Line/LineSolver.prefab b/Assets/ResRaw/Prefabs/Line/LineSolver.prefab index c7addb3ec..dad1b4bee 100644 --- a/Assets/ResRaw/Prefabs/Line/LineSolver.prefab +++ b/Assets/ResRaw/Prefabs/Line/LineSolver.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 744750288977666519} - component: {fileID: 6985090007750348232} - - component: {fileID: 6445827893924548657} m_Layer: 0 m_Name: LineSolver m_TagString: Untagged @@ -47,23 +46,57 @@ MonoBehaviour: m_EditorClassIdentifier: Obi::Obi.ObiSolver simulateWhenInvisible: 1 m_Backend: 1 + substeps: 4 + maxStepsPerFrame: 1 + synchronization: 1 parameters: mode: 0 interpolation: 0 gravity: {x: 0, y: -9.81, z: 0} + ambientWind: {x: 0, y: 0, z: 0} + foamGravityScale: 1 damping: 0.997 maxAnisotropy: 1 sleepThreshold: 0.005 + maxVelocity: 50 + maxAngularVelocity: 20 collisionMargin: 0.02 maxDepenetration: 10 - continuousCollisionDetection: 1 + colliderCCD: 1 + particleCCD: 0 shockPropagation: 0 surfaceCollisionIterations: 1 surfaceCollisionTolerance: 0.005 + diffusionMask: {x: 1, y: 1, z: 1, w: 1} + m_MaxSurfaceChunks: 32768 + maxQueryResults: 8192 + maxFoamParticles: 8192 + maxParticleNeighbors: 128 + maxParticleContacts: 6 + useLimits: 0 + killOffLimitsParticles: 0 + boundaryLimits: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 5, y: 5, z: 5} gravity: {x: 0, y: -6.06, z: 0} gravitySpace: 1 + ambientWind: {x: 0, y: 0, z: 0} + windSpace: 1 + foamSubsteps: 1 + foamMinNeighbors: 3 + foamCollisions: 0 + maxFoamVelocityStretch: 0.3 + foamRadiusScale: 1 + foamFade: {x: 0.05, y: 0.8} + foamAccelAgingRange: {x: 0.5, y: 0.8} + foamAccelAging: 4 + foamVolumeDensity: 0.1 + foamAmbientDensity: 0.02 + foamScatterColor: {r: 0.8, g: 0.75, b: 0.7, a: 1} + foamAmbientColor: {r: 0.4, g: 0.5, b: 0.6, a: 1} worldLinearInertiaScale: 0 worldAngularInertiaScale: 0 + synchronousSpatialQueries: 0 distanceConstraintParameters: evaluationOrder: 0 iterations: 1 @@ -119,6 +152,11 @@ MonoBehaviour: iterations: 1 SORFactor: 1 enabled: 1 + pinholeConstraintParameters: + evaluationOrder: 1 + iterations: 1 + SORFactor: 1 + enabled: 1 stitchConstraintParameters: evaluationOrder: 1 iterations: 1 @@ -144,18 +182,3 @@ MonoBehaviour: iterations: 1 SORFactor: 1 enabled: 0 ---- !u!114 &6445827893924548657 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3385956386580495472} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1d9704d540ac448439a425526f6b2986, type: 3} - m_Name: - m_EditorClassIdentifier: Obi::Obi.ObiFixedUpdater - solvers: - - {fileID: 6985090007750348232} - substeps: 4 diff --git a/Assets/ResRaw/Prefabs/Line/fishing line float set.prefab b/Assets/ResRaw/Prefabs/Line/fishing line float set.prefab index 73e367210..dc26043fd 100644 --- a/Assets/ResRaw/Prefabs/Line/fishing line float set.prefab +++ b/Assets/ResRaw/Prefabs/Line/fishing line float set.prefab @@ -53,9 +53,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61104f33a3f344db9b7e0d0cda41a9fb, type: 3} m_Name: m_EditorClassIdentifier: - solverIndices: + solverIndices: + serializedContents: + m_AlignBytes: 16 + groupID: 0 m_CollisionMaterial: {fileID: 0} m_SurfaceCollisions: 0 + m_MassScale: 1 m_SelfCollisions: 0 restLength_: 0.5 elements: @@ -164,6 +168,9 @@ MonoBehaviour: restLength: 0.023315966 constraintForce: 0 tearResistance: 1 + _aerodynamicsEnabled: 1 + _drag: 0.05 + _lift: 0.02 m_RopeBlueprint: {fileID: 11400000, guid: a41193e381908de44b097f1f57b43028, type: 2} tearingEnabled: 0 tearResistanceMultiplier: 1000 @@ -173,9 +180,9 @@ MonoBehaviour: _stretchCompliance: 0 _maxCompression: 0 _bendConstraintsEnabled: 1 - _bendCompliance: 0.5 - _maxBending: 0.5 - _plasticYield: 0.1 + _bendCompliance: 0 + _maxBending: 0.05 + _plasticYield: 0 _plasticCreep: 0 --- !u!23 &23649574223012002 MeshRenderer: @@ -245,9 +252,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 958c969cfb16745f192d4d7bd28b7178, type: 3} m_Name: m_EditorClassIdentifier: - decimation: 0 + decimation: 0.15 smoothing: 3 twist: 25 + indexInSystem: 0 --- !u!114 &114148468497635697 MonoBehaviour: m_ObjectHideFlags: 0 @@ -260,6 +268,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c4747da60837c44f9ba4b4a86879bcc8, type: 3} m_Name: m_EditorClassIdentifier: + material: {fileID: 0} + renderParameters: + layer: 0 + lightProbeUsage: 1 + reflectionProbeUsage: 1 + shadowCastingMode: 1 + receiveShadows: 1 + motionVectors: 0 + renderingLayerMask: 4294967295 uvAnchor: 0 uvScale: {x: 1, y: 1} normalizeV: 1 @@ -282,8 +299,9 @@ MonoBehaviour: m_ParticleGroup: {fileID: -5395693579433732326, guid: a41193e381908de44b097f1f57b43028, type: 2} m_AttachmentType: 0 m_ConstrainOrientation: 0 + m_Projection: 0 m_Compliance: 0 - m_BreakThreshold: Infinity + breakThreshold: Infinity --- !u!114 &114172005767509640 MonoBehaviour: m_ObjectHideFlags: 0 @@ -301,8 +319,9 @@ MonoBehaviour: m_ParticleGroup: {fileID: -2515171973132415257, guid: a41193e381908de44b097f1f57b43028, type: 2} m_AttachmentType: 0 m_ConstrainOrientation: 0 + m_Projection: 0 m_Compliance: 0 - m_BreakThreshold: Infinity + breakThreshold: Infinity --- !u!114 &114941649757569269 MonoBehaviour: m_ObjectHideFlags: 0 @@ -346,10 +365,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c8b45ebbf86be4df6b0e6cd933812af2, type: 3} m_Name: m_EditorClassIdentifier: Obi::Obi.ObiParticleRenderer - render: 1 - shader: {fileID: 4800000, guid: 801733041f66b49e1b3c2101471db877, type: 3} - particleColor: {r: 1, g: 1, b: 1, a: 1} - radiusScale: 1 + material: {fileID: 0} + renderParameters: + layer: 0 + lightProbeUsage: 1 + reflectionProbeUsage: 1 + shadowCastingMode: 1 + receiveShadows: 1 + motionVectors: 0 + renderingLayerMask: 4294967295 + k__BackingField: {r: 1, g: 1, b: 1, a: 1} + k__BackingField: 1 --- !u!1 &1035052809208993 GameObject: m_ObjectHideFlags: 0 @@ -836,9 +862,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61104f33a3f344db9b7e0d0cda41a9fb, type: 3} m_Name: m_EditorClassIdentifier: - solverIndices: + solverIndices: + serializedContents: + m_AlignBytes: 16 + groupID: 0 m_CollisionMaterial: {fileID: 0} m_SurfaceCollisions: 0 + m_MassScale: 1 m_SelfCollisions: 0 restLength_: 0.5 elements: @@ -1087,6 +1117,9 @@ MonoBehaviour: restLength: 0.02000001 constraintForce: 0 tearResistance: 1 + _aerodynamicsEnabled: 1 + _drag: 0.05 + _lift: 0.02 m_RopeBlueprint: {fileID: 11400000, guid: a41193e381908de44b097f1f57b43028, type: 2} tearingEnabled: 0 tearResistanceMultiplier: 1000 @@ -1096,9 +1129,9 @@ MonoBehaviour: _stretchCompliance: 0 _maxCompression: 0 _bendConstraintsEnabled: 1 - _bendCompliance: 0.5 - _maxBending: 0.5 - _plasticYield: 0.1 + _bendCompliance: 0 + _maxBending: 0.05 + _plasticYield: 0 _plasticCreep: 0 --- !u!23 &23047835326758575 MeshRenderer: @@ -1168,9 +1201,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 958c969cfb16745f192d4d7bd28b7178, type: 3} m_Name: m_EditorClassIdentifier: - decimation: 0 - smoothing: 0 - twist: 0 + decimation: 0.1 + smoothing: 3 + twist: 25 + indexInSystem: 0 --- !u!114 &114972033155067211 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1178,11 +1212,20 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1933124697579601} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c4747da60837c44f9ba4b4a86879bcc8, type: 3} m_Name: m_EditorClassIdentifier: + material: {fileID: 0} + renderParameters: + layer: 0 + lightProbeUsage: 1 + reflectionProbeUsage: 1 + shadowCastingMode: 1 + receiveShadows: 1 + motionVectors: 0 + renderingLayerMask: 4294967295 uvAnchor: 0 uvScale: {x: 1, y: 1} normalizeV: 1 @@ -1205,8 +1248,9 @@ MonoBehaviour: m_ParticleGroup: {fileID: -5395693579433732326, guid: a41193e381908de44b097f1f57b43028, type: 2} m_AttachmentType: 0 m_ConstrainOrientation: 0 + m_Projection: 0 m_Compliance: 0 - m_BreakThreshold: Infinity + breakThreshold: Infinity --- !u!114 &114623075352630189 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1224,8 +1268,9 @@ MonoBehaviour: m_ParticleGroup: {fileID: -2515171973132415257, guid: a41193e381908de44b097f1f57b43028, type: 2} m_AttachmentType: 0 m_ConstrainOrientation: 0 + m_Projection: 0 m_Compliance: 0 - m_BreakThreshold: Infinity + breakThreshold: Infinity --- !u!114 &114422070939195681 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1269,10 +1314,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c8b45ebbf86be4df6b0e6cd933812af2, type: 3} m_Name: m_EditorClassIdentifier: Obi::Obi.ObiParticleRenderer - render: 1 - shader: {fileID: 4800000, guid: 801733041f66b49e1b3c2101471db877, type: 3} - particleColor: {r: 1, g: 1, b: 1, a: 1} - radiusScale: 1 + material: {fileID: 0} + renderParameters: + layer: 0 + lightProbeUsage: 1 + reflectionProbeUsage: 1 + shadowCastingMode: 1 + receiveShadows: 1 + motionVectors: 0 + renderingLayerMask: 4294967295 + k__BackingField: {r: 1, g: 1, b: 1, a: 1} + k__BackingField: 1 --- !u!1 &1943073364215513 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Demo/SceneSettings.cs b/Assets/Scripts/Demo/SceneSettings.cs index d6fdb1b53..87cf401cf 100644 --- a/Assets/Scripts/Demo/SceneSettings.cs +++ b/Assets/Scripts/Demo/SceneSettings.cs @@ -1,6 +1,7 @@ using KWS; using Obi; using UnityEngine; +using WaveHarmonic.Crest; public class SceneSettings : MonoBehaviour { @@ -16,7 +17,7 @@ public class SceneSettings : MonoBehaviour public Transform GearNode; - public KWS_Ocean Water; + public WaterRenderer Water; // public ObiUpdater obiFixedUpdater; diff --git a/Assets/Scripts/Fishing/Tackle/FRod.cs b/Assets/Scripts/Fishing/Tackle/FRod.cs index 52d4af5f8..5c586e496 100644 --- a/Assets/Scripts/Fishing/Tackle/FRod.cs +++ b/Assets/Scripts/Fishing/Tackle/FRod.cs @@ -89,7 +89,8 @@ namespace NBF SceneSettings.Instance.GearNode.position = Player.transform.position; yield return 1; var obj = new GameObject($"rod_{itemInfo.Id}_{itemInfo.ConfigId}"); - obj.transform.SetParent(SceneSettings.Instance.GearNode); + // obj.transform.SetParent(SceneSettings.Instance.GearNode); + obj.transform.SetParent(player.transform); // obj.transform.localPosition = Vector3.zero; obj.transform.position = player.transform.position; obj.transform.rotation = player.transform.rotation; diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index ccca548db..960761feb 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,32 +9,32 @@ EditorUserSettings: value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b3666cacb72ba5a52a362c3c0ee63201181433fe3e101bf3250b06144ca74c24f1190708e016c213c61a52f91c12cac80fd8edd298e1e4d1fde2cacddeacbcc1fee7eef0e3b6faa69af9ceaeaaec81a6d2c2c8c8c4b2e5dfd5ccd3f8cf flags: 0 RecentlyUsedSceneGuid-0: - value: 5b08515306560a0a0b0b542449770715474e4d7d7b7f7769792b1863e6b7313d - flags: 0 - RecentlyUsedSceneGuid-1: - value: 5705040755540d0b5c5f547b417707134216487d7b707e6529714c6be6e33169 - flags: 0 - RecentlyUsedSceneGuid-2: value: 00080756500d0d0355580a7049770a44454e19732f7b7f3575794566b2b6376a flags: 0 - RecentlyUsedSceneGuid-3: + RecentlyUsedSceneGuid-1: value: 5702075052030b0e5458087142770745104f4a7d747d72667e2d4d36b2b8676f flags: 0 - RecentlyUsedSceneGuid-4: + RecentlyUsedSceneGuid-2: value: 5a520c0256040b0b0f5d5a7643775914474e412e2f70243678704c6ae0e16c6d flags: 0 - RecentlyUsedSceneGuid-5: + RecentlyUsedSceneGuid-3: value: 535552075c510a595b5f557040770e484e164d792d7d75657d791e62b4e4366b flags: 0 - RecentlyUsedSceneGuid-6: + RecentlyUsedSceneGuid-4: value: 0503575f5c57085954560d2447775e4513151e7c292c2035787f4b60b4e23760 flags: 0 - RecentlyUsedSceneGuid-7: + RecentlyUsedSceneGuid-5: value: 02550255060d590c0c0b097016770b12444f1e2b7e2a2534797f4b60b6e46c60 flags: 0 - RecentlyUsedSceneGuid-8: + RecentlyUsedSceneGuid-6: value: 07060c5454040c0a545b547240700a441216417e7f2e7268752c4966b4b0663d flags: 0 + RecentlyUsedSceneGuid-7: + value: 0754035e5454585d545e5f7345775e494e164e7b7b2a71687b2d4e65e3b36768 + flags: 0 + RecentlyUsedSceneGuid-8: + value: 5309035757065a0a54575f7216265c4444151d28792e72627d2f1935bbb8673a + flags: 0 RecentlyUsedSceneGuid-9: value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e flags: 0