From 55e19eb95985d47570a3166b169b4dd9158582bb Mon Sep 17 00:00:00 2001 From: Alexandre Coirier Date: Wed, 20 May 2026 21:39:54 +0200 Subject: [PATCH] wip: HouseOfLeaves & BodiesInWater Blocking --- .../Models/Environments/BodiesInWater.meta | 8 + .../Environments/BodiesInWater/Materials.meta | 8 + .../Materials/M_bodiesInWater.mat | 155 ++ .../Materials/M_bodiesInWater.mat.meta | 8 + .../Materials/M_bodiesInWater_body.mat | 155 ++ .../Materials/M_bodiesInWater_body.mat.meta | 8 + .../Materials/M_bodiesInWater_water.mat | 139 ++ .../Materials/M_bodiesInWater_water.mat.meta | 8 + .../Environments/BodiesInWater/Shaders.meta | 8 + .../BodiesInWater/Shaders/Water.hlsl | 42 + .../BodiesInWater/Shaders/Water.hlsl.meta | 7 + .../BodiesInWater/Shaders/Water.shadergraph | 1209 +++++++++++++ .../Shaders/Water.shadergraph.meta | 18 + .../Environments/BodiesInWater/Sources.meta | 8 + .../BodiesInWater/Sources/bodiesInWater.fbx | 3 + .../Sources/bodiesInWater.fbx.meta | 130 ++ .../Materials/M_houseOfLeaves_sand.mat | 2 +- .../HouseOfLeaves/Shaders/Sand.hlsl | 5 +- .../HouseOfLeaves/Shaders/Sand.shadergraph | 313 +++- .../_Content/Models/Props/BodiesInWater.meta | 8 + .../Models/Props/BodiesInWater/Boat.meta | 8 + .../Props/BodiesInWater/Boat/Materials.meta | 8 + .../BodiesInWater/Boat/Materials/M_boat.mat | 155 ++ .../Boat/Materials/M_boat.mat.meta | 8 + .../Props/BodiesInWater/Boat/Sources.meta | 8 + .../Props/BodiesInWater/Boat/Sources/boat.fbx | 3 + .../BodiesInWater/Boat/Sources/boat.fbx.meta | 115 ++ Assets/_Content/Scenes/BodiesInWater.unity | 1557 ++++++++++++++--- Assets/_Content/Scenes/HouseOfLeaves.unity | 327 +++- .../Settings/DefaultVolumeProfile.asset | 2 +- .../Runtime/Scripts/Components/OctoPlayer.cs | 2 +- .../Components/OctoProceduralAnimator.cs | 16 +- 32 files changed, 4125 insertions(+), 326 deletions(-) create mode 100644 Assets/_Content/Models/Environments/BodiesInWater.meta create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Materials.meta create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater.mat create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater.mat.meta create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_body.mat create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_body.mat.meta create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_water.mat create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_water.mat.meta create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Shaders.meta create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.hlsl create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.hlsl.meta create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.shadergraph create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.shadergraph.meta create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Sources.meta create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Sources/bodiesInWater.fbx create mode 100644 Assets/_Content/Models/Environments/BodiesInWater/Sources/bodiesInWater.fbx.meta create mode 100644 Assets/_Content/Models/Props/BodiesInWater.meta create mode 100644 Assets/_Content/Models/Props/BodiesInWater/Boat.meta create mode 100644 Assets/_Content/Models/Props/BodiesInWater/Boat/Materials.meta create mode 100644 Assets/_Content/Models/Props/BodiesInWater/Boat/Materials/M_boat.mat create mode 100644 Assets/_Content/Models/Props/BodiesInWater/Boat/Materials/M_boat.mat.meta create mode 100644 Assets/_Content/Models/Props/BodiesInWater/Boat/Sources.meta create mode 100644 Assets/_Content/Models/Props/BodiesInWater/Boat/Sources/boat.fbx create mode 100644 Assets/_Content/Models/Props/BodiesInWater/Boat/Sources/boat.fbx.meta diff --git a/Assets/_Content/Models/Environments/BodiesInWater.meta b/Assets/_Content/Models/Environments/BodiesInWater.meta new file mode 100644 index 00000000..09a9e396 --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca75166bf9a6b694c8084b313ba3a771 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Environments/BodiesInWater/Materials.meta b/Assets/_Content/Models/Environments/BodiesInWater/Materials.meta new file mode 100644 index 00000000..48af7e5e --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b458952889230249ad27332fb44f386 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater.mat b/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater.mat new file mode 100644 index 00000000..cff38f4f --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater.mat @@ -0,0 +1,155 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_bodiesInWater + m_Shader: {fileID: -6465566751694194690, guid: 10840deb9abeee9478cbbb5915f60f5c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + 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} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + 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 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _GrainSize: 0.4 + - _GrainStrength: 0.2 + - _HighlightMax: 1 + - _HighlightMin: 0.5 + - _MaskID: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _ShadowMax: 0.2 + - _ShadowMin: -0.5 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Step: 6 + - _StrokeDensity: 1000 + - _StrokeHardness: 1 + - _StrokeWidth: 0.2 + - _Surface: 0 + - _Test: 0 + - _TriplanarBlend: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1} + - _Color: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _GrainColor: {r: 1, g: 1, b: 1, a: 0.09803922} + - _HighlightColor: {r: 2.118547, g: 2.118547, b: 2.118547, a: 1} + - _ShadowColor: {r: 0.14117646, g: 0.16862747, b: 0.16470587, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &2348150325564638748 +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/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater.mat.meta b/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater.mat.meta new file mode 100644 index 00000000..296bde0c --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee14cc99738b9a442b7937108e13aa69 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_body.mat b/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_body.mat new file mode 100644 index 00000000..ab9aa039 --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_body.mat @@ -0,0 +1,155 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_bodiesInWater_body + m_Shader: {fileID: -6465566751694194690, guid: 10840deb9abeee9478cbbb5915f60f5c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + 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} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + 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 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _GrainSize: 0.4 + - _GrainStrength: 0.2 + - _HighlightMax: 1 + - _HighlightMin: 0.5 + - _MaskID: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _ShadowMax: 0.2 + - _ShadowMin: -0.5 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Step: 6 + - _StrokeDensity: 1000 + - _StrokeHardness: 1 + - _StrokeWidth: 0.2 + - _Surface: 0 + - _Test: 0 + - _TriplanarBlend: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.97132295, g: 0.9106005, b: 0.8322163, a: 1} + - _Color: {r: 0.97132295, g: 0.9106005, b: 0.8322163, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _GrainColor: {r: 1, g: 1, b: 1, a: 0.09803922} + - _HighlightColor: {r: 2.118547, g: 2.118547, b: 2.118547, a: 1} + - _ShadowColor: {r: 0.14117646, g: 0.16862747, b: 0.16470587, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &5360133028972202906 +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/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_body.mat.meta b/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_body.mat.meta new file mode 100644 index 00000000..8a4726d7 --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_body.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 987bccbe268143143bbb53af17cbedb7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_water.mat b/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_water.mat new file mode 100644 index 00000000..362ba17f --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_water.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4559500777102007327 +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 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_bodiesInWater_water + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + 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} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + 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 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.43569908, g: 0.4080603, b: 0.3388004, a: 1} + - _Color: {r: 0.43569905, g: 0.40806028, b: 0.33880037, 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 diff --git a/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_water.mat.meta b/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_water.mat.meta new file mode 100644 index 00000000..c4f59ee0 --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Materials/M_bodiesInWater_water.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 855d765054b83ec4ba0f82b3ff30dce9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Environments/BodiesInWater/Shaders.meta b/Assets/_Content/Models/Environments/BodiesInWater/Shaders.meta new file mode 100644 index 00000000..514437e3 --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 479313095684dcd4bacbec270a380c75 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.hlsl b/Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.hlsl new file mode 100644 index 00000000..bf2a657d --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.hlsl @@ -0,0 +1,42 @@ +#ifndef WATER_INCLUDED +#define WATER_INCLUDED + +#include "Assets/_Content/Shaders/Include/Noises.hlsl" + +void Water_float +( + float3 PositionWS, + float3 NormalWS, + out float3 Position, + out float Height +) +{ + float t = _Time.y; + + float depth = length(PositionWS - _WorldSpaceCameraPos.xyz); + + float height = PerlinNoise3D(PositionWS + float3(0, 0, t), .8) * .8; + height = dot(height, PerlinNoise3D(PositionWS + float3(t * .2, 0, t * .5), 1.7)); + height = pow(height, .5); + + // Test + + //float test = ValueNoise3D(PositionWS, 40); + //float test = PerlinNoise3D(PositionWS, 40); + //float test = PerlinNoise3DLOD(PositionWS, 100, 3.5); + //float test = SimplexNoise3D(PositionWS, 40); + //float test = WorleyNoise3D(PositionWS, 40, 1); + //float id; + //float test = VoronoiNoise3D(PositionWS, 10, 1, .05, id); + //float test = FBMNoise3D(PositionWS, 10, 2, 2, .5); + //float test = RidgedNoise3D(PositionWS, 10, 2, 2, .5); + + // Output + + Position = PositionWS; + Position.y += height * .4f - .2; + + Height = height; +} + +#endif diff --git a/Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.hlsl.meta b/Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.hlsl.meta new file mode 100644 index 00000000..a731ab8e --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.hlsl.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c545a27cb782b7541ab8e7438fc4d112 +ShaderIncludeImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.shadergraph b/Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.shadergraph new file mode 100644 index 00000000..ce1e3871 --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.shadergraph @@ -0,0 +1,1209 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "dfae0c79c32f45deaafe47100e0601a6", + "m_Properties": [], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "a1d34ed3434a4f739bfe99c3d52fa49c" + } + ], + "m_Nodes": [ + { + "m_Id": "360c5ba0d30448a3bff50816220d6c15" + }, + { + "m_Id": "4b03c8786c064bffa58e5625971e3931" + }, + { + "m_Id": "9042504a331b48408cf59340658616ed" + }, + { + "m_Id": "4c8c4dc3798b42d99d8056a40ecd3ecd" + }, + { + "m_Id": "f0b120f3f8d845d38b137a89690f45f0" + }, + { + "m_Id": "3c8d5ca3e71f43be846856ad342baf85" + }, + { + "m_Id": "3dd3aacea17e445cbc181af7f581034a" + }, + { + "m_Id": "c4c378dfacff4b2dbe42e8f4e63aca36" + }, + { + "m_Id": "b499fd586f014bffb9fdfda02229f02d" + }, + { + "m_Id": "9d995e44bebc4621a1bc8d350b827025" + }, + { + "m_Id": "526034b34a0348a497fff895eaf5c80d" + }, + { + "m_Id": "a4df5cca05474079a439437a7fcd97a2" + }, + { + "m_Id": "50fb95ead58544f8b1e54265d0b74499" + }, + { + "m_Id": "78a9e4fd69754df186b12ad85b8c14f4" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "50fb95ead58544f8b1e54265d0b74499" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "360c5ba0d30448a3bff50816220d6c15" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "526034b34a0348a497fff895eaf5c80d" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "9d995e44bebc4621a1bc8d350b827025" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "78a9e4fd69754df186b12ad85b8c14f4" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "f0b120f3f8d845d38b137a89690f45f0" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "9d995e44bebc4621a1bc8d350b827025" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "50fb95ead58544f8b1e54265d0b74499" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "9d995e44bebc4621a1bc8d350b827025" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "78a9e4fd69754df186b12ad85b8c14f4" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a4df5cca05474079a439437a7fcd97a2" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "9d995e44bebc4621a1bc8d350b827025" + }, + "m_SlotId": 1 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [ + { + "m_Id": "360c5ba0d30448a3bff50816220d6c15" + }, + { + "m_Id": "4b03c8786c064bffa58e5625971e3931" + }, + { + "m_Id": "9042504a331b48408cf59340658616ed" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": 0.0, + "y": 200.0 + }, + "m_Blocks": [ + { + "m_Id": "4c8c4dc3798b42d99d8056a40ecd3ecd" + }, + { + "m_Id": "f0b120f3f8d845d38b137a89690f45f0" + }, + { + "m_Id": "3c8d5ca3e71f43be846856ad342baf85" + }, + { + "m_Id": "3dd3aacea17e445cbc181af7f581034a" + }, + { + "m_Id": "c4c378dfacff4b2dbe42e8f4e63aca36" + }, + { + "m_Id": "b499fd586f014bffb9fdfda02229f02d" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Coiriergraphics", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "38b9f3cf9bbc4939a9a0d738abf77d78" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "26407b9a590b4fb98fbc01bb0a398871", + "m_Id": 0, + "m_DisplayName": "PositionWS", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "PositionWS", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "360c5ba0d30448a3bff50816220d6c15", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "63258b413a4749b68a3cf020ca9a0874" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "38b9f3cf9bbc4939a9a0d738abf77d78", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "e66172e771734f7893139a6aae2129fe" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_Sort3DAs2DCompatible": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "3c8d5ca3e71f43be846856ad342baf85", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Metallic", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "998d076fe6b84bbe936d917d36830f73" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Metallic" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "3ce590f80f614eebaf00fcf16c421e33", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 1.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "3dd3aacea17e445cbc181af7f581034a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Smoothness", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "df4a6c005dea472484af499cd4693cd5" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Smoothness" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "4374b5c841424f7292fd3635e04dfb0f", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "49086be3913f4888afdea63fb6695c28", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "4ad8772a46a54d67b5ebc8038439a85c", + "m_Id": 0, + "m_DisplayName": "Normal (Tangent Space)", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NormalTS", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 3 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "4b03c8786c064bffa58e5625971e3931", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "88946544541148f684665e8ba9183691" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "4c8c4dc3798b42d99d8056a40ecd3ecd", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "b01e70fb24a94d5aa2c490db6bc46d48" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.ShaderGraph.TransformNode", + "m_ObjectId": "50fb95ead58544f8b1e54265d0b74499", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Transform", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -377.99993896484377, + "y": 1.000003695487976, + "width": 212.00001525878907, + "height": 155.0 + } + }, + "m_Slots": [ + { + "m_Id": "a14e5b267762466284d75d696f67eb5c" + }, + { + "m_Id": "c3a94911a9394fd38bf1eebad71d7285" + } + ], + "synonyms": [ + "world", + "tangent", + "object", + "view", + "screen", + "convert" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Conversion": { + "from": 2, + "to": 0 + }, + "m_ConversionType": 0, + "m_Normalize": true +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.PositionNode", + "m_ObjectId": "526034b34a0348a497fff895eaf5c80d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -962.5321044921875, + "y": 149.46792602539063, + "width": 208.0, + "height": 314.0 + } + }, + "m_Slots": [ + { + "m_Id": "4374b5c841424f7292fd3635e04dfb0f" + } + ], + "synonyms": [ + "location" + ], + "m_Precision": 1, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 2, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Space": 2, + "m_PositionSource": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "63258b413a4749b68a3cf020ca9a0874", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "69b3d977cb2d4e8ba2941fc1a83b9271", + "m_Id": 3, + "m_DisplayName": "Height", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Height", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalFromHeightNode", + "m_ObjectId": "78a9e4fd69754df186b12ad85b8c14f4", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Normal From Height", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -354.0, + "y": 239.0, + "width": 165.99996948242188, + "height": 151.99996948242188 + } + }, + "m_Slots": [ + { + "m_Id": "c98f16cae2fa495c9c387eb904e9c1a9" + }, + { + "m_Id": "a8b4305efbb04bdf8a4449a36070dcc2" + }, + { + "m_Id": "c16e52b603c54a2aa30a9326dbcab57b" + } + ], + "synonyms": [ + "convert to normal", + "bump map" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_OutputSpace": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "88946544541148f684665e8ba9183691", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "9042504a331b48408cf59340658616ed", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "49086be3913f4888afdea63fb6695c28" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "982237eee24947ecb7fc2046b74459e8", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Emission", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "98fdff490baf42e095c60ce226c02c8a", + "m_Id": 0, + "m_DisplayName": "Ambient Occlusion", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Occlusion", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "998d076fe6b84bbe936d917d36830f73", + "m_Id": 0, + "m_DisplayName": "Metallic", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Metallic", + "m_StageCapability": 2, + "m_Value": 0.30000001192092898, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode", + "m_ObjectId": "9d995e44bebc4621a1bc8d350b827025", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Water (Custom Function)", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -678.9999389648438, + "y": 204.0, + "width": 204.0, + "height": 100.99996948242188 + } + }, + "m_Slots": [ + { + "m_Id": "26407b9a590b4fb98fbc01bb0a398871" + }, + { + "m_Id": "f443583250d346b186710d9d595860ca" + }, + { + "m_Id": "e264736abba142f3ba0e7fd20fbd5a9a" + }, + { + "m_Id": "69b3d977cb2d4e8ba2941fc1a83b9271" + } + ], + "synonyms": [ + "code", + "HLSL" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SourceType": 0, + "m_FunctionName": "Water", + "m_FunctionSource": "c545a27cb782b7541ab8e7438fc4d112", + "m_FunctionSourceUsePragmas": true, + "m_FunctionBody": "Enter function body here..." +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "a14e5b267762466284d75d696f67eb5c", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "a1d34ed3434a4f739bfe99c3d52fa49c", + "m_Name": "", + "m_ChildObjectList": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalVectorNode", + "m_ObjectId": "a4df5cca05474079a439437a7fcd97a2", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Normal Vector", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -969.0, + "y": 295.0, + "width": 206.0, + "height": 129.99996948242188 + } + }, + "m_Slots": [ + { + "m_Id": "3ce590f80f614eebaf00fcf16c421e33" + } + ], + "synonyms": [ + "surface direction" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 2, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Space": 2 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "a8b4305efbb04bdf8a4449a36070dcc2", + "m_Id": 2, + "m_DisplayName": "Strength", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Strength", + "m_StageCapability": 3, + "m_Value": 0.5, + "m_DefaultValue": 0.009999999776482582, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "b01e70fb24a94d5aa2c490db6bc46d48", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.12264150381088257, + "y": 0.07724015414714813, + "z": 0.028346387669444085 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "b499fd586f014bffb9fdfda02229f02d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Occlusion", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "98fdff490baf42e095c60ce226c02c8a" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Occlusion" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "c16e52b603c54a2aa30a9326dbcab57b", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "c3a94911a9394fd38bf1eebad71d7285", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "c4c378dfacff4b2dbe42e8f4e63aca36", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Emission", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "982237eee24947ecb7fc2046b74459e8" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Emission" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c98f16cae2fa495c9c387eb904e9c1a9", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "df4a6c005dea472484af499cd4693cd5", + "m_Id": 0, + "m_DisplayName": "Smoothness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Smoothness", + "m_StageCapability": 2, + "m_Value": 0.8500000238418579, + "m_DefaultValue": 0.5, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "e264736abba142f3ba0e7fd20fbd5a9a", + "m_Id": 2, + "m_DisplayName": "Position", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", + "m_ObjectId": "e66172e771734f7893139a6aae2129fe", + "m_WorkflowMode": 1, + "m_NormalDropOffSpace": 0, + "m_ClearCoat": false, + "m_BlendModePreserveSpecular": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "f0b120f3f8d845d38b137a89690f45f0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.NormalTS", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "4ad8772a46a54d67b5ebc8038439a85c" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.NormalTS" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "f443583250d346b186710d9d595860ca", + "m_Id": 1, + "m_DisplayName": "NormalWS", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NormalWS", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + diff --git a/Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.shadergraph.meta b/Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.shadergraph.meta new file mode 100644 index 00000000..d655c27e --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Shaders/Water.shadergraph.meta @@ -0,0 +1,18 @@ +fileFormatVersion: 2 +guid: eb5e6d6a05109e841a6269b6939b53e1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} + useAsTemplate: 0 + exposeTemplateAsShader: 0 + template: + name: + category: + description: + icon: {instanceID: 0} + thumbnail: {instanceID: 0} diff --git a/Assets/_Content/Models/Environments/BodiesInWater/Sources.meta b/Assets/_Content/Models/Environments/BodiesInWater/Sources.meta new file mode 100644 index 00000000..28c2510e --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Sources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1bdf6ab74414d6041a2491535aaade52 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Environments/BodiesInWater/Sources/bodiesInWater.fbx b/Assets/_Content/Models/Environments/BodiesInWater/Sources/bodiesInWater.fbx new file mode 100644 index 00000000..ecf2e46a --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Sources/bodiesInWater.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7da209c6d98a6f00485371dfb2d7647033e3bc0c789560bca04c14efd2de127d +size 7853264 diff --git a/Assets/_Content/Models/Environments/BodiesInWater/Sources/bodiesInWater.fbx.meta b/Assets/_Content/Models/Environments/BodiesInWater/Sources/bodiesInWater.fbx.meta new file mode 100644 index 00000000..49229da2 --- /dev/null +++ b/Assets/_Content/Models/Environments/BodiesInWater/Sources/bodiesInWater.fbx.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 311617a3ba39d7643abf5c46141d0c80 +ModelImporter: + serializedVersion: 24200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Default_Material + second: {fileID: 2100000, guid: ee14cc99738b9a442b7937108e13aa69, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: M_bodiesInWater + second: {fileID: 2100000, guid: ee14cc99738b9a442b7937108e13aa69, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: M_bodiesInWater_body + second: {fileID: 2100000, guid: 987bccbe268143143bbb53af17cbedb7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: M_bodiesInWater_water + second: {fileID: 2100000, guid: 855d765054b83ec4ba0f82b3ff30dce9, type: 2} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Environments/HouseOfLeaves/Materials/M_houseOfLeaves_sand.mat b/Assets/_Content/Models/Environments/HouseOfLeaves/Materials/M_houseOfLeaves_sand.mat index 5b3da206..782e3201 100644 --- a/Assets/_Content/Models/Environments/HouseOfLeaves/Materials/M_houseOfLeaves_sand.mat +++ b/Assets/_Content/Models/Environments/HouseOfLeaves/Materials/M_houseOfLeaves_sand.mat @@ -117,7 +117,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Progression: 1 + - _Progression: 0.5 - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 diff --git a/Assets/_Content/Models/Environments/HouseOfLeaves/Shaders/Sand.hlsl b/Assets/_Content/Models/Environments/HouseOfLeaves/Shaders/Sand.hlsl index 0ed8d849..43f01cbe 100644 --- a/Assets/_Content/Models/Environments/HouseOfLeaves/Shaders/Sand.hlsl +++ b/Assets/_Content/Models/Environments/HouseOfLeaves/Shaders/Sand.hlsl @@ -11,7 +11,7 @@ void Sand_float float3 NormalWS, out float3 Position, out float Height, - out float Debug + out float Alpha ) { //float t = frac(_Time.y / 20); @@ -52,6 +52,7 @@ void Sand_float sandFlow = (sandFlow + floor(t * sandLayers)) / sandLayers; float sandMask = sandFlow * 1.5 - t * .8 + (sandPatern * 2 - 1) * sandDensity * t * .3; + sandMask *= sandDensity * .7 + .3; // Test @@ -72,7 +73,7 @@ void Sand_float Height = sandMask; - Debug = 1; + Alpha = smoothstep(1, .5, abs(smoothstep(-5, 5, PositionWS.x) * 2 - 1)); //Debug = sandFlow; } diff --git a/Assets/_Content/Models/Environments/HouseOfLeaves/Shaders/Sand.shadergraph b/Assets/_Content/Models/Environments/HouseOfLeaves/Shaders/Sand.shadergraph index c44fa24d..8fcdbabb 100644 --- a/Assets/_Content/Models/Environments/HouseOfLeaves/Shaders/Sand.shadergraph +++ b/Assets/_Content/Models/Environments/HouseOfLeaves/Shaders/Sand.shadergraph @@ -59,6 +59,15 @@ }, { "m_Id": "76578eb7ae67481a8a1080f2813b42ba" + }, + { + "m_Id": "35bd1540c2bc4f159f6f4ea7a1a0ebad" + }, + { + "m_Id": "10f1ba1ec3654c338ce8962b9e4229ce" + }, + { + "m_Id": "f5447a792d5447fe97dbf892f44a53e7" } ], "m_GroupDatas": [], @@ -120,6 +129,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "95dd652e6b5a4e098d7354863bde6830" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "f5447a792d5447fe97dbf892f44a53e7" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -161,6 +184,20 @@ }, "m_SlotId": 0 } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f5447a792d5447fe97dbf892f44a53e7" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "35bd1540c2bc4f159f6f4ea7a1a0ebad" + }, + "m_SlotId": 0 + } } ], "m_VertexContext": { @@ -203,6 +240,12 @@ }, { "m_Id": "5859709eb7bc467c8fa9e45c31af05b4" + }, + { + "m_Id": "35bd1540c2bc4f159f6f4ea7a1a0ebad" + }, + { + "m_Id": "10f1ba1ec3654c338ce8962b9e4229ce" } ] }, @@ -279,6 +322,40 @@ "m_Space": 2 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "10f1ba1ec3654c338ce8962b9e4229ce", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "24cdae2dae4a4e73925dd9ec529ef7a3" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -414,6 +491,56 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "24cdae2dae4a4e73925dd9ec529ef7a3", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.0010000000474974514, + "m_DefaultValue": 0.5, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "35bd1540c2bc4f159f6f4ea7a1a0ebad", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "b7dd84683b4d4df2b49c452887064332" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", @@ -768,10 +895,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -326.0, - "y": 317.9999694824219, - "width": 208.0000457763672, - "height": 336.0000305175781 + "x": -320.0000305175781, + "y": 227.0, + "width": 208.00003051757813, + "height": 336.0 } }, "m_Slots": [ @@ -790,7 +917,7 @@ "bump map" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -813,7 +940,7 @@ "m_ZWriteControl": 0, "m_AlphaMode": 0, "m_RenderFace": 2, - "m_AlphaClip": false, + "m_AlphaClip": true, "m_CastShadows": true, "m_ReceiveShadows": true, "m_DisableTint": false, @@ -864,6 +991,31 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "8893efe2d42d48a986c4b203aab72d1f", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -915,7 +1067,7 @@ "m_Id": "61ead3b8e912419a8ac378195bfb3f79" }, { - "m_Id": "ff4dd28047cc42298632541c4e132a69" + "m_Id": "ab2979729d75466eaabbd704b09644e8" } ], "synonyms": [ @@ -1089,8 +1241,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -874.9998779296875, - "y": 155.0, + "x": -879.0, + "y": 158.0, "width": 206.0, "height": 130.0 } @@ -1110,10 +1262,26 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_Space": 4, + "m_Space": 2, "m_PositionSource": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "ab2979729d75466eaabbd704b09644e8", + "m_Id": 3, + "m_DisplayName": "Alpha", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", @@ -1138,6 +1306,22 @@ "m_Space": 3 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "b7dd84683b4d4df2b49c452887064332", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 1.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.CategoryData", @@ -1197,6 +1381,32 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ScreenPositionMaterialSlot", + "m_ObjectId": "dafba86ff6a04de88e0b1785c3b9307c", + "m_Id": 1, + "m_DisplayName": "Screen Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "ScreenPosition", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [], + "m_ScreenSpaceType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -1255,6 +1465,31 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "e35abfed2a10440abe9b0df46d4e8744", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + { "m_SGVersion": 2, "m_Type": "UnityEditor.ShaderGraph.TransformNode", @@ -1304,6 +1539,48 @@ "m_Normalize": true } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DitherNode", + "m_ObjectId": "f5447a792d5447fe97dbf892f44a53e7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Dither", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -344.0, + "y": 480.0000305175781, + "width": 201.00003051757813, + "height": 118.00003051757813 + } + }, + "m_Slots": [ + { + "m_Id": "e35abfed2a10440abe9b0df46d4e8744" + }, + { + "m_Id": "dafba86ff6a04de88e0b1785c3b9307c" + }, + { + "m_Id": "8893efe2d42d48a986c4b203aab72d1f" + } + ], + "synonyms": [ + "blue noise", + "half tone" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1350,19 +1627,3 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "ff4dd28047cc42298632541c4e132a69", - "m_Id": 3, - "m_DisplayName": "Debug", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Debug", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [], - "m_LiteralMode": false -} - diff --git a/Assets/_Content/Models/Props/BodiesInWater.meta b/Assets/_Content/Models/Props/BodiesInWater.meta new file mode 100644 index 00000000..ae0dcde0 --- /dev/null +++ b/Assets/_Content/Models/Props/BodiesInWater.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 71a81e3792d25bc4ea1501ffa91bcf7b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Props/BodiesInWater/Boat.meta b/Assets/_Content/Models/Props/BodiesInWater/Boat.meta new file mode 100644 index 00000000..68d7701c --- /dev/null +++ b/Assets/_Content/Models/Props/BodiesInWater/Boat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0a5bc98f9138fa741be41ac5696c803b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Props/BodiesInWater/Boat/Materials.meta b/Assets/_Content/Models/Props/BodiesInWater/Boat/Materials.meta new file mode 100644 index 00000000..33f755f3 --- /dev/null +++ b/Assets/_Content/Models/Props/BodiesInWater/Boat/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53a23fa82a0123349a3fd093fb8fc35a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Props/BodiesInWater/Boat/Materials/M_boat.mat b/Assets/_Content/Models/Props/BodiesInWater/Boat/Materials/M_boat.mat new file mode 100644 index 00000000..ed591eda --- /dev/null +++ b/Assets/_Content/Models/Props/BodiesInWater/Boat/Materials/M_boat.mat @@ -0,0 +1,155 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_boat + m_Shader: {fileID: -6465566751694194690, guid: 10840deb9abeee9478cbbb5915f60f5c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + 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} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + 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 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _GrainSize: 0.4 + - _GrainStrength: 0.2 + - _HighlightMax: 1 + - _HighlightMin: 0.5 + - _MaskID: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _ShadowMax: 0.2 + - _ShadowMin: -0.5 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Step: 6 + - _StrokeDensity: 1000 + - _StrokeHardness: 1 + - _StrokeWidth: 0.2 + - _Surface: 0 + - _Test: 0 + - _TriplanarBlend: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1} + - _Color: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _GrainColor: {r: 1, g: 1, b: 1, a: 0.09803922} + - _HighlightColor: {r: 2.118547, g: 2.118547, b: 2.118547, a: 1} + - _ShadowColor: {r: 0.14117646, g: 0.16862747, b: 0.16470587, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &5372300483337973452 +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/_Content/Models/Props/BodiesInWater/Boat/Materials/M_boat.mat.meta b/Assets/_Content/Models/Props/BodiesInWater/Boat/Materials/M_boat.mat.meta new file mode 100644 index 00000000..a2cb4517 --- /dev/null +++ b/Assets/_Content/Models/Props/BodiesInWater/Boat/Materials/M_boat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 81646f66d23e096409df8536bd194bdc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Props/BodiesInWater/Boat/Sources.meta b/Assets/_Content/Models/Props/BodiesInWater/Boat/Sources.meta new file mode 100644 index 00000000..0314a961 --- /dev/null +++ b/Assets/_Content/Models/Props/BodiesInWater/Boat/Sources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 10936a6c378df4b4a9e07a60f2c153b6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Models/Props/BodiesInWater/Boat/Sources/boat.fbx b/Assets/_Content/Models/Props/BodiesInWater/Boat/Sources/boat.fbx new file mode 100644 index 00000000..fca6deef --- /dev/null +++ b/Assets/_Content/Models/Props/BodiesInWater/Boat/Sources/boat.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35d09045d06923f25cd55277211c7c3b9f7ec6080c3de47cdf40192defb5f003 +size 469104 diff --git a/Assets/_Content/Models/Props/BodiesInWater/Boat/Sources/boat.fbx.meta b/Assets/_Content/Models/Props/BodiesInWater/Boat/Sources/boat.fbx.meta new file mode 100644 index 00000000..c6ebe15e --- /dev/null +++ b/Assets/_Content/Models/Props/BodiesInWater/Boat/Sources/boat.fbx.meta @@ -0,0 +1,115 @@ +fileFormatVersion: 2 +guid: 57a1cbf605852c64e91c772dff0da3cf +ModelImporter: + serializedVersion: 24200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: M_boat + second: {fileID: 2100000, guid: 81646f66d23e096409df8536bd194bdc, type: 2} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Scenes/BodiesInWater.unity b/Assets/_Content/Scenes/BodiesInWater.unity index b6491900..497ad18d 100644 --- a/Assets/_Content/Scenes/BodiesInWater.unity +++ b/Assets/_Content/Scenes/BodiesInWater.unity @@ -119,6 +119,112 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &10918450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175077} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!114 &16104554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} --- !u!1 &235456879 GameObject: m_ObjectHideFlags: 0 @@ -149,190 +255,15 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 832575519} + - {fileID: 2020809349} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &466404186 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!4 &371380903 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8725966219179855439, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} + m_PrefabInstance: {fileID: 642044301} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 466404187} - - component: {fileID: 466404189} - - component: {fileID: 466404188} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &466404187 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466404186} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 3.5} - m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1632918704} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 1.8} - m_SizeDelta: {x: 20, y: 5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &466404188 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466404186} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshPro - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Bodie in water - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_characterHorizontalScale: 1 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 466404189} - m_maskType: 0 ---- !u!23 &466404189 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466404186} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1001 &642044301 +--- !u!1001 &376175075 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -340,10 +271,582 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8679921383154817045, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5637592895254826029, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -1778045592373082964, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_Name + value: bodiesInWater + objectReference: {fileID: 0} + - target: {fileID: 6749804920113953233, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 7072028655842674591, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 9193312731999672005, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: -876546973899608171, guid: eb5e6d6a05109e841a6269b6939b53e1, type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: -5509758880465788329, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 376175094} + - targetCorrespondingSourceObject: {fileID: 6955612385691126888, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 376175093} + - targetCorrespondingSourceObject: {fileID: 1035654975278036729, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 376175092} + - targetCorrespondingSourceObject: {fileID: 2295893630531930663, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 376175091} + - targetCorrespondingSourceObject: {fileID: 9169039164120860975, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 376175090} + - targetCorrespondingSourceObject: {fileID: -80488680692322835, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 941562472} + - targetCorrespondingSourceObject: {fileID: 1780970609114112849, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 783214831} + - targetCorrespondingSourceObject: {fileID: -1633289695841753631, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 16104554} + - targetCorrespondingSourceObject: {fileID: 3699373046541380139, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 476358702} + - targetCorrespondingSourceObject: {fileID: 7428413540771375660, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 673697810} + - targetCorrespondingSourceObject: {fileID: -1613036321613993823, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 1836605866} + - targetCorrespondingSourceObject: {fileID: 3669773519998879877, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 1079741138} + - targetCorrespondingSourceObject: {fileID: 1053248118652657304, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 10918450} + - targetCorrespondingSourceObject: {fileID: 335013644610960349, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + insertIndex: -1 + addedObject: {fileID: 476790305} + m_SourcePrefab: {fileID: 100100000, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} +--- !u!1 &376175076 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 335013644610960349, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &376175077 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1053248118652657304, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &376175078 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3669773519998879877, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &376175079 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -1613036321613993823, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &376175080 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7428413540771375660, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &376175081 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3699373046541380139, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &376175082 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -1633289695841753631, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &376175083 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1780970609114112849, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &376175084 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -80488680692322835, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &376175085 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9169039164120860975, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &376175086 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2295893630531930663, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &376175087 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1035654975278036729, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &376175088 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6955612385691126888, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &376175089 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5509758880465788329, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} + m_PrefabInstance: {fileID: 376175075} + m_PrefabAsset: {fileID: 0} +--- !u!114 &376175090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175085} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!114 &376175091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!114 &376175092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175087} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!114 &376175093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!114 &376175094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!114 &476358702 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!114 &476790305 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!1001 &642044301 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1006462573} + m_Modifications: + - target: {fileID: 1735456339091181674, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3452915509921429875, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5295567073180248356, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} + propertyPath: _settings.Gravity + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5295567073180248356, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} + propertyPath: _settings.WalkSpeed + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6989128982853398086, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} propertyPath: m_RenderPostProcessing value: 1 @@ -362,11 +865,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8725966219179855439, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.6 objectReference: {fileID: 0} - target: {fileID: 8725966219179855439, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -0.25 objectReference: {fileID: 0} - target: {fileID: 8725966219179855439, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} propertyPath: m_LocalRotation.w @@ -374,15 +877,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8725966219179855439, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8725966219179855439, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8725966219179855439, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8725966219179855439, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -401,6 +904,112 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} +--- !u!114 &673697810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!114 &783214831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -479,6 +1088,322 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5b26c779fcba62a49931d3f615653767, type: 3} +--- !u!1001 &883833119 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1006462573} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + propertyPath: m_LocalPosition.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + propertyPath: m_LocalPosition.z + value: 0.248 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + propertyPath: m_Name + value: boat + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + insertIndex: -1 + addedObject: {fileID: 1516533383} + m_SourcePrefab: {fileID: 100100000, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} +--- !u!114 &941562472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175084} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!1 &1006462571 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1006462573} + - component: {fileID: 1006462572} + m_Layer: 0 + m_Name: Player_and_Boat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1006462572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006462571} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 3 + Balance: 1 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 0 + Duration: 30 + TimeOffset: 0 + Translation: {x: 0, y: 0, z: 7} + Rotation: {x: 0, y: 0, z: 0} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!4 &1006462573 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006462571} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 371380903} + - {fileID: 1516533384} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1079741138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!1 &1516533382 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + m_PrefabInstance: {fileID: 883833119} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1516533383 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1516533382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0, z: 0} + Rotation: {x: 6, y: 2, z: 8} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!4 &1516533384 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 57a1cbf605852c64e91c772dff0da3cf, type: 3} + m_PrefabInstance: {fileID: 883833119} + m_PrefabAsset: {fileID: 0} --- !u!1 &1632918703 GameObject: m_ObjectHideFlags: 0 @@ -507,8 +1432,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 466404187} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1732440343 @@ -562,7 +1486,7 @@ MonoBehaviour: _tolerance: 0.5 _duration: 1 _execution: 1 - _delay: 10 + _delay: 30 _onTrigger: m_PersistentCalls: m_Calls: [] @@ -589,14 +1513,67 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1732440343} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2049563016 +--- !u!114 &1836605866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376175079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0097589062bdfad4a96fa20e8effbe2f, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoProceduralAnimator + _settings: + Space: 0 + Type: 1 + Balance: 0 + Curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + PlayOnAwake: 1 + RandomOffset: 1 + Duration: 4 + TimeOffset: 0 + Translation: {x: 0, y: 0.2, z: 0} + Rotation: {x: 3, y: 5, z: 2} + Scale: {x: 0, y: 0, z: 0} + _state: + CurrentTime: 0 + IsFinished: 0 + InitialPosition: {x: 0, y: 0, z: 0} + InitialRotation: {x: 0, y: 0, z: 0, w: 0} + InitialScale: {x: 0, y: 0, z: 0} +--- !u!1 &2020809348 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -604,118 +1581,132 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2049563020} - - component: {fileID: 2049563019} - - component: {fileID: 2049563018} - - component: {fileID: 2049563017} + - component: {fileID: 2020809349} + - component: {fileID: 2020809351} + - component: {fileID: 2020809350} m_Layer: 0 - m_Name: Ground + m_Name: Directional Light m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!64 &2049563017 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2049563016} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &2049563018 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2049563016} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5f465680b9c699e4a8e573e246fa1e9e, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &2049563019 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2049563016} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &2049563020 +--- !u!4 &2020809349 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2049563016} + m_GameObject: {fileID: 2020809348} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.6395836, y: -0.114876755, z: 0.60960656, w: 0.45400012} + m_LocalPosition: {x: 0, y: 14.3, z: 40.6} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Father: {fileID: 235456880} + m_LocalEulerAnglesHint: {x: 46.121, y: 77.038, z: 144.086} +--- !u!114 &2020809350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2020809348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!108 &2020809351 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2020809348} + m_Enabled: 1 + serializedVersion: 12 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize2D: {x: 0.5, y: 0.5} + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 882795732} - {fileID: 235456880} - - {fileID: 642044301} + - {fileID: 376175075} - {fileID: 1732440346} - - {fileID: 2049563020} + - {fileID: 1006462573} - {fileID: 1632918704} diff --git a/Assets/_Content/Scenes/HouseOfLeaves.unity b/Assets/_Content/Scenes/HouseOfLeaves.unity index 0a704acc..b75d0d22 100644 --- a/Assets/_Content/Scenes/HouseOfLeaves.unity +++ b/Assets/_Content/Scenes/HouseOfLeaves.unity @@ -265,6 +265,101 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &412733324 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 412733325} + - component: {fileID: 412733327} + - component: {fileID: 412733326} + m_Layer: 0 + m_Name: sand LOD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &412733325 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 412733324} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 507353086} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &412733326 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 412733324} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: cd4c9461f0234db4d8b3d73be94a58c3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &412733327 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 412733324} + m_Mesh: {fileID: 8802771628929948559, guid: 311617a3ba39d7643abf5c46141d0c80, type: 3} +--- !u!4 &507353086 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8725966219179855439, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} + m_PrefabInstance: {fileID: 642044301} + m_PrefabAsset: {fileID: 0} --- !u!1001 &642044301 PrefabInstance: m_ObjectHideFlags: 0 @@ -351,7 +446,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8725966219179855439, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} + insertIndex: -1 + addedObject: {fileID: 412733325} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3} --- !u!1 &832575517 @@ -748,6 +846,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -9198252425177103892, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -8769771754233910397, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -8766823529142007253, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -788,10 +898,218 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8551518200607068372, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -8550711669314019349, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -8426286621502341170, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -7605571332984283666, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -7595662666301948572, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -7529488404749628763, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -7453786351807260204, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -7420314105662339456, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -6461189244475135402, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -5825921487577456511, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -5791249804662883155, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -5761310658505921535, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -5598315612097605515, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -4557273280880588459, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -4457653579215716397, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -3943839043492448431, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -3801243254378311639, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -2847335252984646759, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -2666375914466422004, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -2610512660650141777, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -2394233101847947755, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -2280287865925402671, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -2037276403739325792, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -1830515456325670168, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -1312711483266953266, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -1303611767751402791, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -404299045237488234, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -335087645521106478, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -201831367648082897, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 874263245727880121, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} propertyPath: m_Name value: houseOfLeaves objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 1061929682452695409, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 1174739692091949873, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 1491118340195170076, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 1554714967577350219, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 2701086744763326064, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 2749023073155625137, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 2870688671691238572, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 3242792129730555364, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 3248955777472441292, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3248955777472441292, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 3387878034475323133, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 4357091338068030402, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 4457200494389606734, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 4650249053382236928, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 5144957891479410871, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 5439904546444210636, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 5732523858278775478, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 5768672114725486975, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6069157291177927420, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6251903622537048120, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8938159846195319279, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -829,11 +1147,6 @@ Transform: - {fileID: 1280641849} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &1903963931 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 7667587421508899390, guid: bc77fc4360cf7554d882153c57d02f91, type: 3} - m_PrefabInstance: {fileID: 1490996581} - m_PrefabAsset: {fileID: 0} --- !u!1 &1904167640 GameObject: m_ObjectHideFlags: 0 @@ -932,7 +1245,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 414aab56ce9b44a4d9c772df2d1726e3, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::SandController - SandRenderer: {fileID: 1903963931} + SandRenderer: {fileID: 412733326} Duration: 20 --- !u!1660057539 &9223372036854775807 SceneRoots: diff --git a/Assets/_Content/Settings/DefaultVolumeProfile.asset b/Assets/_Content/Settings/DefaultVolumeProfile.asset index 66d98de6..d77e135a 100644 --- a/Assets/_Content/Settings/DefaultVolumeProfile.asset +++ b/Assets/_Content/Settings/DefaultVolumeProfile.asset @@ -366,7 +366,7 @@ MonoBehaviour: m_Value: 0.9 intensity: m_OverrideState: 1 - m_Value: 0 + m_Value: 3 scatter: m_OverrideState: 1 m_Value: 0.7 diff --git a/Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs b/Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs index 9b36f9c5..20f68ee7 100644 --- a/Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs +++ b/Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs @@ -310,7 +310,7 @@ namespace OctoCore.Components else moveDelta.y -= _settings.Gravity * Time.deltaTime; - if (_references.Controller) + if (_references.Controller && _references.Controller.enabled) _references.Controller.Move(moveDelta); else transform.position += moveDelta; diff --git a/Packages/OctoCore/Runtime/Scripts/Components/OctoProceduralAnimator.cs b/Packages/OctoCore/Runtime/Scripts/Components/OctoProceduralAnimator.cs index 6d8e985e..173e28eb 100644 --- a/Packages/OctoCore/Runtime/Scripts/Components/OctoProceduralAnimator.cs +++ b/Packages/OctoCore/Runtime/Scripts/Components/OctoProceduralAnimator.cs @@ -48,11 +48,14 @@ namespace OctoCore.Components [Tooltip("Play on Awake")] public bool PlayOnAwake = true; + [Tooltip("Random Time Offset")] + public bool RandomOffset = true; + [Tooltip("Animation speed multiplier")] public float Duration = 4; - [Tooltip("Time offset to desynchronize multiple animations")] - public float TimeOffset = 0; + [Tooltip("Cycle offset to desynchronize multiple animations")] + [Range(0, 1)] public float CycleOffset = 0; [Tooltip("Translation amount in local space (meters)")] public Vector3 Translation = Vector3.zero; @@ -97,11 +100,14 @@ namespace OctoCore.Components void Start() { + Debug.Log("Start"); _state.InitialPosition = transform.localPosition; _state.InitialRotation = transform.localRotation; _state.InitialScale = transform.localScale; - _state.CurrentTime = _settings.TimeOffset; + _state.CurrentTime = _settings.CycleOffset; _state.IsFinished = false; + + _timeOffset = Time.timeSinceLevelLoad; } void Update() @@ -109,7 +115,7 @@ namespace OctoCore.Components if (_state.IsFinished || !_started) return; - _state.CurrentTime = Time.timeSinceLevelLoad + _settings.TimeOffset * _settings.Duration - _timeOffset; + _state.CurrentTime = Time.timeSinceLevelLoad + _settings.CycleOffset * _settings.Duration - _timeOffset + (_settings.RandomOffset ? transform.GetSiblingIndex() * 6.7f : 0); float normalizedTime = GetNormalizedTime(_state.CurrentTime); float easedTime = ApplyEasing(normalizedTime); @@ -136,7 +142,7 @@ namespace OctoCore.Components /// public void ResetAnimation() { - _state.CurrentTime = _settings.TimeOffset; + _state.CurrentTime = _settings.CycleOffset; _state.IsFinished = false; transform.localPosition = _state.InitialPosition; transform.localRotation = _state.InitialRotation;