diff --git a/Assets/ResRaw/gfx/res/Material/bob_25002-bob_25002_emissive.mat b/Assets/ResRaw/gfx/res/Material/bob_25002-bob_25002_emissive.mat index 6900c2036..4f5d752ad 100644 --- a/Assets/ResRaw/gfx/res/Material/bob_25002-bob_25002_emissive.mat +++ b/Assets/ResRaw/gfx/res/Material/bob_25002-bob_25002_emissive.mat @@ -24,10 +24,9 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _EMISSION + m_ValidKeywords: [] m_InvalidKeywords: [] - m_LightmapFlags: 3 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -40,7 +39,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 499128f6cc2d29a47938097f108c78da, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -64,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 499128f6cc2d29a47938097f108c78da, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -132,9 +131,9 @@ Material: - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} - - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} - - _EmissionColor: {r: 0.6985294, g: 0.48542836, b: 0.21572232, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, 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/ResRaw/gfx/res/Material/bob_25002-bob_25002_mat.mat b/Assets/ResRaw/gfx/res/Material/bob_25002-bob_25002_mat.mat index d7643dc3c..c570da378 100644 --- a/Assets/ResRaw/gfx/res/Material/bob_25002-bob_25002_mat.mat +++ b/Assets/ResRaw/gfx/res/Material/bob_25002-bob_25002_mat.mat @@ -124,8 +124,8 @@ Material: - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Samples/Crest/5.4.2/Examples/Materials/Examples_TransparentPrimitive.mat b/Assets/Samples/Crest/5.4.2/Examples/Materials/Examples_TransparentPrimitive.mat index db3248fb2..9303a4491 100644 --- a/Assets/Samples/Crest/5.4.2/Examples/Materials/Examples_TransparentPrimitive.mat +++ b/Assets/Samples/Crest/5.4.2/Examples/Materials/Examples_TransparentPrimitive.mat @@ -155,18 +155,23 @@ Material: - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 2 - _DstBlend: 10 + - _DstBlend2: 0 + - _DstBlendAlpha: 10 - _EnableBlendModePreserveSpecularLighting: 1 - _EnableFogOnTransparent: 1 - _ExcludeFromTUAndAA: 0 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 + - _MaterialID: 1 + - _MaterialTypeMask: 2 - _Metallic: 0 - _Mode: 3 - _Normal_Flip_Back_Faces: 1 - _OcclusionStrength: 1 - _OpaqueCullMode: 2 - _Parallax: 0.02 + - _PerPixelSorting: 0 - _QueueControl: 0 - _QueueOffset: 0 - _RayTracing: 0 @@ -181,6 +186,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 0 - _StencilRefDistortionVec: 4 @@ -194,6 +200,7 @@ Material: - _SupportDecals: 1 - _Surface: 1 - _SurfaceType: 1 + - _TransmissionEnable: 1 - _TransparentBackfaceEnable: 0 - _TransparentCullMode: 2 - _TransparentDepthPostpassEnable: 0 @@ -203,6 +210,7 @@ Material: - _TransparentZWrite: 0 - _UVSec: 0 - _UseShadowThreshold: 0 + - _Water_Volume_Multiplier: 1 - _WorkflowMode: 1 - _ZTest: 4 - _ZTestDepthEqualForOpaque: 4 diff --git a/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_FloatingObjects.prefab b/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_FloatingObjects.prefab index 2f96e132e..e712867a8 100644 --- a/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_FloatingObjects.prefab +++ b/Assets/Samples/Crest/5.4.2/Examples/Prefabs/Scenes/Examples_FloatingObjects.prefab @@ -8,111 +8,90 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 809695123049724894, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 809695123049724894, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 809695123049724894, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 809695123049724894, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2823138595762987762, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 2823138595762987762, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_Name value: Examples_FloatingObjects objectReference: {fileID: 0} - - target: {fileID: 2853796242865667210, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 2853796242865667210, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: managedReferences[1004]._Enabled value: 1 objectReference: {fileID: 0} - - target: {fileID: 5549572483640152611, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 5549572483640152611, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_MaxValue value: 5 objectReference: {fileID: 0} - - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 5655619906866042202, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6119524809475244111, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - target: {fileID: 6119524809475244111, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} propertyPath: m_Text value: Floating Objects objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 7451036494515983304, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - targetCorrespondingSourceObject: {fileID: 7451036494515983304, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} insertIndex: -1 addedObject: {fileID: 4586859356124459972} - - targetCorrespondingSourceObject: {fileID: 7451036494515983304, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - targetCorrespondingSourceObject: {fileID: 7451036494515983304, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} insertIndex: -1 addedObject: {fileID: 510414307367690215} - - targetCorrespondingSourceObject: {fileID: 7451036494515983304, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - targetCorrespondingSourceObject: {fileID: 7451036494515983304, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} insertIndex: -1 addedObject: {fileID: 8023298220426844320} - - targetCorrespondingSourceObject: {fileID: 7451036494515983304, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + - targetCorrespondingSourceObject: {fileID: 7451036494515983304, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} insertIndex: -1 addedObject: {fileID: 1585603024147405864} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} --- !u!4 &7195797433741594109 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7451036494515983304, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, - type: 3} + m_CorrespondingSourceObject: {fileID: 7451036494515983304, guid: 8b98a14ae91dd498d8f577f0f8f4aff1, type: 3} m_PrefabInstance: {fileID: 341145004360408629} m_PrefabAsset: {fileID: 0} --- !u!1001 &2066873169911808049 @@ -123,58 +102,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7195797433741594109} m_Modifications: - - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_Name value: Examples_FloatingBox (2) objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalPosition.y value: 5 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -185,8 +153,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} --- !u!4 &8023298220426844320 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} m_PrefabInstance: {fileID: 2066873169911808049} m_PrefabAsset: {fileID: 0} --- !u!1001 &5499094441694620501 @@ -197,58 +164,51 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7195797433741594109} m_Modifications: - - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_Name value: Examples_FloatingBox objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 7065213192571102027, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalPosition.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -259,8 +219,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} --- !u!4 &4586859356124459972 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} m_PrefabInstance: {fileID: 5499094441694620501} m_PrefabAsset: {fileID: 0} --- !u!1001 &7347139586002683065 @@ -271,58 +230,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7195797433741594109} m_Modifications: - - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_Name value: Examples_FloatingBox (3) objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalPosition.y value: 7 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -333,8 +281,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} --- !u!4 &1585603024147405864 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} m_PrefabInstance: {fileID: 7347139586002683065} m_PrefabAsset: {fileID: 0} --- !u!1001 &8422331713121437558 @@ -345,58 +292,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7195797433741594109} m_Modifications: - - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_Name value: Examples_FloatingBox (1) objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalPosition.y value: 3 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -407,7 +343,6 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} --- !u!4 &510414307367690215 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, - type: 3} + m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} m_PrefabInstance: {fileID: 8422331713121437558} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Samples/Crest/5.4.2/Examples/Scenes/Examples.unity b/Assets/Samples/Crest/5.4.2/Examples/Scenes/Examples.unity index 853604bb9..7f5d32fc1 100644 --- a/Assets/Samples/Crest/5.4.2/Examples/Scenes/Examples.unity +++ b/Assets/Samples/Crest/5.4.2/Examples/Scenes/Examples.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -42,8 +42,8 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -66,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -96,9 +93,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 6e72aca972f324f7886200f86939d735, - type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: be61fd374ee0fad46a337d78e0ed01ae, type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: 6e72aca972f324f7886200f86939d735, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -770,28 +766,17 @@ MonoBehaviour: m_MoveRepeatDelay: 0.5 m_MoveRepeatRate: 0.1 m_XRTrackingOrigin: {fileID: 0} - m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_CancelAction: {fileID: -1967631576421560919, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: -1967631576421560919, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 m_CursorLockBehavior: 0 @@ -893,6 +878,11 @@ MeshRenderer: 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: @@ -914,6 +904,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -949,58 +940,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1845454492} m_Modifications: - - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, - type: 3} + - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, - type: 3} + - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, - type: 3} + - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, - type: 3} + - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, type: 3} propertyPath: m_LocalRotation.w value: 0 objectReference: {fileID: 0} - - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, - type: 3} + - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, - type: 3} + - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, type: 3} propertyPath: m_LocalRotation.y value: 0.9063079 objectReference: {fileID: 0} - - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, - type: 3} + - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, type: 3} propertyPath: m_LocalRotation.z value: -0.42261827 objectReference: {fileID: 0} - - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, - type: 3} + - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 105 objectReference: {fileID: 0} - - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, - type: 3} + - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 15 objectReference: {fileID: 0} - - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, - type: 3} + - target: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5304508333967466499, guid: 774ab582b39374a7e9d5dac8e31b9a5a, - type: 3} + - target: {fileID: 5304508333967466499, guid: 774ab582b39374a7e9d5dac8e31b9a5a, type: 3} propertyPath: m_Name value: Sun objectReference: {fileID: 0} @@ -1011,8 +991,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 774ab582b39374a7e9d5dac8e31b9a5a, type: 3} --- !u!4 &1364867124 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, - type: 3} + m_CorrespondingSourceObject: {fileID: 1399345652565587599, guid: 774ab582b39374a7e9d5dac8e31b9a5a, type: 3} m_PrefabInstance: {fileID: 1364867123} m_PrefabAsset: {fileID: 0} --- !u!1 &1682107712 @@ -1104,58 +1083,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1845454492} m_Modifications: - - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, - type: 3} + - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, - type: 3} + - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, - type: 3} + - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, - type: 3} + - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, - type: 3} + - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, - type: 3} + - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, - type: 3} + - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, - type: 3} + - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, - type: 3} + - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, - type: 3} + - target: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2942909709672342223, guid: 63a4b7e65d06948649ac3e10077d8c2e, - type: 3} + - target: {fileID: 2942909709672342223, guid: 63a4b7e65d06948649ac3e10077d8c2e, type: 3} propertyPath: m_Name value: Atmosphere objectReference: {fileID: 0} @@ -1166,8 +1134,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 63a4b7e65d06948649ac3e10077d8c2e, type: 3} --- !u!4 &1734491900 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, - type: 3} + m_CorrespondingSourceObject: {fileID: 2272289698115174340, guid: 63a4b7e65d06948649ac3e10077d8c2e, type: 3} m_PrefabInstance: {fileID: 1734491899} m_PrefabAsset: {fileID: 0} --- !u!1 &1835631273 @@ -1315,58 +1282,47 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1845454492} m_Modifications: - - target: {fileID: 963553959586484309, guid: bece9afbf3ddd49059dd73ba2cc986f6, - type: 3} + - target: {fileID: 963553959586484309, guid: bece9afbf3ddd49059dd73ba2cc986f6, type: 3} propertyPath: m_Name value: Lighting objectReference: {fileID: 0} - - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, - type: 3} + - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, - type: 3} + - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, - type: 3} + - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, - type: 3} + - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, - type: 3} + - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, - type: 3} + - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, - type: 3} + - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, - type: 3} + - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, - type: 3} + - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, - type: 3} + - target: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -1377,8 +1333,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: bece9afbf3ddd49059dd73ba2cc986f6, type: 3} --- !u!4 &1886939755 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, - type: 3} + m_CorrespondingSourceObject: {fileID: 6033288213199496986, guid: bece9afbf3ddd49059dd73ba2cc986f6, type: 3} m_PrefabInstance: {fileID: 1886939754} m_PrefabAsset: {fileID: 0} --- !u!1 &2128464135 diff --git a/Assets/Samples/Crest/5.4.2/Examples/Scenes/Examples/LightingData.asset b/Assets/Samples/Crest/5.4.2/Examples/Scenes/Examples/LightingData.asset index 46eda0b3d..2c3dcf463 100644 Binary files a/Assets/Samples/Crest/5.4.2/Examples/Scenes/Examples/LightingData.asset and b/Assets/Samples/Crest/5.4.2/Examples/Scenes/Examples/LightingData.asset differ diff --git a/Assets/Samples/Crest/5.4.2/Examples/Scenes/Examples/ReflectionProbe-0.exr b/Assets/Samples/Crest/5.4.2/Examples/Scenes/Examples/ReflectionProbe-0.exr index 8072dee74..4fb8142ae 100644 Binary files a/Assets/Samples/Crest/5.4.2/Examples/Scenes/Examples/ReflectionProbe-0.exr and b/Assets/Samples/Crest/5.4.2/Examples/Scenes/Examples/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/BobberTest.unity b/Assets/Scenes/BobberTest.unity index 8af3c111d..afa442107 100644 --- a/Assets/Scenes/BobberTest.unity +++ b/Assets/Scenes/BobberTest.unity @@ -393,12 +393,124 @@ CapsuleCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Radius: 0.001 m_Height: 0.06766828 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &668361900 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 668361904} + - component: {fileID: 668361903} + - component: {fileID: 668361902} + - component: {fileID: 668361901} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!64 &668361901 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 668361900} + 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: 0 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &668361902 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 668361900} + 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: 31321ba15b8f8eb4c954353edc038b1d, 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_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &668361903 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 668361900} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &668361904 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 668361900} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &844322797 GameObject: m_ObjectHideFlags: 0 @@ -409,9 +521,8 @@ GameObject: m_Component: - component: {fileID: 844322798} - component: {fileID: 844322802} - - component: {fileID: 844322801} - component: {fileID: 844322800} - - component: {fileID: 844322799} + - component: {fileID: 844322803} m_Layer: 16 m_Name: Float (1) m_TagString: Untagged @@ -428,14 +539,14 @@ Transform: m_GameObject: {fileID: 844322797} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.0229, z: 0} + m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 917993274} - m_Father: {fileID: 0} + m_Father: {fileID: 7195797433903099932} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &844322799 +--- !u!114 &844322800 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -444,140 +555,11 @@ MonoBehaviour: m_GameObject: {fileID: 844322797} m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dd1aa9f0de8b435448c6893ecc60d021, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Buoyancy - waterLevel: 0 - waterAvailable: 1 - includeDeformation: 1 - sphereRadiusApproximation: 0.1 - waveForceMultiplier: 0.01 - currentSpeedMultiplier: 0.01 - dragMultiplier: 1 - defaultRigidbodyDrag: 5 - underwaterRigidbodyAngularDrag: 5 - overwaterRigidbodyAngularDrag: 1 - surfaceTensionDamping: 10 - applyForceWithRandomOffset: 0 - waterHeightOffset: 0 - drawDebug: 0 ---- !u!114 &844322800 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 844322797} - m_Enabled: 1 - m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8e9411b5edc6466a8014c59e3821bbaa, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::NBF.BobberController _rbody: {fileID: 844322802} - joint: {fileID: 844322801} - _buoyancy: {fileID: 0} ---- !u!153 &844322801 -ConfigurableJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 844322797} - serializedVersion: 4 - m_ConnectedBody: {fileID: 0} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: -0.01, z: 0} - m_Axis: {x: 0, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 0 - m_ConnectedAnchor: {x: 0, y: 0, z: 0} - m_SecondaryAxis: {x: 0, y: 0, z: 0} - m_XMotion: 1 - m_YMotion: 1 - m_ZMotion: 1 - m_AngularXMotion: 2 - m_AngularYMotion: 2 - m_AngularZMotion: 2 - m_LinearLimitSpring: - spring: 0 - damper: 0 - m_LinearLimit: - limit: 0.5 - bounciness: 0 - contactDistance: 0 - m_AngularXLimitSpring: - spring: 0 - damper: 0 - m_LowAngularXLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_HighAngularXLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_AngularYZLimitSpring: - spring: 0 - damper: 0 - m_AngularYLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_AngularZLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_TargetPosition: {x: 0, y: 0, z: 0} - m_TargetVelocity: {x: 0, y: 0, z: 0} - m_XDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_YDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_ZDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} - m_TargetAngularVelocity: {x: 0, y: 0, z: 0} - m_RotationDriveMode: 0 - m_AngularXDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_AngularYZDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_SlerpDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_ProjectionMode: 1 - m_ProjectionDistance: 0 - m_ProjectionAngle: 0 - m_ConfiguredInWorldSpace: 0 - m_SwapBodies: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 0 - m_MassScale: 1 - m_ConnectedMassScale: 1 + joint: {fileID: 0} --- !u!54 &844322802 Rigidbody: m_ObjectHideFlags: 0 @@ -586,9 +568,9 @@ Rigidbody: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 844322797} serializedVersion: 5 - m_Mass: 0.1 - m_LinearDamping: 5 - m_AngularDamping: 0.1 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 0.001, y: 0.001, z: 0.001} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -599,12 +581,42 @@ Rigidbody: serializedVersion: 2 m_Bits: 0 m_ImplicitCom: 1 - m_ImplicitTensor: 0 - m_UseGravity: 0 + m_ImplicitTensor: 1 + m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 0 - m_CollisionDetection: 2 + m_CollisionDetection: 0 +--- !u!114 &844322803 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 844322797} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eba37e6f7ba7a4a488c7831f45a078b2, type: 3} + m_Name: + m_EditorClassIdentifier: WaveHarmonic.Crest::WaveHarmonic.Crest.FloatingObject + _Version: 0 + _RigidBody: {fileID: 844322802} + _Model: 0 + _Layer: 0 + _BuoyancyForceStrength: 10 + _BuoyancyTorqueStrength: 8 + _MaximumBuoyancyForce: 100 + _CenterToBottomOffset: 0 + _AccelerateDownhill: 0 + _Probes: [] + _Drag: {x: 2, y: 3, z: 1} + _AngularDrag: 0.2 + _ForceHeightOffset: 0 + _ObjectWidth: 3 + _UseObjectLength: 0 + _ObjectLength: 3 + _Debug: + _DrawQueries: 1 --- !u!1 &909052969 GameObject: m_ObjectHideFlags: 0 @@ -622,7 +634,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!154 &909052970 TerrainCollider: m_ObjectHideFlags: 0 @@ -771,7 +783,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &961739750 MonoBehaviour: m_ObjectHideFlags: 0 @@ -884,7 +896,7 @@ Transform: m_GameObject: {fileID: 961739749} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -1.95} + m_LocalPosition: {x: 0, y: 1, z: -3.68} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -980,6 +992,16 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1072129355} m_Mesh: {fileID: 4300000, guid: 77d4b5d6e9e84794383ac9531cb04cae, type: 2} +--- !u!4 &1345161124 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9013060131419009103, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3} + m_PrefabInstance: {fileID: 4903999546382904164} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1348802136 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + m_PrefabInstance: {fileID: 5499094441789200052} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1384521324 PrefabInstance: m_ObjectHideFlags: 0 @@ -1206,7 +1228,189 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a1300e9b5a5c347408708087176324c0, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::FlatWaterHeightProvider - waterY: 0 +--- !u!1 &1529912227 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1529912228} + - component: {fileID: 1529912233} + - component: {fileID: 1529912232} + - component: {fileID: 1529912231} + - component: {fileID: 1529912230} + - component: {fileID: 1529912229} + m_Layer: 0 + m_Name: Capsule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1529912228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1529912227} + serializedVersion: 2 + m_LocalRotation: {x: 0.6451911, y: 0, z: 0, w: 0.76402134} + m_LocalPosition: {x: 0, y: 1.67, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7195797433903099932} + m_LocalEulerAnglesHint: {x: 80.36, y: 0, z: 0} +--- !u!114 &1529912229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1529912227} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c103db8c4b014d87845103a400b1ace5, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::NBF.BobberFloating + _water: {fileID: 2531380344179187550} + _RigidBody: {fileID: 1529912230} + _Layer: 0 + _BuoyancyForceStrength: 1 + _BuoyancyTorqueStrength: 8 + _MaximumBuoyancyForce: 100 + _CenterToBottomOffset: -1 + _AccelerateDownhill: 0 + _Drag: {x: 2, y: 3, z: 1} + _AngularDrag: 0.2 + _ForceHeightOffset: 0 + _ObjectWidth: 3 + _Debug: + _DrawQueries: 1 +--- !u!54 &1529912230 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1529912227} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!136 &1529912231 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1529912227} + 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: 2 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1529912232 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1529912227} + 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: 31321ba15b8f8eb4c954353edc038b1d, 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_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1529912233 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1529912227} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1801125034 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2452750316707852748, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3} + m_PrefabInstance: {fileID: 3951967027910327458} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1866024594 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + m_PrefabInstance: {fileID: 7347139586361227608} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1948332548 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + m_PrefabInstance: {fileID: 2066873170891308496} + m_PrefabAsset: {fileID: 0} --- !u!1 &2000669906 GameObject: m_ObjectHideFlags: 0 @@ -1490,6 +1694,25 @@ Transform: m_Children: [] m_Father: {fileID: 4046714554611455} m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} +--- !u!1 &13741015225074637 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1291580890895649287} + - component: {fileID: 4206591282465003479} + - component: {fileID: 269011904976577378} + - component: {fileID: 5777952278598528620} + m_Layer: 0 + m_Name: Mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!23 &23228966932422775 MeshRenderer: m_ObjectHideFlags: 0 @@ -1593,6 +1816,36 @@ CapsuleCollider: m_Height: 0.04 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &269011904976577378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13741015225074637} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26623fd0e291a478a9f8b68a3df7e8a6, type: 3} + m_Name: + m_EditorClassIdentifier: + _Mode: 4 + _Weight: 1 + _Queue: -1 + _Blend: 1 + _FeatherWidth: 0.1 + _FollowHorizontalWaveMotion: 0 + _Data: + rid: -2 + _DrawBounds: 0 + _Version: 0 + _Primitive: 0 + _Inverted: 1 + _WaterHeightDistanceCulling: 0 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } --- !u!114 &309487077947173374 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1610,6 +1863,914 @@ MonoBehaviour: topConnector: {fileID: 4466248854207531} bottomConnector: {fileID: 4064788320456926} waterline: {fileID: 4902566405131541} +--- !u!4 &510414306652611078 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8703167026404688510} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7195797433903099932} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!223 &629080170150445082 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3520625832899209208} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!1 &718630768303000296 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8110689384494340643} + - component: {fileID: 830743482588973215} + - component: {fileID: 5789121095946249115} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!54 &737882883271643569 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8703167026404688510} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!222 &830743482588973215 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718630768303000296} + m_CullTransparentMesh: 1 +--- !u!1 &846873439756317439 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3430072966807144692} + - component: {fileID: 4482564581663768649} + m_Layer: 0 + m_Name: Waves + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1065788238234039155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6378093526646979720} + - component: {fileID: 5893794529913785282} + - component: {fileID: 2768195507856275610} + - component: {fileID: 5204046975801588350} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1087699467470203968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4066733549998169382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.6} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!23 &1091447231717862214 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8703167026404688510} + 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: 35af310c2690e42a6a9d2ca36256e92c, 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: 0 + 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_AdditionalVertexStreams: {fileID: 0} +--- !u!224 &1118969678120638474 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4066733549998169382} + 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: 2256579932936496278} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!4 &1291580890895649287 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13741015225074637} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 20, y: 20, z: 20} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3347216226615520232} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1294943038411644326 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7391080619033618174} + 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: 1801125034} + - {fileID: 1345161124} + m_Father: {fileID: 3347216226615520232} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1471384148769986650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3105970826351227058} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a8eca7a783ef84759a4e965c9d6d8827, type: 3} + m_Name: + m_EditorClassIdentifier: + _Version: 0 + _ExecuteUpdateEvery: 0 + _StopExecutingUpdateAfter: Infinity + _OnEnable: + m_PersistentCalls: + m_Calls: [] + _OnDisable: + m_PersistentCalls: + m_Calls: [] + _OnUpdate: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5314238040867713527} + m_TargetAssemblyTypeName: UnityEngine.UI.Slider, UnityEngine.UI + m_MethodName: set_value + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _OnLegacyRenderPipeline: + m_PersistentCalls: + m_Calls: [] + _OnHighDefinitionPipeline: + m_PersistentCalls: + m_Calls: [] + _OnUniversalRenderPipeline: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &1549296833198396159 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4262266657851529727} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &1652416334554012124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8703167026404688510} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8958fecc82ae04c7d9128101addbdc3b, type: 3} + m_Name: + m_EditorClassIdentifier: + _Version: 0 + _Radius: 0.75 + _Weight: 1 + _WeightVerticalMultiplier: 0.5 + _InnerSphereMultiplier: 1.55 + _InnerSphereOffset: 0.109 + _VelocityOffset: 0.04 + _CompensateForWaveMotion: 0.45 + _BoostLargeWaves: 0 + _TeleportSpeed: 500 + _WarnOnTeleport: 0 + _MaximumSpeed: 100 + _WarnOnSpeedClamp: 0 + _DebugSubsteps: 0 +--- !u!1 &1813745404044158782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4485081553893766294} + m_Layer: 5 + m_Name: NotSupported + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!1001 &2066873170891308496 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7195797433903099932} + m_Modifications: + - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_Name + value: Examples_FloatingBox (2) + objectReference: {fileID: 0} + - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7065213192571102027, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalPosition.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} +--- !u!1 &2090048868787617803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8955599026941321190} + - component: {fileID: 4334316862751883177} + - component: {fileID: 6451968783914721810} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2256579932936496278 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5619231331865316359} + 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: 1118969678120638474} + m_Father: {fileID: 6459342237427658402} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2315375321412784839 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6260237052217873599} + m_CullTransparentMesh: 1 +--- !u!114 &2358608343594615569 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3520625832899209208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 5037887 +--- !u!4 &2377736507111905412 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7126023296560485276} + 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: 3347216226615520232} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2531380344179187550 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9157164589531290079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e64c239f69eea46778ded6dcc3427a34, type: 3} + m_Name: + m_EditorClassIdentifier: + _Layer: 4 + _Material: {fileID: 2100000, guid: d82d92d8d8f214cd0b8bf7c185b2c341, type: 2} + _VolumeMaterial: {fileID: 0} + _ChunkTemplate: {fileID: 0} + _CastShadows: 0 + _WaterBodyCulling: 1 + _TimeSliceBoundsUpdateFrameCount: 1 + _SurfaceSelfIntersectionFixMode: 4 + _AllowRenderQueueSorting: 0 + _Version: 2 + _Camera: {fileID: 0} + _TimeProvider: {fileID: 0} + _WindZone: {fileID: 0} + _OverrideWindZoneWindSpeed: 0 + _WindSpeed: 10 + _OverrideWindZoneWindDirection: 0 + _WindDirection: 0 + _OverrideWindZoneWindTurbulence: 0 + _WindTurbulence: 0.145 + _OverrideGravity: 0 + _GravityOverride: -9.8 + _GravityMultiplier: 1 + _PrimaryLight: {fileID: 0} + _InjectionPoint: 0 + _WriteToColorTexture: 1 + _WriteToDepthTexture: 1 + _WriteMotionVectors: 1 + _OverrideRenderHDR: 0 + _RenderHDR: 1 + _Surface: + rid: 1013 + _ScaleRange: {x: 8, y: 8} + _DropDetailHeightBasedOnWaves: 0.081 + _Slices: 7 + _Resolution: 384 + _GeometryDownSampleFactor: 2 + _ExtentsSizeMultiplier: 100 + _MultipleViewpoints: 0 + _Viewpoint: {fileID: 2377736507111905412} + _CameraExclusions: -1 + _DataBackgroundMode: 3 + _CenterOfDetailDisplacementCorrection: 1 + _SampleTerrainHeightForScale: 1 + _ForceScaleChangeSmoothing: 0 + _TeleportThreshold: 10 + _AnimatedWavesLod: + rid: 5163698739167625228 + _DepthLod: + rid: 1001 + _LevelLod: + rid: 1002 + _FoamLod: + rid: 1003 + _DynamicWavesLod: + rid: 1004 + _FlowLod: + rid: 1005 + _ShadowLod: + rid: 1006 + _AbsorptionLod: + rid: 1000 + _ScatteringLod: + rid: 1012 + _ClipLod: + rid: 1007 + _AlbedoLod: + rid: 1008 + _Reflections: + rid: 1009 + _Underwater: + rid: 1010 + _Meniscus: + rid: 1014 + _Portals: + rid: 1011 + _ShowWaterProxyPlane: 0 + _FollowSceneCamera: 1 + _EditorMultipleViewpoints: 1 + _HeightQueries: 1 + _Debug: + _SimulatePaused: 0 + _AttachDebugGUI: 0 + _ShowHiddenObjects: 0 + _DisableFollowViewpoint: 0 + _DestroyResourcesInOnDisable: 0 + _LogScaleChange: 0 + _PauseOnScaleChange: 0 + _IgnoreWavesForScaleChange: 0 + _OverrideScale: 0 + _ScaleOverride: 0 + _ForceNoGraphics: 0 + _Resources: {fileID: 11400000, guid: 0817af17dea584e5382e6216db162d4a, type: 2} + references: + version: 2 + RefIds: + - rid: 1000 + type: {class: AbsorptionLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Enabled: 0 + _OverrideResolution: 1 + _Resolution: 256 + _TextureFormatMode: 200 + _TextureFormat: 7 + _Blur: 0 + _BlurIterations: 1 + _ShorelineColorSource: 0 + _ShorelineColor: {r: 1.026, g: 2.085, b: 2.5500002, a: 0.306} + _ShorelineColorMaximumDistance: 10 + _ShorelineColorFalloff: 2 + - rid: 1001 + type: {class: DepthLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Enabled: 0 + _OverrideResolution: 1 + _Resolution: 256 + _TextureFormatMode: 100 + _TextureFormat: 46 + _Blur: 0 + _BlurIterations: 1 + _QuerySource: 1 + _MaximumQueryCount: 512 + _IncludeTerrainHeight: 0 + _EnableSignedDistanceFields: 1 + - rid: 1002 + type: {class: LevelLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Enabled: 0 + _OverrideResolution: 0 + _Resolution: 256 + _TextureFormatMode: 300 + _TextureFormat: 45 + _Blur: 0 + _BlurIterations: 4 + - rid: 1003 + type: {class: FoamLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Enabled: 1 + _OverrideResolution: 1 + _Resolution: 256 + _TextureFormatMode: 100 + _TextureFormat: 45 + _Blur: 0 + _BlurIterations: 1 + _SimulationFrequency: 30 + _Prewarm: 1 + _Settings: {fileID: 0} + - rid: 1004 + type: {class: DynamicWavesLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Enabled: 1 + _OverrideResolution: 0 + _Resolution: 512 + _TextureFormatMode: 300 + _TextureFormat: 46 + _Blur: 0 + _BlurIterations: 1 + _SimulationFrequency: 120 + _AttenuationInShallows: 1 + _Settings: {fileID: 0} + - rid: 1005 + type: {class: FlowLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Enabled: 0 + _OverrideResolution: 1 + _Resolution: 128 + _TextureFormatMode: 100 + _TextureFormat: 46 + _Blur: 0 + _BlurIterations: 1 + _QuerySource: 1 + _MaximumQueryCount: 1024 + - rid: 1006 + type: {class: ShadowLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Enabled: 1 + _OverrideResolution: 1 + _Resolution: 256 + _TextureFormatMode: 100 + _TextureFormat: 6 + _Blur: 1 + _BlurIterations: 1 + _SimulationFrequency: 60 + _DynamicSoftShadows: 1 + _SoftJitterExtinctionFactor: 0.75 + _JitterDiameterSoft: 15 + _CurrentFrameWeightSoft: 0.03 + _JitterDiameterHard: 0.6 + _CurrentFrameWeightHard: 0.15 + _AllowNullLight: 0 + _AllowNoShadows: 0 + - rid: 1007 + type: {class: ClipLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Enabled: 1 + _OverrideResolution: 1 + _Resolution: 256 + _TextureFormatMode: 200 + _TextureFormat: 5 + _Blur: 0 + _BlurIterations: 1 + _DefaultClippingState: 1 + - rid: 1008 + type: {class: AlbedoLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Enabled: 0 + _OverrideResolution: 1 + _Resolution: 768 + _TextureFormatMode: 100 + _TextureFormat: 8 + _Blur: 0 + _BlurIterations: 1 + - rid: 1009 + type: {class: WaterReflections, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Version: 0 + _Enabled: 0 + _Mode: 0 + _Layers: + serializedVersion: 2 + m_Bits: 1 + _Resolution: 256 + _Overscan: 1.5 + _RenderOnlySingleCamera: 0 + _Sky: 0 + _DisablePixelLights: 1 + _DisableShadows: 1 + _HDR: 1 + _Stencil: 0 + _QualitySettingsOverride: + _OverrideLodBias: 0 + _LodBias: 0.5 + _OverrideMaximumLodLevel: 0 + _MaximumLodLevel: 1 + _OverrideTerrainPixelError: 0 + _TerrainPixelError: 10 + _ClipPlaneOffset: 0 + _FarClipPlane: 1000 + _DisableOcclusionCulling: 1 + _RefreshPerFrames: 1 + _FrameRefreshOffset: 0 + _UseObliqueMatrix: 1 + _NonObliqueNearSurface: 0 + _NonObliqueNearSurfaceThreshold: 0.05 + _Debug: + _ShowHiddenObjects: 0 + _DisableRecursiveRendering: 0 + _ForceCompatibility: 0 + _AllowMSAA: 0 + - rid: 1010 + type: {class: UnderwaterRenderer, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Enabled: 1 + _Layer: 4 + _Material: {fileID: 2100000, guid: f2b096e4d95e646c49d48ece0afa0547, type: 2} + _EnvironmentalLightingEnable: 0 + _EnvironmentalLightingWeight: 1 + _EnvironmentalLightingVolumeProfile: {fileID: 0} + _CameraExclusions: 6 + _CopyWaterMaterialParametersEachFrame: 1 + _FarPlaneMultiplier: 0.68 + _CullLimit: 0.001 + _Debug: + _VisualizeMask: 0 + _DisableMask: 0 + _VisualizeStencil: 0 + _DisableHeightAboveWaterOptimization: 0 + _DisableArtifactCorrection: 0 + _OnlyReflectionCameras: 0 + _Version: 0 + _AllCameras: 0 + - rid: 1011 + type: {class: PortalRenderer, ns: WaveHarmonic.Crest.Portals, asm: WaveHarmonic.Crest} + data: + - rid: 1012 + type: {class: ScatteringLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Enabled: 0 + _OverrideResolution: 1 + _Resolution: 256 + _TextureFormatMode: 200 + _TextureFormat: 23 + _Blur: 0 + _BlurIterations: 1 + _ShorelineColorSource: 0 + _ShorelineColor: {r: 0, g: 0.588, b: 1.2, a: 6} + _ShorelineColorMaximumDistance: 10 + _ShorelineColorFalloff: 2 + - rid: 1013 + type: {class: SurfaceRenderer, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Version: 0 + _Enabled: 1 + _MeshType: 0 + _Layer: 4 + _Material: {fileID: 2100000, guid: d82d92d8d8f214cd0b8bf7c185b2c341, type: 2} + _VolumeMaterial: {fileID: 0} + _ChunkTemplate: {fileID: 0} + _CastShadows: 0 + _WaterBodyCulling: 1 + _TimeSliceBoundsUpdateFrameCount: 1 + _CameraExclusions: 6 + _SurfaceSelfIntersectionFixMode: 4 + _AllowRenderQueueSorting: 0 + _Debug: + _UniformTiles: 0 + _DisableSkirt: 0 + - rid: 1014 + type: {class: Meniscus, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Enabled: 1 + _Layer: 4 + _Material: {fileID: 2100000, guid: 238e45299a5ec46308e9bf99ddf67963, type: 2} + _CameraExclusions: 6 + - rid: 5163698739167625228 + type: {class: AnimatedWavesLod, ns: WaveHarmonic.Crest, asm: WaveHarmonic.Crest} + data: + _Enabled: 1 + _OverrideResolution: 0 + _Resolution: 256 + _TextureFormatMode: 200 + _TextureFormat: 48 + _Blur: 0 + _BlurIterations: 1 + _QuerySource: 1 + _MaximumQueryCount: 4096 + _CollisionLayers: -1 + _BakedWaveData: {fileID: 0} + _WaveSampling: 0 + _WaveResolutionMultiplier: 1 + _AttenuationInShallows: 0.95 + _ShallowsMaximumDepth: 1000 + _CollisionSource: 2 +--- !u!1 &2564289860215701798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5388330205210097294} + m_Layer: 0 + m_Name: Examples_FloatingObjects + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &2575899344989503316 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5096569463460343103} + m_Layer: 5 + m_Name: Preview + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &2621863687419783078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6871473421737383571} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!65 &2709071706889968141 BoxCollider: m_ObjectHideFlags: 0 @@ -1631,6 +2792,36 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.005, y: 0.005, z: 0.005} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &2768195507856275610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1065788238234039155} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3ac2b00bfeca4b34482fa33bb6aab50c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3062767698477047043 GameObject: m_ObjectHideFlags: 0 @@ -1919,6 +3110,23 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3063120168933639565} m_Mesh: {fileID: 4300000, guid: 77d4b5d6e9e84794383ac9531cb04cae, type: 2} +--- !u!1 &3105970826351227058 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7195797433903099932} + - component: {fileID: 1471384148769986650} + m_Layer: 0 + m_Name: Example + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!136 &3125573090217924624 CapsuleCollider: m_ObjectHideFlags: 0 @@ -1965,6 +3173,54 @@ CapsuleCollider: m_Height: 0.04 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &3314111838324823321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8737220161078195139} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.46226418, g: 0.46226418, b: 0.46226418, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!4 &3347216226615520232 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6254405495442382258} + 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: 1294943038411644326} + - {fileID: 1291580890895649287} + - {fileID: 2377736507111905412} + m_Father: {fileID: 5388330205210097294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3372919389234347908 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2021,18 +3277,49 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0d2d3d7643d84524b8841fcf62193a04, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::BobberBuoyancy - waterLevel: 0 - waterFlow: {x: 0, y: 0, z: 0} - bobberHeight: 0.18 - maxBuoyancy: 15 - buoyancyMultiplier: 1 - waterDrag: 0.8 - waterAngularDrag: 0.4 - verticalDamping: 4 - uprightStrength: 8 - uprightDamping: 1.2 - layDownThreshold: 0.15 - layDownUprightMultiplier: 0.2 +--- !u!4 &3430072966807144692 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 846873439756317439} + 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: 4652288250947343381} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3520625832899209208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8263689906767965056} + - component: {fileID: 629080170150445082} + - component: {fileID: 9173552885476046394} + - component: {fileID: 2358608343594615569} + - component: {fileID: 5379033684082313598} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!222 &3541379730973745331 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4066733549998169382} + m_CullTransparentMesh: 1 --- !u!114 &3802146767125466631 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2045,6 +3332,656 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5625b86b9e4b4482b82d83b962d0c873, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::RodLine +--- !u!33 &3812076863812997546 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8703167026404688510} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &3951967027910327458 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1294943038411644326} + m_Modifications: + - target: {fileID: 2452750316707852747, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3} + propertyPath: m_Name + value: Camera + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3} + propertyPath: m_LocalPosition.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3} + propertyPath: m_LocalPosition.z + value: -21 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9659258 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3} + propertyPath: m_LocalRotation.x + value: 0.2588191 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2452750316707852748, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3} +--- !u!1 &4066733549998169382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1118969678120638474} + - component: {fileID: 3541379730973745331} + - component: {fileID: 1087699467470203968} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4118026071495824856 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6871473421737383571} + 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: 4262266657851529727} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4206591282465003479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13741015225074637} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12fa5fcd0e5ac436b8581c4441a2683e, type: 3} + m_Name: + m_EditorClassIdentifier: + _Version: 0 + _Clip: 0 + _Material: {fileID: 0} + _BelowSurfaceMaterial: {fileID: 0} + _VolumeMaterial: {fileID: 0} +--- !u!224 &4262266657851529727 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549296833198396159} + 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: 4118026071495824856} + m_Father: {fileID: 6459342237427658402} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4306269259815537797 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8737220161078195139} + m_CullTransparentMesh: 1 +--- !u!222 &4334316862751883177 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2090048868787617803} + m_CullTransparentMesh: 1 +--- !u!114 &4337865502211096925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6374285101834327718} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 0.6} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 120 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: No Supported +--- !u!222 &4470951145310981415 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6374285101834327718} + m_CullTransparentMesh: 1 +--- !u!114 &4482564581663768649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 846873439756317439} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88bb6e05d83b64105a4d8cbd478f5916, type: 3} + m_Name: + m_EditorClassIdentifier: + _Mode: 5 + _Weight: 1 + _Queue: 0 + _Blend: 1 + _FeatherWidth: 0.1 + _FollowHorizontalWaveMotion: 0 + _Data: + rid: -2 + _DrawBounds: 0 + _Spectrum: {fileID: 11400000, guid: e13a1902b10e34e9fb08e1d09e39b5d4, type: 2} + _EvaluateSpectrumAtRunTimeEveryFrame: 0 + _RespectShallowWaterAttenuation: 1 + _SeaLevelOnly: 0 + _OverrideGlobalWindDirection: 1 + _WaveDirectionHeadingAngle: 0 + _OverrideGlobalWindSpeed: 0 + _WindSpeed: 20 + _Resolution: 32 + _IncludeInDropDetailHeightBasedOnWaves: 0 + _DrawSlicesInEditor: 0 + _AlphaSource: 0 + _OverrideGlobalWindTurbulence: 1 + _WindTurbulence: 0.35 + _WindAlignment: 0 + _TimeLoopLength: Infinity + _OverrideCulling: 0 + _MaximumVerticalDisplacement: 10 + _MaximumHorizontalDisplacement: 15 + _EnableBakedCollision: 0 + _TimeResolution: 4 + _SmallestWavelengthRequired: 2 + _BakedTimeLoopLength: 32 + _Version: 3 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } +--- !u!224 &4485081553893766294 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813745404044158782} + 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: 5503826569600139074} + m_Father: {fileID: 8263689906767965056} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!4 &4652288250947343381 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9157164589531290079} + 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: 3430072966807144692} + m_Father: {fileID: 5388330205210097294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &4903999546382904164 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1294943038411644326} + m_Modifications: + - target: {fileID: 6079220456006713144, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3} + propertyPath: m_Name + value: PostProcessing + objectReference: {fileID: 0} + - target: {fileID: 9013060131419009103, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9013060131419009103, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9013060131419009103, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9013060131419009103, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9013060131419009103, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9013060131419009103, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9013060131419009103, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9013060131419009103, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9013060131419009103, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9013060131419009103, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3} +--- !u!224 &5096569463460343103 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2575899344989503316} + 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: 5505697979763985157} + - {fileID: 6378093526646979720} + m_Father: {fileID: 8263689906767965056} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5204046975801588350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1065788238234039155} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!114 &5314238040867713527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6279800245644900979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 0 + m_TargetGraphic: {fileID: 2621863687419783078} + m_FillRect: {fileID: 1118969678120638474} + m_HandleRect: {fileID: 4118026071495824856} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 5 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &5379033684082313598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3520625832899209208} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a8eca7a783ef84759a4e965c9d6d8827, type: 3} + m_Name: + m_EditorClassIdentifier: + _Version: 0 + _ExecuteUpdateEvery: 0 + _StopExecutingUpdateAfter: Infinity + _OnEnable: + m_PersistentCalls: + m_Calls: [] + _OnDisable: + m_PersistentCalls: + m_Calls: [] + _OnUpdate: + m_PersistentCalls: + m_Calls: [] + _OnLegacyRenderPipeline: + m_PersistentCalls: + m_Calls: [] + _OnHighDefinitionPipeline: + m_PersistentCalls: + m_Calls: [] + _OnUniversalRenderPipeline: + m_PersistentCalls: + m_Calls: [] +--- !u!4 &5388330205210097294 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2564289860215701798} + 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: 7195797433903099932} + - {fileID: 4652288250947343381} + - {fileID: 3347216226615520232} + - {fileID: 8263689906767965056} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &5499094441789200052 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7195797433903099932} + m_Modifications: + - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_Name + value: Examples_FloatingBox + objectReference: {fileID: 0} + - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7065213192571102027, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8337144158012529292, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: _Debug._DrawQueries + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalPosition.x + value: 1.931 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} +--- !u!224 &5503826569600139074 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6374285101834327718} + 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: 4485081553893766294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -120, y: 0} + m_SizeDelta: {x: 300, y: 150} + m_Pivot: {x: 1, y: 1} +--- !u!224 &5505697979763985157 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6260237052217873599} + 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: 5096569463460343103} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -120, y: 0} + m_SizeDelta: {x: 300, y: 150} + m_Pivot: {x: 1, y: 1} +--- !u!1 &5619231331865316359 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2256579932936496278} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!33 &5777952278598528620 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13741015225074637} + m_Mesh: {fileID: 289301614986012343, guid: 9c3d81a71669f4dc0a6539b488f2c5c0, type: 3} +--- !u!114 &5789121095946249115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718630768303000296} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.6} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 80 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: Floating Objects +--- !u!222 &5893794529913785282 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1065788238234039155} + m_CullTransparentMesh: 1 --- !u!114 &6135364979465448005 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2059,7 +3996,309 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::NBF.BobberController _rbody: {fileID: 8094040829892155629} joint: {fileID: 8264424693587136966} - _buoyancy: {fileID: 0} +--- !u!1 &6254405495442382258 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3347216226615520232} + - component: {fileID: 6886325419173247728} + m_Layer: 0 + m_Name: Rig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &6260237052217873599 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5505697979763985157} + - component: {fileID: 2315375321412784839} + - component: {fileID: 8892033575196621664} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &6279800245644900979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6459342237427658402} + - component: {fileID: 5314238040867713527} + m_Layer: 5 + m_Name: Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &6374285101834327718 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5503826569600139074} + - component: {fileID: 4470951145310981415} + - component: {fileID: 4337865502211096925} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6378093526646979720 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1065788238234039155} + 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: 8955599026941321190} + m_Father: {fileID: 5096569463460343103} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -40, y: -40} + m_SizeDelta: {x: 70, y: 70} + m_Pivot: {x: 1, y: 1} +--- !u!114 &6451968783914721810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2090048868787617803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8039216, g: 0.5176471, b: 1, a: 0.6} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!224 &6459342237427658402 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6279800245644900979} + 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: 8905902493211259626} + - {fileID: 2256579932936496278} + - {fileID: 4262266657851529727} + m_Father: {fileID: 8263689906767965056} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 25} + m_Pivot: {x: 0.5, y: 0.25} +--- !u!1 &6871473421737383571 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4118026071495824856} + - component: {fileID: 7490067230206654995} + - component: {fileID: 2621863687419783078} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &6886325419173247728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6254405495442382258} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f069d1ec9fe154d3ba75ff75ed08e5b9, type: 3} + m_Name: + m_EditorClassIdentifier: + _Version: 0 + _ResetOnDisable: 1 + _IsLocal: 0 + _Velocity: {x: -5, y: 0, z: 0} + _AngularVelocity: {x: 0, y: 0, z: 0} +--- !u!1 &7126023296560485276 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2377736507111905412} + m_Layer: 0 + m_Name: Viewpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7195797433903099932 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3105970826351227058} + 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: 844322798} + - {fileID: 1348802136} + - {fileID: 510414306652611078} + - {fileID: 1948332548} + - {fileID: 1866024594} + - {fileID: 1529912228} + m_Father: {fileID: 5388330205210097294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &7347139586361227608 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7195797433903099932} + m_Modifications: + - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_Name + value: Examples_FloatingBox (3) + objectReference: {fileID: 0} + - target: {fileID: 875385380025743593, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7065213192571102027, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalPosition.y + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} +--- !u!1 &7391080619033618174 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1294943038411644326} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!222 &7490067230206654995 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6871473421737383571} + m_CullTransparentMesh: 1 --- !u!114 &7647511515837834160 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2159,6 +4398,25 @@ Transform: - {fileID: 4046714554611455} m_Father: {fileID: 8114378222086924161} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &8110689384494340643 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718630768303000296} + 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: 8263689906767965056} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 160} + m_Pivot: {x: 0.5, y: 0} --- !u!1 &8111135382106896842 GameObject: m_ObjectHideFlags: 0 @@ -2210,6 +4468,7 @@ GameObject: - component: {fileID: 8264424693587136966} - component: {fileID: 6135364979465448005} - component: {fileID: 8264424693587136967} + - component: {fileID: 8264424693587136968} m_Layer: 16 m_Name: Float m_TagString: Untagged @@ -2575,6 +4834,29 @@ SphereCollider: serializedVersion: 3 m_Radius: 0.003 m_Center: {x: 0, y: -0.0015, z: 0} +--- !u!224 &8263689906767965056 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3520625832899209208} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6459342237427658402} + - {fileID: 8110689384494340643} + - {fileID: 5096569463460343103} + - {fileID: 4485081553893766294} + m_Father: {fileID: 5388330205210097294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!153 &8264424693587136966 ConfigurableJoint: m_ObjectHideFlags: 0 @@ -2684,25 +4966,23 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8112599368562234729} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dd1aa9f0de8b435448c6893ecc60d021, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Buoyancy - waterLevel: 0 - waterAvailable: 1 - includeDeformation: 1 - sphereRadiusApproximation: 0.1 - waveForceMultiplier: 0.01 - currentSpeedMultiplier: 0.01 - dragMultiplier: 1 - defaultRigidbodyDrag: 5 - underwaterRigidbodyAngularDrag: 5 - overwaterRigidbodyAngularDrag: 1 - surfaceTensionDamping: 10 - applyForceWithRandomOffset: 0 - waterHeightOffset: 0 - drawDebug: 0 +--- !u!114 &8264424693587136968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8112599368562234729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 423a6cd563fdc3045830dd7c6f9d8209, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::StableFloatBuoyancy --- !u!153 &8264839114692736908 ConfigurableJoint: m_ObjectHideFlags: 0 @@ -2915,6 +5195,165 @@ LineRenderer: m_UseWorldSpace: 1 m_Loop: 0 m_ApplyActiveColorSpace: 1 +--- !u!1 &8703167026404688510 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 510414306652611078} + - component: {fileID: 3812076863812997546} + - component: {fileID: 1091447231717862214} + - component: {fileID: 737882883271643569} + - component: {fileID: 8806832727679333985} + - component: {fileID: 8806832727679333986} + - component: {fileID: 1652416334554012124} + m_Layer: 0 + m_Name: Examples_FloatingBox (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!1 &8737220161078195139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8905902493211259626} + - component: {fileID: 4306269259815537797} + - component: {fileID: 3314111838324823321} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!65 &8806832727679333985 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8703167026404688510} + 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: 3 + m_Size: {x: 0.9999999, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &8806832727679333986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8703167026404688510} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c103db8c4b014d87845103a400b1ace5, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::NBF.BobberFloating + _water: {fileID: 2531380344179187550} + _RigidBody: {fileID: 737882883271643569} + _Layer: 0 + _BuoyancyForceStrength: 10 + _BuoyancyTorqueStrength: 8 + _MaximumBuoyancyForce: 100 + _CenterToBottomOffset: -1 + _AccelerateDownhill: 0 + _Drag: {x: 2, y: 3, z: 1} + _AngularDrag: 0.2 + _ForceHeightOffset: 0 + _ObjectWidth: 3 + _Debug: + _DrawQueries: 1 +--- !u!114 &8892033575196621664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6260237052217873599} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8026813, g: 0.5157232, b: 1, a: 0.6} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 120 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: Preview +--- !u!224 &8905902493211259626 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8737220161078195139} + 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: 6459342237427658402} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &8955599026941321190 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2090048868787617803} + 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: 6378093526646979720} + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!120 &9030209593537121931 LineRenderer: serializedVersion: 2 @@ -3025,6 +5464,46 @@ LineRenderer: m_UseWorldSpace: 1 m_Loop: 0 m_ApplyActiveColorSpace: 1 +--- !u!1 &9157164589531290079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4652288250947343381} + - component: {fileID: 2531380344179187550} + m_Layer: 0 + m_Name: Water + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &9173552885476046394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3520625832899209208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1600, y: 1200} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -3032,7 +5511,8 @@ SceneRoots: - {fileID: 961739753} - {fileID: 203844589} - {fileID: 3065509872725565573} - - {fileID: 844322798} - {fileID: 8114378222086924161} - {fileID: 1518432889} - {fileID: 909052972} + - {fileID: 668361904} + - {fileID: 5388330205210097294} diff --git a/Assets/Scripts/BobberBuoyancy.cs b/Assets/Scripts/BobberBuoyancy.cs deleted file mode 100644 index dac088bce..000000000 --- a/Assets/Scripts/BobberBuoyancy.cs +++ /dev/null @@ -1,123 +0,0 @@ -using UnityEngine; - -[RequireComponent(typeof(Rigidbody))] -public class BobberBuoyancy : MonoBehaviour -{ - [Header("Water")] - public float waterLevel = 0f; // 水面是 0 - public Vector3 waterFlow = Vector3.zero; - - [Header("Bobber Size (origin at bottom)")] - public float bobberHeight = 0.18f; // 浮漂总高度（底部原点 → 顶部） - - [Header("Buoyancy")] - public float maxBuoyancy = 12f; // 完全浸没浮力 - public float buoyancyMultiplier = 1.0f; - public float waterDrag = 0.7f; - public float waterAngularDrag = 0.4f; - - [Header("Vertical Damping（控制“慢慢上浮”，避免弹跳）")] - public float verticalDamping = 4.0f; // 数值越大，上浮越慢、越不弹 - - [Header("Upright")] - public float uprightStrength = 8f; // 站漂恢复力 - public float uprightDamping = 1.2f; - - [Header("Lay Down (躺漂)")] - public float layDownThreshold = 0.15f; // 低于 15% 浸没 → 转入躺漂模式 - public float layDownUprightMultiplier = 0.2f; // 躺漂时保留多少站立力度（越小越“翘头”） - - private Rigidbody rb; - - private void Awake() - { - rb = GetComponent(); - rb.useGravity = true; - - // 重心稍微靠上，配合 AddForceAtPosition，才能让“底在水里、头上翘” - rb.centerOfMass = new Vector3(0, bobberHeight * 0.4f, 0); - } - - private void FixedUpdate() - { - ApplyBuoyancy(); - ApplyFlowForce(); - ApplyOrientationControl(); - } - - void ApplyBuoyancy() - { - float bottom = rb.position.y; // 原点就是最底部 - float depth = waterLevel - bottom; // 浸入深度 = 水面 - 底部 - - if (depth <= 0f) return; // 完全在水面上方，无浮力 - - // 当前浸没比例 - float submersionRatio = Mathf.Clamp01(depth / bobberHeight); - - // 基础浮力（和你之前一致） - float baseForce = maxBuoyancy * submersionRatio * buoyancyMultiplier; - - // ⭐ 竖直速度（用你原来习惯的 linearVelocity） - float vy = rb.linearVelocity.y; - - // ⭐ 阻尼项：速度越快，反向力越大 - // 下沉很快 → 给一个向上的阻尼（减缓下沉） - // 向上很快 → 给一个向下的阻尼（防止弹出水面） - float damping = -vy * verticalDamping; - - // 总的向上力：基础浮力 + 阻尼修正 - float totalUpForce = baseForce + damping; - - // 物理上浮力不能把它“往下按”，所以最少为 0 - if (totalUpForce < 0f) totalUpForce = 0f; - - // ⭐ 浮力作用点 = 浸没体积中心（不动，保持你之前的设计） - float clampedDepth = Mathf.Clamp(depth, 0, bobberHeight); - float centerY = bottom + clampedDepth * 0.5f; - Vector3 buoyancyPoint = new Vector3(rb.position.x, centerY, rb.position.z); - - rb.AddForceAtPosition(Vector3.up * totalUpForce, buoyancyPoint, ForceMode.Acceleration); - - // 水中阻力（保留原逻辑） - rb.AddForce(-rb.linearVelocity * waterDrag, ForceMode.Acceleration); - rb.AddTorque(-rb.angularVelocity * waterAngularDrag, ForceMode.Acceleration); - } - - void ApplyFlowForce() - { - if (waterFlow.sqrMagnitude <= 0.0001f) return; - rb.AddForce((waterFlow - rb.linearVelocity) * 0.3f, ForceMode.Acceleration); - } - - void ApplyOrientationControl() - { - float bottom = rb.position.y; - float depth = waterLevel - bottom; - float submersionRatio = Mathf.Clamp01(depth / bobberHeight); - - Vector3 up = transform.up; - Vector3 worldUp = Vector3.up; - - if (submersionRatio > layDownThreshold) - { - // 深浸 → 正常站漂 - Vector3 uprightTorqueVec = - Vector3.Cross(up, worldUp) * uprightStrength - - rb.angularVelocity * uprightDamping; - - rb.AddTorque(uprightTorqueVec, ForceMode.Acceleration); - } - else - { - // 浅浸 → “躺漂”，只保留少量站立力，让它自然斜、头上翘 - float reduced = uprightStrength * layDownUprightMultiplier; - - Vector3 uprightTorqueVec = - Vector3.Cross(up, worldUp) * reduced - - rb.angularVelocity * uprightDamping; - - rb.AddTorque(uprightTorqueVec, ForceMode.Acceleration); - } - } -} diff --git a/Assets/Scripts/BobberBuoyancy.cs.meta b/Assets/Scripts/BobberBuoyancy.cs.meta deleted file mode 100644 index 5fe662679..000000000 --- a/Assets/Scripts/BobberBuoyancy.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 0d2d3d7643d84524b8841fcf62193a04 -timeCreated: 1764424969 \ No newline at end of file diff --git a/Assets/Scripts/Fishing/BobberController.cs b/Assets/Scripts/Fishing/BobberController.cs index f693c5902..d5b7c6e4b 100644 --- a/Assets/Scripts/Fishing/BobberController.cs +++ b/Assets/Scripts/Fishing/BobberController.cs @@ -7,7 +7,7 @@ namespace NBF [SerializeField] private Rigidbody _rbody; [SerializeField] private ConfigurableJoint joint; - [SerializeField] private Buoyancy _buoyancy; + // [SerializeField] private Buoyancy _buoyancy; public Rigidbody rbody => _rbody; public void SetJoint(Rigidbody rb) @@ -27,7 +27,7 @@ namespace NBF public void SetDetectCollisionEnabled(bool en) { _rbody.detectCollisions = en; - _buoyancy.EnablePhysics(en); + // _buoyancy.EnablePhysics(en); } public void SetVelocity(Vector3 velocity) diff --git a/Assets/Scripts/FloatBobberController.cs b/Assets/Scripts/FloatBobberController.cs deleted file mode 100644 index 3c93e240b..000000000 --- a/Assets/Scripts/FloatBobberController.cs +++ /dev/null @@ -1,105 +0,0 @@ -using UnityEngine; - -public class FloatBobberController : MonoBehaviour -{ - [SerializeField] private Rigidbody _rigidbody; - [Header("水属性")] public float waterLevel = 0f; - - [Header("浮漂最大浮力")] public float bobberVolume = 30f; // 浮漂最大浮力 (cm³) - - public float bobberHeight = 0.25f; // 浮漂长度，用来决定躺漂角度 - - [Header("配件重量")] public float sinkerWeight = 2f; - public float baitWeight = 0.5f; - public float hookWeight = 0.2f; - - [Header("Behaviour")] public float fallSpeed = 8f; - public float riseSpeed = 3f; - // public float smoothDamping = 8f; // 插值平滑 - - [Header("Noise")] public float noiseAmp = 0.015f; - public float noiseFreq = 1.5f; - - float impulseForce = 0f; - float impulseDecay = 4f; - - void FixedUpdate() - { - SimulateBobber(); - } - - void SimulateBobber() - { - if (!_rigidbody.isKinematic) return; - float totalDownwardWeight = sinkerWeight + baitWeight + hookWeight; - - float maxBuoyancy = bobberVolume; // 最大浮力 = 体积 - float netBuoyancy = maxBuoyancy - totalDownwardWeight; - - float targetY; - - // ------------------------- - // 1. 判断浮漂应该沉多少（吃水深度） - // ------------------------- - if (netBuoyancy > 0) - { - float buoyPercent = Mathf.Clamp01(netBuoyancy / maxBuoyancy); - float rise = buoyPercent * 0.1f; // 浮漂露出水面的高度 - - targetY = waterLevel + rise; - } - else - { - // 净浮力为负 → 说明浮漂整体被拉下，沉入水中 - float sinkDistance = Mathf.Abs(netBuoyancy) * 0.03f; - targetY = waterLevel - sinkDistance; - } - - targetY += Mathf.Sin(Time.time * noiseFreq) * noiseAmp; // 微扰模拟波浪 - - // 顿口/顶漂力 - if (impulseForce != 0f) - { - targetY += impulseForce * Time.deltaTime; - impulseForce = Mathf.Lerp(impulseForce, 0, Time.deltaTime * impulseDecay); - } - - // ----------------------------- - // ③ 上浮 / 下沉差速 - // ----------------------------- - float y = transform.position.y; - float diff = targetY - y; - - if (diff > 0) // 上浮 - y += diff * Time.deltaTime * riseSpeed; - else - y += diff * Time.deltaTime * fallSpeed; - - transform.position = new Vector3(transform.position.x, y, transform.position.z); - } - - - // ---------------------------------------- - // 外部控制接口 - // ---------------------------------------- - - public void TriggerDownPulse(float s = 0.8f) - { - impulseForce -= Mathf.Abs(s); - } - - public void TriggerUpPulse(float s = 0.8f) - { - impulseForce += Mathf.Abs(s); - } - - public void AddFishPull(float v) - { - sinkerWeight += v; - } - - public void ReleaseFishPull(float v) - { - sinkerWeight -= v; - } -} \ No newline at end of file diff --git a/Assets/Scripts/FloatBobberController.cs.meta b/Assets/Scripts/FloatBobberController.cs.meta deleted file mode 100644 index cf5cda6d5..000000000 --- a/Assets/Scripts/FloatBobberController.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: c0e5ba2adc224f279b89a0adf2bd97a9 -timeCreated: 1764168783 \ No newline at end of file diff --git a/Assets/Scripts/FloatBobberControllerBack.cs b/Assets/Scripts/FloatBobberControllerBack.cs deleted file mode 100644 index ab78b3c23..000000000 --- a/Assets/Scripts/FloatBobberControllerBack.cs +++ /dev/null @@ -1,298 +0,0 @@ -// using UnityEngine; -// -// public class FloatBobberController : MonoBehaviour -// { -// [Header("Water System")] -// public bool useKWS = false; -// public LayerMask waterLayer; -// public float waterRaycastHeight = 10f; -// -// [Header("Spring Physics")] -// public float stiffness = 0.35f; // 弹性力度 -// public float damping = 0.82f; // 阻尼 -// public float noiseStrength = 0.02f; // 自然颤动 -// -// [Header("Tilt")] -// public Transform lineAttachPoint; // 钓线连接点（让漂倾斜） -// public float tiltStrength = 6f; -// -// private float targetOffsetY = 0f; -// private float offsetY = 0f; -// private float velocity = 0f; -// -// private float baseWaterHeight = 0f; -// -// // 随机噪声 seed -// private float noiseSeed; -// -// void Start() -// { -// noiseSeed = Random.value * 100f; -// } -// -// void Update() -// { -// UpdateWaterHeight(); -// UpdateSpringPhysics(); -// UpdateTilt(); -// ApplyFinalPosition(); -// } -// -// // ----------------------------------------------------------- -// // 1. 水面高度获取 (支持 KWS 或 Raycast) -// // ----------------------------------------------------------- -// void UpdateWaterHeight() -// { -// if (useKWS) -// { -// // ⭐ 你自己替换为 KWS 的 API -// baseWaterHeight = SampleWaterHeight_KWS(); -// } -// else -// { -// // 简单射线获取水面高度 -// Vector3 start = transform.position + Vector3.up * waterRaycastHeight; -// if (Physics.Raycast(start, Vector3.down, out RaycastHit hit, 50f, waterLayer)) -// { -// baseWaterHeight = hit.point.y; -// } -// } -// } -// -// float SampleWaterHeight_KWS() -// { -// // ❗你需要替换成你的 KWS 接口，比如： -// // return KWS.GetWaterHeight(transform.position); -// return transform.position.y; // 临时占位 -// } -// -// // ----------------------------------------------------------- -// // 2. 弹簧-阻尼伪物理 (核心) -// // ----------------------------------------------------------- -// void UpdateSpringPhysics() -// { -// // 弹簧吸附：朝向 targetOffsetY -// velocity += (targetOffsetY - offsetY) * stiffness; -// -// // 阻尼 -// velocity *= damping; -// -// // 移动 -// offsetY += velocity; -// -// // 自然轻微噪声 -// float noise = (Mathf.PerlinNoise(Time.time * 1.2f, noiseSeed) - 0.5f) * noiseStrength; -// offsetY += noise; -// } -// -// // ----------------------------------------------------------- -// // 3. 漂倾斜（依据钓线方向） -// // ----------------------------------------------------------- -// void UpdateTilt() -// { -// if (lineAttachPoint == null) return; -// -// Vector3 dir = lineAttachPoint.position - transform.position; -// if (dir.magnitude > 0.001f) -// { -// Quaternion targetRot = Quaternion.LookRotation(dir, Vector3.up); -// transform.rotation = Quaternion.Slerp(transform.rotation, targetRot, Time.deltaTime * tiltStrength); -// } -// } -// -// // ----------------------------------------------------------- -// // 4. 应用最终位置 -// // ----------------------------------------------------------- -// void ApplyFinalPosition() -// { -// Vector3 pos = transform.position; -// pos.y = baseWaterHeight + offsetY; -// transform.position = pos; -// } -// -// // ============================ 触发动作 API ============================ -// -// /// 小顿口：轻微上升 0.5～1.5 目 -// public void TriggerSmallDonk() -// { -// targetOffsetY = Random.Range(0.3f, 0.9f); -// stiffness = 0.40f; -// damping = 0.82f; -// } -// -// /// 顿口：快速上升，并轻微过冲 -// public void TriggerDonk() -// { -// targetOffsetY = Random.Range(1.0f, 1.8f); -// stiffness = 0.55f; -// damping = 0.78f; -// } -// -// /// 顶漂：慢慢上浮几目 -// public void TriggerTopLift() -// { -// targetOffsetY = Random.Range(1.0f, 3.0f); -// stiffness = 0.18f; -// damping = 0.90f; -// } -// -// /// 黑漂：快速下沉，并保持 -// public void TriggerBlackSink() -// { -// targetOffsetY = Random.Range(-3.0f, -6.0f); -// stiffness = 0.45f; -// damping = 0.75f; -// } -// -// /// 点动：轻微上下动 -// public void TriggerNibble() -// { -// targetOffsetY = Mathf.Sin(Time.time * Random.Range(6f, 12f)) * 0.1f; -// stiffness = 0.25f; -// damping = 0.88f; -// } -// -// /// 走漂（水层有流料或者风），水平漂移你用其他脚本控制即可 -// public void TriggerDrift(float amount) -// { -// targetOffsetY = 0f; -// offsetY = 0f; -// } -// -// /// 恢复到 Idle 状态 -// public void ResetIdle() -// { -// targetOffsetY = 0f; -// stiffness = 0.35f; -// damping = 0.85f; -// } -// } - - - -// -// -// using UnityEngine; -// -// public class FloatBobberControllerPro : MonoBehaviour -// { -// [Header("Water Settings")] public float waterLevel = 0f; // 水面高度世界坐标 -// public float waterDensity = 1f; // 水密度（默认1即可） -// -// [Header("Bobber Physical Settings")] public float bobberVolume = 30f; // 浮漂最大浮力（cm³） -// public float bobberMass = 1f; // 浮漂自身重量（克） -// -// [Header("Tackle Weight Settings")] public float sinkerWeight = 2f; // 铅坠重量（克） -// public float baitWeight = 0.5f; // 鱼饵重量（克） -// public float hookWeight = 0.2f; // 鱼钩重量（克） -// -// [Header("Physics Behaviour")] public float riseSpeed = 1.2f; // 浮漂上浮速度 -// public float fallSpeed = 1.5f; // 浮漂下沉速度 -// public float smoothDamping = 8f; // 插值平滑 -// -// [Header("Random Water Movements")] public float noiseAmplitude = 0.02f; // 微扰幅度 -// public float noiseFrequency = 1f; // 微扰频率 -// -// float velocity = 0f; -// float timeNoise = 0f; -// -// // 用于顿口、顶漂脉冲 -// float impulseForce = 0f; -// float impulseDecay = 4f; -// -// void Update() -// { -// SimulateBobberPhysics(); -// } -// -// void SimulateBobberPhysics() -// { -// float totalDownwardWeight = bobberMass + sinkerWeight + baitWeight + hookWeight; -// -// float maxBuoyancy = bobberVolume; // 最大浮力 = 体积 -// float netBuoyancy = maxBuoyancy - totalDownwardWeight; -// -// float targetY; -// -// // ------------------------- -// // 1. 判断浮漂应该沉多少（吃水深度） -// // ------------------------- -// if (netBuoyancy > 0) -// { -// float buoyPercent = Mathf.Clamp01(netBuoyancy / maxBuoyancy); -// float rise = buoyPercent * 0.1f; // 浮漂露出水面的高度 -// -// targetY = waterLevel + rise; -// -// targetY += Mathf.Sin(Time.time * noiseFrequency) * noiseAmplitude; // 微扰模拟波浪 -// } -// else -// { -// // 净浮力为负 → 说明浮漂整体被拉下，沉入水中 -// float sinkDistance = Mathf.Abs(netBuoyancy) * 0.03f; -// targetY = waterLevel - sinkDistance; -// } -// -// // ------------------------- -// // 2. 顶漂 & 顿口 脉冲 -// // ------------------------- -// if (impulseForce != 0f) -// { -// targetY += impulseForce * Time.deltaTime; -// impulseForce = Mathf.Lerp(impulseForce, 0f, Time.deltaTime * impulseDecay); -// } -// -// // ------------------------- -// // 3. 平滑过渡到目标位置（核心） -// // ------------------------- -// float currentY = transform.position.y; -// -// float newY = Mathf.Lerp( -// currentY, -// targetY, -// Time.deltaTime * smoothDamping -// ); -// -// transform.position = new Vector3( -// transform.position.x, -// newY, -// transform.position.z -// ); -// } -// -// // =========================== -// // 外部函数：模拟钓鱼动作 -// // =========================== -// -// /// -// /// 顿口：浮漂瞬间被向下拉一下（鱼轻轻吸饵） -// /// -// public void TriggerDownPulse(float strength = 0.8f) -// { -// impulseForce -= Mathf.Abs(strength); -// } -// -// /// -// /// 顶漂：浮漂瞬间向上冒一下（鱼儿托饵） -// /// -// public void TriggerUpPulse(float strength = 0.8f) -// { -// impulseForce += Mathf.Abs(strength); -// } -// -// /// -// /// 模拟鱼儿吃饵 → 增加下拉力 -// /// -// public void AddFishPull(float value) -// { -// sinkerWeight += value; -// } -// -// /// -// /// 模拟脱钩 → 拉力消失 -// /// -// public void RemoveFishPull(float value) -// { -// sinkerWeight -= value; -// } -// } \ No newline at end of file diff --git a/Assets/Scripts/FloatBobberControllerBack.cs.meta b/Assets/Scripts/FloatBobberControllerBack.cs.meta deleted file mode 100644 index 52a6a62e5..000000000 --- a/Assets/Scripts/FloatBobberControllerBack.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: aae942875a204e83b90e9713146caded -timeCreated: 1763993650 \ No newline at end of file diff --git a/Assets/Scripts/FloatBobberControllerPro.cs b/Assets/Scripts/FloatBobberControllerPro.cs deleted file mode 100644 index cf7d68c6f..000000000 --- a/Assets/Scripts/FloatBobberControllerPro.cs +++ /dev/null @@ -1,169 +0,0 @@ -using UnityEngine; - -public class FloatBobberControllerPro : MonoBehaviour -{ - [Header("Water")] - public float waterLevel = 0f; - - [Header("Bobber Physical")] - public float bobberVolume = 30f; // 浮漂最大浮力 (cm³) - public float bobberMass = 1f; // 浮漂自重 (g) - public float bobberHeight = 0.25f; // 浮漂长度，用来决定躺漂角度 - - [Header("Tackle Weight")] - public float sinkerWeight = 2f; - public float baitWeight = 0.5f; - public float hookWeight = 0.2f; - - [Header("Behaviour")] - public float fallSpeed = 8f; - public float riseSpeed = 3f; - public float angleLaySpeed = 2f; // 躺漂速度 - public float uprightSpeed = 2f; // 立漂速度 - public float bottomDrag = 1.2f; // 铅坠触底阻力（越大越难被浮漂拉起） - - [Header("Angles")] - public float maxLayAngle = 75f; // 最大躺漂角度 - float currentAngle = 0f; - - [Header("Noise")] - public float noiseAmp = 0.015f; - public float noiseFreq = 1.5f; - - float impulseForce = 0f; - float impulseDecay = 4f; - - void Update() - { - SimulateBobber(); - } - - void SimulateBobber() - { - float totalWeight = bobberMass + sinkerWeight + baitWeight + hookWeight; - float netBuoyancy = bobberVolume - totalWeight; // 正 → 上浮；负 → 下拉 - - // ----------------------------- - // ① 计算浮漂底部 Y 的高度 - // ----------------------------- - float bobberBottomY = transform.position.y - bobberHeight * 0.5f; - float bottomY = waterLevel - 0.02f; // 水底高度（可替换真实地形） - - bool sinkerOnBottom = (bobberBottomY <= bottomY); - - // ----------------------------- - // ② 计算 targetY - // ----------------------------- - float targetY; - - if (!sinkerOnBottom) - { - // 铅坠悬浮 → 浮漂直立 - if (netBuoyancy > 0) - { - float rise = Mathf.Clamp01(netBuoyancy / bobberVolume) * 0.1f; - targetY = waterLevel + rise; - } - else - { - float sink = Mathf.Abs(netBuoyancy) * 0.02f; - targetY = waterLevel - sink; - } - } - else - { - // 铅坠触底 → 浮漂无法再被向下拉 - if (netBuoyancy > bottomDrag) - { - // 浮漂浮力足够将其立起来 - float rise = Mathf.Clamp01((netBuoyancy - bottomDrag) / bobberVolume) * 0.1f; - targetY = waterLevel + rise; // 轻轻立起 - } - else - { - // 浮漂浮力不足 → 躺漂 - targetY = waterLevel + 0.01f; // 漂身贴水 - } - } - - // 水波噪声 - targetY += Mathf.Sin(Time.time * noiseFreq) * noiseAmp; - - // 顿口/顶漂力 - if (impulseForce != 0f) - { - targetY += impulseForce * Time.deltaTime; - impulseForce = Mathf.Lerp(impulseForce, 0, Time.deltaTime * impulseDecay); - } - - // ----------------------------- - // ③ 上浮 / 下沉差速 - // ----------------------------- - float y = transform.position.y; - float diff = targetY - y; - - if (diff > 0) // 上浮 - y += diff * Time.deltaTime * riseSpeed; - else - y += diff * Time.deltaTime * fallSpeed; - - transform.position = new Vector3(transform.position.x, y, transform.position.z); - - // ----------------------------- - // ④ 浮漂角度控制 - // ----------------------------- - float targetAngle = 0f; - - if (sinkerOnBottom) - { - // 触底 → 判断是否能立漂 - if (netBuoyancy > bottomDrag) - { - targetAngle = 0f; // 立漂 - } - else - { - // 躺漂 - targetAngle = maxLayAngle; - } - } - else - { - // 铅坠在水中 → 漂直立 - targetAngle = 0f; - } - - // 平滑角度 - currentAngle = Mathf.Lerp( - currentAngle, - targetAngle, - Time.deltaTime * (targetAngle == 0 ? uprightSpeed : angleLaySpeed) - ); - - transform.rotation = Quaternion.Euler(currentAngle, 0, 0); - } - - // ---------------------------------------- - // 外部控制接口 - // ---------------------------------------- - - public void TriggerDownPulse(float s = 0.8f) - { - impulseForce -= Mathf.Abs(s); - } - - public void TriggerUpPulse(float s = 0.8f) - { - impulseForce += Mathf.Abs(s); - } - - public void AddFishPull(float v) - { - sinkerWeight += v; - } - - public void ReleaseFishPull(float v) - { - sinkerWeight -= v; - } -} diff --git a/Assets/Scripts/FloatBobberControllerPro.cs.meta b/Assets/Scripts/FloatBobberControllerPro.cs.meta deleted file mode 100644 index 8f5b04fc7..000000000 --- a/Assets/Scripts/FloatBobberControllerPro.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 59f0b74408dbbfe44aee75e1ddf784d3 \ No newline at end of file diff --git a/Assets/Scripts/FloatBobberControllerProV4.cs b/Assets/Scripts/FloatBobberControllerProV4.cs deleted file mode 100644 index e895c033c..000000000 --- a/Assets/Scripts/FloatBobberControllerProV4.cs +++ /dev/null @@ -1,206 +0,0 @@ -using UnityEngine; - -public enum BobberState -{ - LyingDown, // 躺漂 - RisingUp, // 起漂 - Standing, // 正常站立 - Bottom, // 挂底 - TopLift, // 顶漂 - DownPull, // 黑漂 - Nibble // 小顿口 -} - -public class FloatBobberControllerProV4 : MonoBehaviour -{ - [Header("Environment")] - public float waterLevel = 0f; - - [Header("Float Settings")] - public float floatLength = 0.20f; // 漂总长度 - public float buoyancyForce = 0.35f; // 浮力强度 - public float mass = 0.015f; // 重量 - public float tiltRecoverySpeed = 3f; // 漂恢复垂直速度 - public float maxTiltAngle = 60f; // 躺漂最大角度 - - [Header("Line Settings")] - public float lineTension = 0f; // 动态线张力（由鱼影响） - public float bottomDrag = 1.5f; // 铅坠触底时的阻力 - - [Header("State Machine")] - public BobberState state = BobberState.LyingDown; - - // internal vars - private float verticalSpeed = 0f; - private float angle = 60f; // 初始躺漂角度 - private float lastHeight; - private float deltaY; - - void Start() - { - lastHeight = transform.position.y; - state = BobberState.LyingDown; - } - - void Update() - { - deltaY = transform.position.y - lastHeight; - lastHeight = transform.position.y; - - ApplyPhysics(); - ProcessStateMachine(); - ApplyRotation(); - } - - // --------------------------------------------------------------------- - // 一切物理都由状态机控制 - // --------------------------------------------------------------------- - void ProcessStateMachine() - { - switch (state) - { - case BobberState.LyingDown: - LyingDownBehaviour(); - break; - - case BobberState.RisingUp: - RisingUpBehaviour(); - break; - - case BobberState.Standing: - StandingBehaviour(); - break; - - case BobberState.Bottom: - BottomBehaviour(); - break; - - case BobberState.TopLift: - TopLiftBehaviour(); - break; - - case BobberState.DownPull: - DownPullBehaviour(); - break; - - case BobberState.Nibble: - NibbleBehaviour(); - break; - } - - AutoTransition(); - } - - // --------------------------------------------------------------------- - // 【状态 → 行为】 - // --------------------------------------------------------------------- - - void LyingDownBehaviour() - { - // 浮漂处于平躺，几乎无浮力 - angle = Mathf.Lerp(angle, maxTiltAngle, Time.deltaTime * 1.5f); - - // 水面浮力很小 - verticalSpeed += (buoyancyForce * 0.1f - mass * 9.8f) * Time.deltaTime; - } - - void RisingUpBehaviour() - { - // 浮漂正在被浮力慢慢扶正 - angle = Mathf.Lerp(angle, 0, Time.deltaTime * (tiltRecoverySpeed * 0.7f)); - - // 浮力略加强 - verticalSpeed += (buoyancyForce * 0.5f) * Time.deltaTime; - } - - void StandingBehaviour() - { - // 完全立稳 - angle = Mathf.Lerp(angle, 0, Time.deltaTime * tiltRecoverySpeed); - - // 浮力与重力平衡，小幅波动 - verticalSpeed += Mathf.Sin(Time.time * 4f) * 0.001f; - } - - void BottomBehaviour() - { - // 铅坠或饵触底 → 浮漂立不起来 - angle = Mathf.Lerp(angle, 20f, Time.deltaTime * 2f); - - // 上浮被底部拖住 - verticalSpeed *= 0.6f; - } - - void TopLiftBehaviour() - { - // 顶漂 → 漂被往上托一点 - verticalSpeed += 0.02f; - } - - void DownPullBehaviour() - { - // 黑漂 → 往下猛拉 - verticalSpeed -= 0.05f; - } - - void NibbleBehaviour() - { - // 小顿口 → 轻微波动 - verticalSpeed += Mathf.Sin(Time.time * 20f) * 0.0015f; - } - - // --------------------------------------------------------------------- - // 状态自动切换 - // --------------------------------------------------------------------- - void AutoTransition() - { - // 1. 浮漂露出 40% 以上 → 起漂或站漂 - float headHeight = transform.position.y + floatLength; - - if (state == BobberState.LyingDown && headHeight > waterLevel - 0.02f) - state = BobberState.RisingUp; - - if (state == BobberState.RisingUp && angle < 12f) - state = BobberState.Standing; - - // 2. 挂底判定 - float tailHeight = transform.position.y - floatLength; - if (tailHeight < waterLevel - 0.03f) - state = BobberState.Bottom; - - // 3. 顶漂 - if (deltaY > 0.015f) - state = BobberState.TopLift; - - // 4. 黑漂 - if (deltaY < -0.02f) - state = BobberState.DownPull; - - // 5. 小顿口 - if (Mathf.Abs(deltaY) > 0.003f && Mathf.Abs(deltaY) < 0.015f) - state = BobberState.Nibble; - } - - // --------------------------------------------------------------------- - // 垂直物理 - // --------------------------------------------------------------------- - void ApplyPhysics() - { - float submerged = Mathf.Clamp01((waterLevel - transform.position.y) * 8f); - float upForce = buoyancyForce * submerged - mass * 9.8f; - - verticalSpeed += upForce * Time.deltaTime; - verticalSpeed = Mathf.Clamp(verticalSpeed, -0.2f, 0.2f); - - transform.position += new Vector3(0, verticalSpeed, 0); - } - - // --------------------------------------------------------------------- - // 倾斜角控制 - // --------------------------------------------------------------------- - void ApplyRotation() - { - Quaternion q = Quaternion.Euler(angle, 0, 0); - transform.rotation = Quaternion.Slerp(transform.rotation, q, Time.deltaTime * 8f); - } -} diff --git a/Assets/Scripts/FloatBobberControllerProV4.cs.meta b/Assets/Scripts/FloatBobberControllerProV4.cs.meta deleted file mode 100644 index 66be78d20..000000000 --- a/Assets/Scripts/FloatBobberControllerProV4.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 725d1d7ecc254c8a980d997ac7a9d5d3 -timeCreated: 1764166393 \ No newline at end of file diff --git a/Assets/Scripts/Test/BobberFloating.cs b/Assets/Scripts/Test/BobberFloating.cs new file mode 100644 index 000000000..678a7cb66 --- /dev/null +++ b/Assets/Scripts/Test/BobberFloating.cs @@ -0,0 +1,219 @@ +using UnityEngine; +using WaveHarmonic.Crest; + +namespace NBF +{ + public sealed class BobberFloating : MonoBehaviour + { + public WaterRenderer _water; + + [SerializeField] Rigidbody _RigidBody; + + [Tooltip("要瞄准哪一层水的碰撞层。")] [SerializeField] + CollisionLayer _Layer = CollisionLayer.AfterAnimatedWaves; + + [Header("浮力")] + [Header("力强度")] + [Tooltip("对于探测器而言，大致为 100 比 1 的质量与力的比例，以使质心保持在表面附近。对于“对齐法线”，默认值适用于具有默认刚体的默认球体。")] + [SerializeField] + float _BuoyancyForceStrength = 10f; + + [Header("扭矩强度")] [Tooltip("使船体方向与水的法线方向一致时所施加扭矩的大小。")] [SerializeField] + float _BuoyancyTorqueStrength = 8f; + + [Header("最大力矩")] [Tooltip("将浮力值固定在此数值上。\n\n适用于处理完全浸没的物体。")] [SerializeField] + float _MaximumBuoyancyForce = 100f; + + [Header("高度偏移")] [Tooltip("从变换中心到船体底部的高度偏移（如果存在）。\n\n默认值适用于默认球体。该值无需精确测量从中心到底部的距离。")] [SerializeField] + float _CenterToBottomOffset = -1f; + + [Tooltip("顺着波浪 “冲浪” 的近似流体动力学效果。")] [Range(0, 1)] [SerializeField] + float _AccelerateDownhill; + + + [Header("拖拽")] [Tooltip("在水中时使用拖拽功能。\n将此属性添加到刚体所声明的拖拽力上。")] [SerializeField] + Vector3 _Drag = new(2f, 3f, 1f); + + [Tooltip("在水中会产生旋转阻力。\n\n将此阻力添加到刚体上已声明的旋转阻力值之上。")] [SerializeField] + float _AngularDrag = 0.2f; + + [Tooltip("施加拉力的位置的垂直偏移量。")] [SerializeField] + float _ForceHeightOffset; + + + [Header("波响应")] [Tooltip("用于物理计算的物体宽度。\n\n此值越大，波响应的滤波效果和平滑程度就越高。如果无法对较大波长进行滤波，则应增加 LOD 级别。")] [SerializeField] + float _ObjectWidth = 3f; + + + // Debug + [Space(10)] [SerializeField] DebugFields _Debug = new(); + + [System.Serializable] + sealed class DebugFields + { + [SerializeField] internal bool _DrawQueries = false; + } + + internal const string k_FixedUpdateMarker = "Crest.FloatingObject.FixedUpdate"; + + static Unity.Profiling.ProfilerMarker s_FixedUpdateMarker = new(k_FixedUpdateMarker); + + /// + /// 这个物体的任何部分是否浸泡在水中？ + /// + public bool InWater { get; private set; } + + readonly SampleFlowHelper _SampleFlowHelper = new(); + + Vector3[] _QueryPoints; + Vector3[] _QueryResultDisplacements; + Vector3[] _QueryResultVelocities; + Vector3[] _QueryResultNormal; + + internal FloatingObjectProbe[] _Probe = new FloatingObjectProbe[] { new() { _Weight = 1f } }; + + + private void Start() + { + if (_RigidBody == null) TryGetComponent(out _RigidBody); + + var points = _Probe; + // Advanced 还需要为中心增设一个位置。 + var length = points.Length; + _QueryPoints = new Vector3[length]; + _QueryResultDisplacements = new Vector3[length]; + _QueryResultVelocities = new Vector3[length]; + _QueryResultNormal = new Vector3[length]; + } + + private void FixedUpdate() + { + s_FixedUpdateMarker.Begin(this); + + var points = _Probe; + + // 查询 + var collisions = _water.AnimatedWavesLod.Provider; + + // 更新查询点。 + for (var i = 0; i < points.Length; i++) + { + var point = points[i]; + _QueryPoints[i] = + transform.TransformPoint(point._Position + new Vector3(0, _RigidBody.centerOfMass.y, 0)); + } + + _QueryPoints[^1] = transform.position + new Vector3(0, _RigidBody.centerOfMass.y, 0); + + collisions.Query(GetHashCode(), _ObjectWidth, _QueryPoints, _QueryResultDisplacements, + _QueryResultNormal, _QueryResultVelocities, _Layer); + + + //我们可以将表面速度过滤为最近两帧中的较小值。 + //存在一种极端情况：当波长被开启 / 关闭时，会产生单帧速度尖峰—— + //因为此时水面确实会发生极快的运动。 + var surfaceVelocity = _QueryResultVelocities[^1]; + _SampleFlowHelper.Sample(transform.position, out var surfaceFlow, minimumLength: _ObjectWidth); + surfaceVelocity += new Vector3(surfaceFlow.x, 0, surfaceFlow.y); + + if (_Debug._DrawQueries) + { + Debug.DrawLine(transform.position + 5f * Vector3.up, + transform.position + 5f * Vector3.up + surfaceVelocity, new(1, 1, 1, 0.6f)); + } + + { + var height = _QueryResultDisplacements[0].y + _water.SeaLevel; + var bottomDepth = height - transform.position.y - _CenterToBottomOffset; + var normal = _QueryResultNormal[0]; + + if (_Debug._DrawQueries) + { + var surfPos = transform.position; + surfPos.y = height; + DebugUtility.DrawCross(Debug.DrawLine, surfPos, normal, 1f, Color.red); + } + + InWater = bottomDepth > 0f; + if (!InWater) + { + s_FixedUpdateMarker.End(); + return; + } + + var buoyancy = _BuoyancyForceStrength * bottomDepth * bottomDepth * bottomDepth * + -Physics.gravity.normalized; + if (_MaximumBuoyancyForce < Mathf.Infinity) + { + buoyancy = Vector3.ClampMagnitude(buoyancy, _MaximumBuoyancyForce); + } + + _RigidBody.AddForce(buoyancy, ForceMode.Acceleration); + + // 在水面上滑行的近似流体动力学 + if (_AccelerateDownhill > 0f) + { + _RigidBody.AddForce(_AccelerateDownhill * -Physics.gravity.y * new Vector3(normal.x, 0f, normal.z), + ForceMode.Acceleration); + } + + + // 朝向 + // 与水面垂直。默认使用一个垂直方向，但也可以使用单独的垂直方向。 + // 根据船的长度与宽度的比例。这会根据船只的不同而产生不同的旋转效果。 + // dimensions. + { + var normalLatitudinal = normal; + + if (_Debug._DrawQueries) + Debug.DrawLine(transform.position, transform.position + 5f * normalLatitudinal, Color.green); + + var torqueWidth = Vector3.Cross(transform.up, normalLatitudinal); + _RigidBody.AddTorque(torqueWidth * _BuoyancyTorqueStrength, ForceMode.Acceleration); + _RigidBody.AddTorque(-_AngularDrag * _RigidBody.angularVelocity); + } + } + + // 相对于水进行拖拽操作 + if (_Drag != Vector3.zero) + { + var velocityRelativeToWater = _RigidBody.linearVelocity - surfaceVelocity; + + var forcePosition = _RigidBody.worldCenterOfMass + _ForceHeightOffset * Vector3.up; + _RigidBody.AddForceAtPosition( + _Drag.x * Vector3.Dot(transform.right, -velocityRelativeToWater) * transform.right, forcePosition, + ForceMode.Acceleration); + _RigidBody.AddForceAtPosition(_Drag.y * Vector3.Dot(Vector3.up, -velocityRelativeToWater) * Vector3.up, + forcePosition, ForceMode.Acceleration); + _RigidBody.AddForceAtPosition( + _Drag.z * Vector3.Dot(transform.forward, -velocityRelativeToWater) * transform.forward, + forcePosition, ForceMode.Acceleration); + } + + s_FixedUpdateMarker.End(); + } + } + + static class DebugUtility + { + public delegate void DrawLine(Vector3 position, Vector3 up, Color color, float duration); + + public static void DrawCross(DrawLine draw, Vector3 position, float r, Color color, float duration = 0f) + { + draw(position - Vector3.up * r, position + Vector3.up * r, color, duration); + draw(position - Vector3.right * r, position + Vector3.right * r, color, duration); + draw(position - Vector3.forward * r, position + Vector3.forward * r, color, duration); + } + + public static void DrawCross(DrawLine draw, Vector3 position, Vector3 up, float r, Color color, + float duration = 0f) + { + up.Normalize(); + var right = Vector3.Normalize(Vector3.Cross(up, Vector3.forward)); + var forward = Vector3.Cross(up, right); + draw(position - up * r, position + up * r, color, duration); + draw(position - right * r, position + right * r, color, duration); + draw(position - forward * r, position + forward * r, color, duration); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Test/BobberFloating.cs.meta b/Assets/Scripts/Test/BobberFloating.cs.meta new file mode 100644 index 000000000..179ad07c9 --- /dev/null +++ b/Assets/Scripts/Test/BobberFloating.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c103db8c4b014d87845103a400b1ace5 +timeCreated: 1772159688 \ No newline at end of file diff --git a/Assets/Scripts/Test/Buoyancy.cs b/Assets/Scripts/Test/Buoyancy.cs deleted file mode 100644 index ce797e0e1..000000000 --- a/Assets/Scripts/Test/Buoyancy.cs +++ /dev/null @@ -1,209 +0,0 @@ -using System; -using UnityEngine; - -[ExecuteInEditMode] -[RequireComponent(typeof(Rigidbody))] -public class Buoyancy : MonoBehaviour -{ - // ====== No water plugin dependency ====== - [Header("Water (No Plugin)")] - [Tooltip("Fallback flat water level (Y). Set this to match your scene water height for now.")] - public float waterLevel = 0f; - - [Tooltip("If false, buoyancy is disabled and rigidbody uses gravity.")] - public bool waterAvailable = true; - - // ====== Original fields (kept) ====== - public bool includeDeformation = true; - - [Tooltip("Approxative radius of object for buoyancy.")] - public float sphereRadiusApproximation = 0.25f; - - [Tooltip("Specifies the multiplier for the movement induced by other deformation (waves, swell... etc).")] - public float waveForceMultiplier = 1f; - - [Tooltip("Specifies the multiplier for the movement induced by the current of the water surface.")] - public float currentSpeedMultiplier = 1f; - - [Tooltip("Specifies the multiplier for the drag forces induced by the viscosity of the mediums.")] - public float dragMultiplier = 1f; - - public float defaultRigidbodyDrag = 0.1f; - - public float underwaterRigidbodyAngularDrag = 1f; - - public float overwaterRigidbodyAngularDrag = 0.05f; - - [Tooltip("Specifies the value for surface tension. A high value will stop the object bouncing faster on water.")] - public float surfaceTensionDamping = 10f; - - [Tooltip("When enabled, the net force is applied with a random offset to create an angular velocity.")] - public bool applyForceWithRandomOffset; - - // 原脚本里这个是 HDRP 的“自定义网格水面高度偏移”，这里保留字段但不再依赖水插件 - [Tooltip("Optional extra offset added to sampled water height. Useful if your water mesh pivot isn't at surface level.")] - public float waterHeightOffset = 0f; - - public bool drawDebug; - - private Vector3 currentDirection; - private Vector3 A; - private Vector3 B; - private Vector3 C; - private Vector3 waterPosition; - private Vector3 normal; - private Vector3 deformationDirection; - - private Rigidbody rigidbodyComponent; - - private float h; - private float hNormalized; - - private bool _isEnabled = true; - - private void Start() - { - rigidbodyComponent = GetComponent(); - rigidbodyComponent.useGravity = false; - rigidbodyComponent.linearDamping = defaultRigidbodyDrag; - } - - public void EnablePhysics(bool set) - { - _isEnabled = set; - } - - private void FixedUpdate() - { - // ✅ 关键：没有水 / 禁用时，回到“用Unity重力” - if (!_isEnabled || !waterAvailable) - { - h = (hNormalized = 0f); - rigidbodyComponent.useGravity = true; - return; - } - - rigidbodyComponent.useGravity = false; - - FetchWaterSurfaceData(transform.position, out waterPosition, out normal, out currentDirection); - - deformationDirection = Vector3.ProjectOnPlane(normal, Vector3.up); - - h = Mathf.Clamp( - waterPosition.y - (transform.position.y - sphereRadiusApproximation), - 0f, - 2f * sphereRadiusApproximation - ); - - hNormalized = h * 1f / (2f * sphereRadiusApproximation); - - float num = MathF.PI * h * h / 3f * (3f * sphereRadiusApproximation - h); - - rigidbodyComponent.angularDamping = Mathf.Lerp(overwaterRigidbodyAngularDrag, underwaterRigidbodyAngularDrag, hNormalized); - - // === 以下保持原脚本单位/写法（尽量贴近原行为） === - Vector3 b = rigidbodyComponent.mass * Physics.gravity; - Vector3 vector = Vector3.Lerp(Physics.gravity, b, hNormalized); - - float num2 = 997f; - float num3 = 0.001293f; - float num4 = 1.81E-05f; - float num5 = 0.001f; - float num6 = 0.47f; - - Vector3 vector2 = (0f - num2) * num * Physics.gravity; - - Vector3 a = MathF.PI * 6f * sphereRadiusApproximation * num4 * -rigidbodyComponent.linearVelocity; - Vector3 b2 = MathF.PI * 6f * sphereRadiusApproximation * num5 * -rigidbodyComponent.linearVelocity; - Vector3 vector3 = Vector3.Lerp(a, b2, hNormalized) * dragMultiplier; - - float num7 = Mathf.Lerp( - b: Mathf.Sqrt(2f * rigidbodyComponent.mass * (0f - Physics.gravity.y) / - (num2 * MathF.PI * Mathf.Pow(sphereRadiusApproximation, 2f) * num6)), - a: Mathf.Sqrt(2f * rigidbodyComponent.mass * (0f - Physics.gravity.y) / - (num3 * MathF.PI * Mathf.Pow(sphereRadiusApproximation, 2f) * num6)), - t: hNormalized - ); - - Vector3 force = vector + vector2 + vector3; - - Vector3 vector4 = applyForceWithRandomOffset - ? (new Vector3( - UnityEngine.Random.Range(-1f, 1f), - UnityEngine.Random.Range(-1f, 1f), - UnityEngine.Random.Range(-1f, 1f) - ) * sphereRadiusApproximation / 5f) - : Vector3.zero; - - rigidbodyComponent.AddForceAtPosition(force, transform.position + vector4, ForceMode.Acceleration); - - if (hNormalized > 0f && hNormalized < 1f) - { - Vector3 force2 = -(Vector3.Dot(rigidbodyComponent.linearVelocity, Physics.gravity.normalized) - * Physics.gravity.normalized) * surfaceTensionDamping; - - rigidbodyComponent.AddForce(force2, ForceMode.Acceleration); - - if (includeDeformation) - { - rigidbodyComponent.AddForce(deformationDirection * waveForceMultiplier, ForceMode.Acceleration); - rigidbodyComponent.AddForce(currentDirection * currentSpeedMultiplier, ForceMode.Acceleration); - } - } - - if (rigidbodyComponent.linearVelocity.magnitude > num7) - { - rigidbodyComponent.linearVelocity = rigidbodyComponent.linearVelocity.normalized * num7; - } - } - - private Vector3 FetchWaterSurfaceData(Vector3 point, out Vector3 positionWS, out Vector3 normalWS, out Vector3 currentDirectionWS) - { - // ✅ 插件无关：统一从 GetWaterInfo 拿数据 - GetWaterInfo(point, out float waterHeight, out normalWS, out currentDirectionWS); - - positionWS = new Vector3(point.x, waterHeight + waterHeightOffset, point.z); - - if (normalWS == Vector3.zero) normalWS = Vector3.up; - - return positionWS; - } - - /// - /// Water provider (no plugin dependency). - /// 默认：水平水面，高度 = waterLevel - /// 以后接 Crest5：你只要改这个函数即可。 - /// - protected virtual void GetWaterInfo(Vector3 worldPoint, out float waterHeight, out Vector3 waterNormal, out Vector3 waterCurrentDir) - { - waterHeight = waterLevel; // 默认水面高度（可在Inspector里调对齐） - waterNormal = Vector3.up; // 默认法线 - waterCurrentDir = Vector3.zero; // 默认水流方向 - } - - public Vector3 GetCurrentWaterPosition() => waterPosition; - - public float GetNormalizedHeightOfSphereBelowSurface() => hNormalized; - - private void OnDrawGizmosSelected() - { - if (!drawDebug) return; - - Gizmos.color = Color.magenta; - Gizmos.DrawLine(transform.position, transform.position + normal); - - Gizmos.color = Color.green; - Gizmos.DrawLine(transform.position, transform.position + deformationDirection * 10f); - - Gizmos.color = Color.red; - Gizmos.DrawLine(transform.position, transform.position + currentDirection); - - Gizmos.color = Color.yellow; - Gizmos.DrawSphere(transform.position, sphereRadiusApproximation); - - Gizmos.color = Color.blue; - Gizmos.DrawSphere(A, sphereRadiusApproximation / 10f); - Gizmos.DrawSphere(B, sphereRadiusApproximation / 10f); - Gizmos.DrawSphere(C, sphereRadiusApproximation / 10f); - } -} \ No newline at end of file diff --git a/Assets/Scripts/Test/Buoyancy.cs.meta b/Assets/Scripts/Test/Buoyancy.cs.meta deleted file mode 100644 index e6646fccf..000000000 --- a/Assets/Scripts/Test/Buoyancy.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: dd1aa9f0de8b435448c6893ecc60d021 \ No newline at end of file diff --git a/Assets/Scripts/Test/FlatWaterHeightProvider.cs b/Assets/Scripts/Test/FlatWaterHeightProvider.cs deleted file mode 100644 index 42eb531fc..000000000 --- a/Assets/Scripts/Test/FlatWaterHeightProvider.cs +++ /dev/null @@ -1,16 +0,0 @@ -using UnityEngine; - -public interface IWaterHeightProvider -{ - /// 返回 worldPos 位置的水面高度（Y） - float GetWaterHeight(Vector3 worldPos); -} - -/// -/// 最简单的水面：固定平面（适合先跑通逻辑） -/// -public class FlatWaterHeightProvider : MonoBehaviour, IWaterHeightProvider -{ - public float waterY = 0f; - public float GetWaterHeight(Vector3 worldPos) => waterY; -} \ No newline at end of file diff --git a/Assets/Scripts/Test/FlatWaterHeightProvider.cs.meta b/Assets/Scripts/Test/FlatWaterHeightProvider.cs.meta deleted file mode 100644 index 2dbc53a1d..000000000 --- a/Assets/Scripts/Test/FlatWaterHeightProvider.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: a1300e9b5a5c347408708087176324c0 \ No newline at end of file diff --git a/Assets/Scripts/Test/FloatBobberController.cs b/Assets/Scripts/Test/FloatBobberController.cs deleted file mode 100644 index 083933b5e..000000000 --- a/Assets/Scripts/Test/FloatBobberController.cs +++ /dev/null @@ -1,370 +0,0 @@ -// using UnityEngine; -// -// [DisallowMultipleComponent] -// public class FloatBobberController : MonoBehaviour -// { -// public enum FloatState -// { -// FreePhysics, // 正常物理 -// Standing, // 站漂（可选：更“稳”的物理态） -// Laying, // 躺漂（浮力过大/出水过多） -// AnimBite // 漂相动画接管：黑漂/顿漂/移漂/顶漂 -// } -// -// public enum BiteType -// { -// Black, // 黑漂：快速下沉 -// Dip, // 顿漂：下压一下回弹 -// Move, // 移漂：水平拖动 -// Lift // 顶漂：上顶（上浮） -// } -// -// [Header("Refs")] -// public Rigidbody rb; -// public ConfigurableJoint joint; // 浮漂与鱼钩端连接的 joint -// public MonoBehaviour waterProviderMB; // 拖一个实现 IWaterHeightProvider 的组件（如 FlatWaterHeightProvider / KWS适配器） -// private IWaterHeightProvider water; -// -// [Header("Buoyancy")] -// [Tooltip("浮漂的有效高度（决定淹没比例计算）")] -// public float floatHeight = 0.18f; -// [Tooltip("浮力系数（越大越容易浮起）")] -// public float buoyancy = 18f; -// [Tooltip("水中阻尼（抑制乱抖/失控）")] -// public float waterDrag = 2.0f; -// [Tooltip("水中角阻尼")] -// public float waterAngularDrag = 2.0f; -// -// [Header("Auto Lay (躺漂判定)")] -// [Tooltip("出水比例超过这个值（0~1），且浮力明显大于重力时，进入躺漂")] -// [Range(0f, 1f)] public float tooMuchOutOfWater01 = 0.55f; -// [Tooltip("浮力/重力比超过该值，认为浮力过大（更容易躺漂）")] -// public float buoyancyOverGravityToLay = 1.15f; -// [Tooltip("躺漂时目标倾角（度）")] -// public float layTiltAngle = 75f; -// [Tooltip("躺漂倾斜速度")] -// public float layTiltSpeed = 6f; -// -// [Header("Joint Drive (用于动画接管)")] -// public float animDriveSpring = 1200f; -// public float animDriveDamper = 120f; -// public float animMaxForce = 10000f; -// -// [Header("Bite Animation Settings")] -// public BiteAnim black = new BiteAnim -// { -// duration = 0.35f, -// verticalOffset = -0.14f, -// curve = AnimationCurve.EaseInOut(0, 0, 1, 1) -// }; -// -// public BiteAnim dip = new BiteAnim -// { -// duration = 0.55f, -// verticalOffset = -0.08f, -// curve = new AnimationCurve( -// new Keyframe(0, 0), -// new Keyframe(0.25f, 1f), -// new Keyframe(0.6f, 0.2f), -// new Keyframe(1f, 0) -// ) -// }; -// -// public BiteAnim lift = new BiteAnim -// { -// duration = 0.6f, -// verticalOffset = +0.06f, -// curve = new AnimationCurve( -// new Keyframe(0, 0), -// new Keyframe(0.3f, 1f), -// new Keyframe(1f, 0) -// ) -// }; -// -// public BiteAnim move = new BiteAnim -// { -// duration = 0.9f, -// horizontalOffset = 0.18f, -// curve = AnimationCurve.EaseInOut(0, 0, 1, 1) -// }; -// -// [System.Serializable] -// public struct BiteAnim -// { -// public float duration; -// public AnimationCurve curve; -// [Tooltip("相对水面的竖直偏移幅度（m），负数=下沉，正数=上顶")] -// public float verticalOffset; -// [Tooltip("水平偏移幅度（m），用于移漂（沿 forward 或指定方向）")] -// public float horizontalOffset; -// } -// -// [Header("Runtime")] -// public FloatState state = FloatState.FreePhysics; -// -// // 内部：动画接管 -// private BiteType currentBite; -// private float biteT; -// private float biteDuration; -// private BiteAnim biteAnim; -// private Vector3 biteDirWorld; // 移漂方向 -// private Vector3 jointBaseTargetPos; -// private bool jointHadTarget; -// -// private void Reset() -// { -// rb = GetComponent(); -// joint = GetComponent(); -// } -// -// private void Awake() -// { -// if (!rb) rb = GetComponent(); -// if (!joint) joint = GetComponent(); -// -// water = waterProviderMB as IWaterHeightProvider; -// if (water == null && waterProviderMB != null) -// water = waterProviderMB.GetComponent(); -// -// // joint 初始化建议（确保 targetPosition 驱动生效） -// if (joint) -// { -// joint.configuredInWorldSpace = false; // targetPosition 在 joint 的本地坐标系更稳定 -// joint.rotationDriveMode = RotationDriveMode.Slerp; -// -// // 建议锁住角度，避免动画接管时乱拧；如果你需要漂转向可放开 -// joint.angularXMotion = ConfigurableJointMotion.Locked; -// joint.angularYMotion = ConfigurableJointMotion.Locked; -// joint.angularZMotion = ConfigurableJointMotion.Locked; -// -// // 位置建议：X/Z 限制，Y 可自由（看你钓组结构） -// // 这里不强制修改，你项目里如果已经配好了就别动 -// } -// } -// -// private void FixedUpdate() -// { -// if (water == null) -// { -// // 没水面采样就只能纯物理 -// state = FloatState.FreePhysics; -// return; -// } -// -// Vector3 pos = rb.position; -// float waterY = water.GetWaterHeight(pos); -// -// // 计算淹没比例：以浮漂中心为基准，上下 floatHeight/2 -// float topY = pos.y + floatHeight * 0.5f; -// float bottomY = pos.y - floatHeight * 0.5f; -// -// float submerged01 = 0f; -// if (waterY <= bottomY) submerged01 = 0f; -// else if (waterY >= topY) submerged01 = 1f; -// else submerged01 = Mathf.InverseLerp(bottomY, topY, waterY); -// -// float outOfWater01 = 1f - submerged01; -// -// // 基础浮力 & 阻尼（只在水中起作用） -// ApplyBuoyancy(submerged01, waterY); -// -// // 躺漂判定（只在非动画接管时） -// if (state != FloatState.AnimBite) -// { -// bool shouldLay = ShouldLay(outOfWater01, submerged01); -// if (shouldLay) -// state = FloatState.Laying; -// else -// state = FloatState.FreePhysics; // 你也可以在这里细分 Standing -// } -// -// // 状态行为 -// switch (state) -// { -// case FloatState.Laying: -// DoLay(waterY); -// break; -// -// case FloatState.AnimBite: -// DoBiteAnim(waterY); -// break; -// -// default: -// // 正常物理时恢复 joint drive（避免被动画参数影响） -// RestoreJointDriveIfNeeded(); -// break; -// } -// } -// -// private void ApplyBuoyancy(float submerged01, float waterY) -// { -// // 水中阻尼：淹没越多阻尼越强 -// rb.linearDamping = Mathf.Lerp(rb.linearDamping, submerged01 > 0 ? waterDrag : 0f, 0.25f); -// rb.angularDamping = Mathf.Lerp(rb.angularDamping, submerged01 > 0 ? waterAngularDrag : 0.05f, 0.25f); -// -// if (submerged01 <= 0f) return; -// -// // 浮力：与淹没比例近似线性（你也可以换成平方让“接近全淹没时更强”） -// float g = Physics.gravity.magnitude; -// float buoyForce = buoyancy * submerged01; -// -// // 让浮力作用点略低于中心，产生一点“站漂”稳定性（可选） -// Vector3 forcePoint = rb.worldCenterOfMass + Vector3.down * (floatHeight * 0.15f); -// -// rb.AddForceAtPosition(Vector3.up * buoyForce, forcePoint, ForceMode.Force); -// -// // 额外：把浮漂轻轻拉向水面（避免小抖导致上下乱跳） -// float surfacePull = 6f * submerged01; -// float yError = waterY - rb.position.y; -// rb.AddForce(Vector3.up * (yError * surfacePull), ForceMode.Force); -// } -// -// private bool ShouldLay(float outOfWater01, float submerged01) -// { -// if (submerged01 <= 0f) return false; -// -// // “浮力/重力”粗判：浮力系数与质量、g相关 -// float gravityForce = rb.mass * Physics.gravity.magnitude; -// // 这里的 buoyancy 是 ForceMode.Force 下的“牛顿”，所以直接比值即可 -// float buoyForceAtFull = buoyancy; // submerged=1 时 -// float ratio = buoyForceAtFull / Mathf.Max(0.0001f, gravityForce); -// -// return (outOfWater01 >= tooMuchOutOfWater01) && (ratio >= buoyancyOverGravityToLay); -// } -// -// private void DoLay(float waterY) -// { -// // 躺漂：把浮漂慢慢倾斜到 layTiltAngle，同时让它更贴近水面 -// Quaternion targetRot = Quaternion.AngleAxis(layTiltAngle, transform.right) * Quaternion.LookRotation(transform.forward, Vector3.up); -// rb.MoveRotation(Quaternion.Slerp(rb.rotation, targetRot, layTiltSpeed * Time.fixedDeltaTime)); -// -// // 贴近水面一点（不要完全锁死，保持自然） -// float targetY = waterY + floatHeight * 0.15f; -// Vector3 p = rb.position; -// p.y = Mathf.Lerp(p.y, targetY, 3f * Time.fixedDeltaTime); -// rb.MovePosition(p); -// -// RestoreJointDriveIfNeeded(); -// } -// -// private void DoBiteAnim(float waterY) -// { -// biteT += Time.fixedDeltaTime; -// float t01 = (biteDuration <= 0.0001f) ? 1f : Mathf.Clamp01(biteT / biteDuration); -// float k = biteAnim.curve != null ? biteAnim.curve.Evaluate(t01) : t01; -// -// // 目标偏移：相对水面 -// float yOff = biteAnim.verticalOffset * k; -// float xzOff = biteAnim.horizontalOffset * k; -// -// // 用 joint.targetPosition 驱动：更像“鱼线/钓组拉着漂走/压漂” -// if (joint) -// { -// EnsureJointDriveForAnim(); -// -// // joint.targetPosition 是在 joint space（本地） -// // 这里做一个“基准 targetPosition + 偏移”，基准取进入动画时的 targetPosition -// Vector3 target = jointBaseTargetPos; -// -// // 竖直：沿 joint 的 local Y -// target += Vector3.up * yOff; -// -// // 移漂：我们用世界方向投到 joint 的 local XZ（近似） -// if (currentBite == BiteType.Move && xzOff != 0f) -// { -// Vector3 worldOffset = biteDirWorld.normalized * xzOff; -// Vector3 localOffset = transform.InverseTransformVector(worldOffset); -// target += new Vector3(localOffset.x, 0f, localOffset.z); -// } -// -// joint.targetPosition = target; -// } -// else -// { -// // 没 joint 就退化：用 MovePosition 做受控位移（稳定但不如 joint 自然） -// Vector3 p = rb.position; -// p.y = Mathf.Lerp(p.y, waterY + yOff, 12f * Time.fixedDeltaTime); -// if (currentBite == BiteType.Move && xzOff != 0f) -// p += biteDirWorld.normalized * (xzOff * 0.2f); // 轻推 -// rb.MovePosition(p); -// } -// -// // 动画结束，回到物理 -// if (t01 >= 1f) -// { -// state = FloatState.FreePhysics; -// RestoreJointDriveIfNeeded(); -// } -// } -// -// private void EnsureJointDriveForAnim() -// { -// if (!joint) return; -// -// if (!jointHadTarget) -// { -// jointHadTarget = true; -// jointBaseTargetPos = joint.targetPosition; -// } -// -// // 只设置一次也行，这里每次保证一致 -// JointDrive d = new JointDrive -// { -// positionSpring = animDriveSpring, -// positionDamper = animDriveDamper, -// maximumForce = animMaxForce -// }; -// -// joint.xDrive = d; -// joint.yDrive = d; -// joint.zDrive = d; -// } -// -// private void RestoreJointDriveIfNeeded() -// { -// // 退出动画时恢复基准 target（避免残留偏移） -// if (!joint) return; -// if (!jointHadTarget) return; -// -// // 慢慢回到基准 targetPosition（更平滑） -// joint.targetPosition = Vector3.Lerp(joint.targetPosition, jointBaseTargetPos, 8f * Time.fixedDeltaTime); -// -// // 当接近后释放 -// if ((joint.targetPosition - jointBaseTargetPos).sqrMagnitude < 0.000001f) -// { -// joint.targetPosition = jointBaseTargetPos; -// jointHadTarget = false; -// } -// } -// -// /// -// /// 外部触发漂相（鱼咬钩/流水/风/玩家提竿前的反馈等） -// /// -// public void PlayBite(BiteType type, Vector3? moveDirWorld = null) -// { -// currentBite = type; -// biteT = 0f; -// -// biteAnim = type switch -// { -// BiteType.Black => black, -// BiteType.Dip => dip, -// BiteType.Move => move, -// BiteType.Lift => lift, -// _ => black -// }; -// -// biteDuration = Mathf.Max(0.02f, biteAnim.duration); -// biteDirWorld = moveDirWorld ?? transform.forward; -// -// // 进入动画接管 -// state = FloatState.AnimBite; -// -// // 记录进入动画时 joint 的基准 target -// if (joint) -// { -// jointBaseTargetPos = joint.targetPosition; -// jointHadTarget = true; -// } -// } -// } \ No newline at end of file diff --git a/Assets/Scripts/Test/FloatBobberController.cs.meta b/Assets/Scripts/Test/FloatBobberController.cs.meta deleted file mode 100644 index 6a64211b5..000000000 --- a/Assets/Scripts/Test/FloatBobberController.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 4c9bb50ca0b0b5547937d3ce82577fad \ No newline at end of file diff --git a/Fishing2.sln.DotSettings.user b/Fishing2.sln.DotSettings.user index 38f4c86c8..d062a4622 100644 --- a/Fishing2.sln.DotSettings.user +++ b/Fishing2.sln.DotSettings.user @@ -17,6 +17,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded diff --git a/Packages/com.waveharmonic.crest/Runtime/Materials/Water Volume.mat b/Packages/com.waveharmonic.crest/Runtime/Materials/Water Volume.mat index 1f420c8dc..0a459305e 100644 --- a/Packages/com.waveharmonic.crest/Runtime/Materials/Water Volume.mat +++ b/Packages/com.waveharmonic.crest/Runtime/Materials/Water Volume.mat @@ -12,22 +12,26 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _CREST_FLOW_LOD - d_Crest_NoMaskDepth - d_Dithering m_InvalidKeywords: + - CREST_CAUSTICS_ON + - CREST_FOAM_ON - _ALPHATEST_ON - _BUILTIN_ALPHATEST_ON - _BUILTIN_AlphaClip - _BUILTIN_SURFACE_TYPE_TRANSPARENT + - _BUILTIN_TRANSPARENT_RECEIVES_SHADOWS - _DOUBLESIDED_ON + - _EMISSION - _ENABLE_FOG_ON_TRANSPARENT - - _REFRACTION_PLANE - _SURFACE_TYPE_TRANSPARENT - _TRANSPARENT_WRITES_MOTION_VEC - m_LightmapFlags: 2 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 1 - m_CustomRenderQueue: 3000 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -48,7 +52,7 @@ Material: - _Crest_Version: 0 m_Floats: - CREST_FLOW: 0 - - _CREST_FLOW_LOD: 0 + - _CREST_FLOW_LOD: 1 - _Crest_AmbientTerm: 1 - _Crest_Anisotropy: 0.5 - _Crest_CausticsDepthOfField: 6 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index f0d8fbce1..947833d1d 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,32 +9,32 @@ EditorUserSettings: value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b07a68ffab74f9ee2a3a30300cea1a11320d0beb1a0c25f7060f494b4cc80018eb09361fc211cb1f862d19c51d19dcc413d6ade0d8ddfcddf9f4d9d29195fcfde6ebeae6f0a9c9afa6f8c5b89ff7a1aacececac4eba4d7c9d28bda flags: 0 RecentlyUsedSceneGuid-0: - value: 5403560050570a5a08085523137709114e15492e7c7f74677e2f4c61b0b3633e - flags: 0 - RecentlyUsedSceneGuid-1: - value: 0700575604020d0a5c0a0a2643770d45134f487e74782031287d1f65b7b4623b - flags: 0 - RecentlyUsedSceneGuid-2: - value: 535552075c510a595b5f557040770e484e164d792d7d75657d791e62b4e4366b - flags: 0 - RecentlyUsedSceneGuid-3: - value: 550350030051080c080c0d21437759124716197b792977697a2b4936e6e26c3d - flags: 0 - RecentlyUsedSceneGuid-4: - value: 0104025352005d0f0e0d0d2741775c12401519287c297167282a1935b1b13269 - flags: 0 - RecentlyUsedSceneGuid-5: - value: 5409035450035e0e0c5d5a7a13770a40454e4f722f7f24347e2d1f30b0b76360 - flags: 0 - RecentlyUsedSceneGuid-6: - value: 07060c5454040c0a545b547240700a441216417e7f2e7268752c4966b4b0663d - flags: 0 - RecentlyUsedSceneGuid-7: value: 5309035757065a0a54575f7216265c4444151d28792e72627d2f1935bbb8673a flags: 0 - RecentlyUsedSceneGuid-8: + RecentlyUsedSceneGuid-1: value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e flags: 0 + RecentlyUsedSceneGuid-2: + value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 + flags: 0 + RecentlyUsedSceneGuid-3: + value: 005704520005080c5959542646205b4447154d2e7b7d7e34787f1e6ab0b56c3a + flags: 0 + RecentlyUsedSceneGuid-4: + value: 53525155015459595c5d5e7315700744174e1a7f7a797e627f2b4b6abab3326f + flags: 0 + RecentlyUsedSceneGuid-5: + value: 5a09065056055c0e595d0a20447b0b4415164e2b297c75682f7c1866b0b3656c + flags: 0 + RecentlyUsedSceneGuid-6: + value: 0750065f5d57580c5c0b5d7741275e44464e1d297b7e77342e784a64b3e13539 + flags: 0 + RecentlyUsedSceneGuid-7: + value: 01085257040c5f0e0c0d5f27457b0f444e4e192c7b2d7e6428794d67e3b36668 + flags: 0 + RecentlyUsedSceneGuid-8: + value: 52530c5601535f020f565a2043770d1612154d2f747975692c7b4e66b5e3303b + flags: 0 RecentlyUsedSceneGuid-9: value: 0054045155060d5a5c575f7045270d44474f4e7c7f7924637e2a1832b1b5636d flags: 0