diff --git a/Assets/New Terrain 12.asset b/Assets/New Terrain 12.asset
index b27451978..b57d809e6 100644
Binary files a/Assets/New Terrain 12.asset and b/Assets/New Terrain 12.asset differ
diff --git a/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset
index 34c9105b2..613770bc0 100644
--- a/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset
+++ b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset
@@ -41,37 +41,23 @@ MonoBehaviour:
- Assembly-CSharp
- Assembly-CSharp-firstpass
- Cinemachine
- - CrestDWP2Asmdef
- ECM2
- Enviro3.Runtime
- FairyGUI
- Fantasy.Unity
- - Gaia.UnityURPWater.Core
- - GaiaCore
- - Gena.Scripts.Utils
- Ilumisoft.GraphicsControl
- Ilumisoft.GraphicsControl.BuiltIn
- Ilumisoft.GraphicsControl.UI
- Ilumisoft.GraphicsControl.URP
- JBooth.MicroSplat.Core
- - JBooth.MicroVerseCore
- - JBooth.MicroVerseCore.Demo
- - JBooth.MicroVerseCore.Demo.TimeOfDay.Runtime
- - JBooth.MicroVerseCore.Roads.Demo
- KAnimationCore.Runtime
- Luban.Runtime
- NBC.Asset
- NBC.Core
- NBC.Lan
- NBC.UI
- - NWH.Common
- - NWH.DWP2
- OccaSoftware.SuperSimpleSkybox.Demo
- OccaSoftware.SuperSimpleSkybox.Runtime
- - ProceduralWorlds.GTS.MeshSimplifier
- - Rowlan.MicroVerse.Presets.Runtime
- - Rowlan.MicroVerse.Presets_2.Runtime
- - Rowlan.MicroVerse.Presets_3.Runtime
- StompyRobot.SRDebugger
- StompyRobot.SRF
- Unity.InputSystem.RebindingUI
diff --git a/Assets/Scenes/BobberTest.unity b/Assets/Scenes/BobberTest.unity
index c1a04d51b..f84962970 100644
--- a/Assets/Scenes/BobberTest.unity
+++ b/Assets/Scenes/BobberTest.unity
@@ -150,120 +150,6 @@ Transform:
m_Children: []
m_Father: {fileID: 1854081519}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
---- !u!1 &154764976
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 154764977}
- - component: {fileID: 154764980}
- - component: {fileID: 154764982}
- - component: {fileID: 154764983}
- m_Layer: 16
- m_Name: Float (3)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &154764977
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 154764976}
- serializedVersion: 2
- m_LocalRotation: {x: 0.4698567, y: 0, z: 0, w: 0.8827427}
- m_LocalPosition: {x: 0, y: 1, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 2058458420}
- m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 56.05, y: 0, z: 0}
---- !u!54 &154764980
-Rigidbody:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 154764976}
- serializedVersion: 5
- m_Mass: 0.01
- 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}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ImplicitCom: 1
- m_ImplicitTensor: 0
- m_UseGravity: 1
- m_IsKinematic: 0
- m_Interpolate: 0
- m_Constraints: 0
- m_CollisionDetection: 0
---- !u!136 &154764982
-CapsuleCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 154764976}
- 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.004
- m_Height: 0.04
- m_Direction: 1
- m_Center: {x: 0, y: 0.03, z: 0}
---- !u!114 &154764983
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 154764976}
- 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: 154764980}
- _Layer: 1
- _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: 0
- Probe:
- - _Weight: 1
- _Position: {x: 0, y: 0, z: 0}
--- !u!1 &203844586
GameObject:
m_ObjectHideFlags: 0
@@ -453,6 +339,85 @@ Transform:
m_Children: []
m_Father: {fileID: 917993274}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+--- !u!1 &315881827
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 315881828}
+ - component: {fileID: 315881830}
+ - component: {fileID: 315881829}
+ m_Layer: 0
+ m_Name: bob_25002
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &315881828
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 315881827}
+ 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: 1079013476}
+ - {fileID: 1591121616}
+ - {fileID: 431827526}
+ - {fileID: 1246957643}
+ - {fileID: 963964292}
+ - {fileID: 1748362031}
+ m_Father: {fileID: 6399344496932780280}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &315881829
+CapsuleCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 315881827}
+ 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.004
+ m_Height: 0.025
+ m_Direction: 1
+ m_Center: {x: 0, y: 0.04, z: 0}
+--- !u!114 &315881830
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 315881827}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3e885da772834bb289c2368be2f6eb5b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ body: {fileID: 1246957643}
+ stick: {fileID: 1748362031}
+ topConnector: {fileID: 1591121616}
+ bottomConnector: {fileID: 431827526}
+ waterline: {fileID: 963964292}
--- !u!1 &332592724
GameObject:
m_ObjectHideFlags: 0
@@ -539,6 +504,37 @@ CapsuleCollider:
m_Height: 0.06766828
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &431827525
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 431827526}
+ m_Layer: 0
+ m_Name: _bottomConnector
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &431827526
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 431827525}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0.00002, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 315881828}
+ m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!1 &552166820
GameObject:
m_ObjectHideFlags: 0
@@ -629,37 +625,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 552166820}
m_Mesh: {fileID: 4300000, guid: 77d4b5d6e9e84794383ac9531cb04cae, type: 2}
---- !u!1 &623951638
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 623951639}
- m_Layer: 0
- m_Name: _waterline
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &623951639
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 623951638}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.0415, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 2058458420}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!1 &666518408
GameObject:
m_ObjectHideFlags: 0
@@ -834,6 +799,68 @@ Transform:
m_Children: []
m_Father: {fileID: 1676957643}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+--- !u!1001 &756008539
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 6400001893494956264}
+ m_Modifications:
+ - target: {fileID: 1385569177710194, guid: 456fb76d23c9e6845a281fe93411b4e5, type: 3}
+ propertyPath: m_Name
+ value: c_hook_20791
+ objectReference: {fileID: 0}
+ - target: {fileID: 4652033991943869, guid: 456fb76d23c9e6845a281fe93411b4e5, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4652033991943869, guid: 456fb76d23c9e6845a281fe93411b4e5, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4652033991943869, guid: 456fb76d23c9e6845a281fe93411b4e5, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4652033991943869, guid: 456fb76d23c9e6845a281fe93411b4e5, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4652033991943869, guid: 456fb76d23c9e6845a281fe93411b4e5, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4652033991943869, guid: 456fb76d23c9e6845a281fe93411b4e5, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4652033991943869, guid: 456fb76d23c9e6845a281fe93411b4e5, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4652033991943869, guid: 456fb76d23c9e6845a281fe93411b4e5, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4652033991943869, guid: 456fb76d23c9e6845a281fe93411b4e5, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4652033991943869, guid: 456fb76d23c9e6845a281fe93411b4e5, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: -0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 456fb76d23c9e6845a281fe93411b4e5, type: 3}
+--- !u!4 &756008540 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4652033991943869, guid: 456fb76d23c9e6845a281fe93411b4e5, type: 3}
+ m_PrefabInstance: {fileID: 756008539}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &820800908
GameObject:
m_ObjectHideFlags: 0
@@ -1369,6 +1396,37 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &963964291
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 963964292}
+ m_Layer: 0
+ m_Name: _waterline
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &963964292
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 963964291}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0.0415, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 315881828}
+ m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!1 &1034192877
GameObject:
m_ObjectHideFlags: 0
@@ -1549,6 +1607,96 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1072129355}
m_Mesh: {fileID: 4300000, guid: 77d4b5d6e9e84794383ac9531cb04cae, type: 2}
+--- !u!1 &1079013475
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1079013476}
+ - component: {fileID: 1079013478}
+ - component: {fileID: 1079013477}
+ m_Layer: 0
+ m_Name: _mesh
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1079013476
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1079013475}
+ 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: 315881828}
+ m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+--- !u!23 &1079013477
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1079013475}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 0
+ 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: 7881e4598f2626c4a8ffb3e956070a4b, type: 2}
+ - {fileID: 2100000, guid: 940b6068f71807340a836245c4bbcb7e, 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!33 &1079013478
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1079013475}
+ m_Mesh: {fileID: 4300000, guid: 77d4b5d6e9e84794383ac9531cb04cae, type: 2}
--- !u!1 &1224158072
GameObject:
m_ObjectHideFlags: 0
@@ -1580,7 +1728,7 @@ Transform:
m_Children: []
m_Father: {fileID: 1854081519}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
---- !u!1 &1247306319
+--- !u!1 &1246957642
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1588,53 +1736,29 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1247306320}
- - component: {fileID: 1247306321}
+ - component: {fileID: 1246957643}
m_Layer: 0
- m_Name: _stick
+ m_Name: _body
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1247306320
+--- !u!4 &1246957643
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1247306319}
+ m_GameObject: {fileID: 1246957642}
serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0.033460047, z: 0}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0.0295, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 2058458420}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!136 &1247306321
-CapsuleCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1247306319}
- 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: 2
- m_Radius: 0.001
- m_Height: 0.06766828
- m_Direction: 1
- m_Center: {x: 0, y: 0, z: 0}
+ m_Father: {fileID: 315881828}
+ m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!1 &1272051118
GameObject:
m_ObjectHideFlags: 0
@@ -1765,96 +1889,6 @@ CapsuleCollider:
m_Height: 0.06766828
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
---- !u!1 &1298751830
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1298751831}
- - component: {fileID: 1298751833}
- - component: {fileID: 1298751832}
- m_Layer: 0
- m_Name: _mesh
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1298751831
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1298751830}
- 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: 2058458420}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
---- !u!23 &1298751832
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1298751830}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 0
- 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: 7881e4598f2626c4a8ffb3e956070a4b, type: 2}
- - {fileID: 2100000, guid: 940b6068f71807340a836245c4bbcb7e, 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!33 &1298751833
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1298751830}
- m_Mesh: {fileID: 4300000, guid: 77d4b5d6e9e84794383ac9531cb04cae, type: 2}
--- !u!1 &1336541386
GameObject:
m_ObjectHideFlags: 0
@@ -2142,8 +2176,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Test.BobberTest
rb: {fileID: 1518432885}
- line: {fileID: 8144283643417267672}
- lineLength: 2
+ line: {fileID: 6434087796225375415}
+ lineLength: 3
floatLength: 1
Tension: 0
--- !u!1 &1529912227
@@ -2403,7 +2437,7 @@ Transform:
m_Children: []
m_Father: {fileID: 1676957643}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
---- !u!1 &1568490074
+--- !u!1 &1591121615
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2411,28 +2445,28 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1568490075}
+ - component: {fileID: 1591121616}
m_Layer: 0
- m_Name: _body
+ m_Name: _topConnector
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1568490075
+--- !u!4 &1591121616
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1568490074}
+ m_GameObject: {fileID: 1591121615}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.0295, z: 0}
+ m_LocalPosition: {x: 0, y: 0.055, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 2058458420}
+ m_Father: {fileID: 315881828}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!1 &1627634077
GameObject:
@@ -2520,7 +2554,7 @@ MonoBehaviour:
topConnector: {fileID: 1549463780}
bottomConnector: {fileID: 726690746}
waterline: {fileID: 1627634078}
---- !u!1 &1690494754
+--- !u!1 &1748362030
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -2528,65 +2562,34 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1690494755}
+ - component: {fileID: 1748362031}
m_Layer: 0
- m_Name: _bottomConnector
+ m_Name: _stick
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1690494755
+--- !u!4 &1748362031
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1690494754}
+ m_GameObject: {fileID: 1748362030}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.00002, z: 0}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0.033460047, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 2058458420}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+ m_Father: {fileID: 315881828}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1801125034 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2452750316707852748, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3}
m_PrefabInstance: {fileID: 3951967027910327458}
m_PrefabAsset: {fileID: 0}
---- !u!1 &1828830191
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1828830192}
- m_Layer: 0
- m_Name: _topConnector
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1828830192
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1828830191}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.055, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 2058458420}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!1 &1854081518
GameObject:
m_ObjectHideFlags: 0
@@ -2950,61 +2953,6 @@ CapsuleCollider:
m_Height: 0.04
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
---- !u!1 &2058458419
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2058458420}
- - component: {fileID: 2058458421}
- m_Layer: 0
- m_Name: bob_25002
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &2058458420
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2058458419}
- 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: 1298751831}
- - {fileID: 1828830192}
- - {fileID: 1690494755}
- - {fileID: 1568490075}
- - {fileID: 623951639}
- - {fileID: 1247306320}
- m_Father: {fileID: 154764977}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
---- !u!114 &2058458421
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2058458419}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3e885da772834bb289c2368be2f6eb5b, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- body: {fileID: 1568490075}
- stick: {fileID: 1247306320}
- topConnector: {fileID: 1828830192}
- bottomConnector: {fileID: 1690494755}
- waterline: {fileID: 623951639}
--- !u!1001 &2114733478
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3365,37 +3313,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1938556731102199}
m_Mesh: {fileID: 4300000, guid: 77d4b5d6e9e84794383ac9531cb04cae, type: 2}
---- !u!4 &41383484053585886
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6280423383106253057}
- 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: 584816677121546027}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
---- !u!1 &167656693566734254
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 9066712976035742038}
- m_Layer: 0
- m_Name: _topConnector
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!114 &269011904976577378
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -3426,21 +3343,6 @@ MonoBehaviour:
RefIds:
- rid: -2
type: {class: , ns: , asm: }
---- !u!4 &269017554130809855
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8188637675592362683}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.0415, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 584816677121546027}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!114 &309487077947173374
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -3481,71 +3383,60 @@ CapsuleCollider:
m_Height: 0.025
m_Direction: 1
m_Center: {x: 0, y: 0.04, z: 0}
---- !u!4 &389927712696538647
-Transform:
+--- !u!114 &319875407907189953
+MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8129510738604895356}
- serializedVersion: 2
- m_LocalRotation: {x: 0.4698567, y: 0, z: 0, w: 0.8827427}
- m_LocalPosition: {x: 1, y: 1.08, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 584816677121546027}
- m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 56.05, y: 0, z: 0}
---- !u!23 &398636765974200556
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6280423383106253057}
+ m_GameObject: {fileID: 6402298104626586630}
m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 0
- 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: 7881e4598f2626c4a8ffb3e956070a4b, type: 2}
- - {fileID: 2100000, guid: 940b6068f71807340a836245c4bbcb7e, 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}
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2dedfafdc2d747d98c682cde3e28e513, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Assembly-CSharp::BobberPresentationController
+ fallbackWaterLevel: 0
+ waterRenderer: {fileID: 2531380344179187550}
+ waterCollisionLayer: 1
+ waterQueryObjectWidth: 0.5
+ waterProviderBehaviour: {fileID: 6434087796225375415}
+ enterWaterDepth: 0.002
+ exitWaterDepth: -0.01
+ floatHeight: 0.08
+ bottomOffsetLocalY: 0
+ baseSubmergeRatio: 0.5
+ ySmoothTime: 0.08
+ maxYSpeed: 2
+ yDeadZone: 0.0005
+ enableSurfaceBobbing: 1
+ surfaceBobAmplitude: 0.0015
+ surfaceBobFrequency: 1.2
+ lockXZAroundAnchor: 1
+ xzSmoothTime: 0.15
+ maxPlanarOffset: 0.15
+ downForceToSink: 0.0025
+ maxExtraSink: 0.08
+ enableBottomTouchAdjust: 1
+ bottomTouchLift: 0.01
+ lureBody: {fileID: 6349322619983963745}
+ referenceLength: 0.3
+ minSubmergeToStand: 0.16
+ verticalLieThreshold: 0.18
+ verticalUprightThreshold: 0.75
+ planarTiltThreshold: 0.3
+ planarDominanceMultiplier: 1.2
+ postureHysteresis: 0.04
+ tiltedAngle: 38
+ lyingAngle: 88
+ uprightMaxTiltAngle: 8
+ planarTiltFactor: 120
+ rotationLerpSpeed: 8
+ debugResetKey: 1
+ debugTapKey: 1
+ debugSlowSinkKey: 1
+ debugLiftKey: 1
+ debugBlackDriftKey: 1
+ drawDebug: 1
--- !u!4 &510414306652611078
Transform:
m_ObjectHideFlags: 0
@@ -3561,42 +3452,6 @@ Transform:
m_Children: []
m_Father: {fileID: 7195797433903099932}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &530731981639178553
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9204150256481453776}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0.033460047, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 584816677121546027}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &584816677121546027
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4021168644610805053}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: -0.04, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 41383484053585886}
- - {fileID: 9066712976035742038}
- - {fileID: 5901816832231670898}
- - {fileID: 869141368029001109}
- - {fileID: 269017554130809855}
- - {fileID: 530731981639178553}
- m_Father: {fileID: 389927712696538647}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!223 &629080170150445082
Canvas:
m_ObjectHideFlags: 0
@@ -3689,22 +3544,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &869141368029001109
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2834281524933038866}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.0295, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 584816677121546027}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+ m_IsActive: 0
--- !u!1 &1065788238234039155
GameObject:
m_ObjectHideFlags: 0
@@ -3821,21 +3661,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!4 &1159196036679945669
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8040762699284656957}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.055, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 7338767763573152696}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!4 &1291580890895649287
Transform:
m_ObjectHideFlags: 0
@@ -3868,22 +3693,6 @@ Transform:
- {fileID: 1345161124}
m_Father: {fileID: 3347216226615520232}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1332661049252743747
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7681078425349166506}
- m_Layer: 0
- m_Name: _stick
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!114 &1471384148769986650
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -3987,49 +3796,18 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
---- !u!54 &1840670279898142899
-Rigidbody:
+--- !u!114 &2058081563751530344
+MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2095571565886628079}
- serializedVersion: 5
- m_Mass: 0.1
- m_LinearDamping: 0.1
- m_AngularDamping: 0.01
- m_CenterOfMass: {x: 0, y: 0.04, z: 0}
- m_InertiaTensor: {x: 0.001, y: 0.001, z: 0.001}
- 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: 0
- m_ImplicitTensor: 0
- m_UseGravity: 0
- m_IsKinematic: 0
- m_Interpolate: 1
- m_Constraints: 0
- m_CollisionDetection: 1
---- !u!1 &2046542269883901480
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7961972470609608556}
- m_Layer: 0
- m_Name: _waterline
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_GameObject: {fileID: 6402419790999046877}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5625b86b9e4b4482b82d83b962d0c873, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Assembly-CSharp::RodLine
--- !u!1001 &2066873170891308496
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4113,56 +3891,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!1 &2095571565886628079
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7542518911993633412}
- - component: {fileID: 1840670279898142899}
- - component: {fileID: 2343505271588303845}
- - component: {fileID: 7542518911993633413}
- m_Layer: 16
- m_Name: Float (5)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!33 &2096859472366292387
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4246241372715793810}
- m_Mesh: {fileID: 4300000, guid: 77d4b5d6e9e84794383ac9531cb04cae, type: 2}
---- !u!136 &2238779523277448163
-CapsuleCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9204150256481453776}
- 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: 2
- m_Radius: 0.001
- m_Height: 0.06766828
- m_Direction: 1
- m_Center: {x: 0, y: 0, z: 0}
--- !u!224 &2256579932936496278
RectTransform:
m_ObjectHideFlags: 0
@@ -4191,29 +3919,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6260237052217873599}
m_CullTransparentMesh: 1
---- !u!136 &2343505271588303845
-CapsuleCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2095571565886628079}
- 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.004
- m_Height: 0.035
- m_Direction: 1
- m_Center: {x: 0, y: 0.03, z: 0}
--- !u!114 &2358608343594615569
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4246,22 +3951,6 @@ Transform:
m_Children: []
m_Father: {fileID: 3347216226615520232}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2466777408151505905
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4333116976202729697}
- m_Layer: 0
- m_Name: _bottomConnector
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!114 &2531380344179187550
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4534,7 +4223,7 @@ MonoBehaviour:
_Version: 0
_Enabled: 1
_Layer: 4
- _Material: {fileID: 2100000, guid: d82d92d8d8f214cd0b8bf7c185b2c341, type: 2}
+ _Material: {fileID: 2100000, guid: c45c61012a9f980468bfce0c6f6f5f54, type: 2}
_VolumeMaterial: {fileID: 0}
_ChunkTemplate: {fileID: 0}
_CastShadows: 0
@@ -4679,39 +4368,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!1 &2834281524933038866
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 869141368029001109}
- m_Layer: 0
- m_Name: _body
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &2958907248619857825
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6488326274017591726}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3e885da772834bb289c2368be2f6eb5b, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- body: {fileID: 7046702632142338310}
- stick: {fileID: 7681078425349166506}
- topConnector: {fileID: 1159196036679945669}
- bottomConnector: {fileID: 4333116976202729697}
- waterline: {fileID: 7961972470609608556}
--- !u!1 &3062767698477047043
GameObject:
m_ObjectHideFlags: 0
@@ -5287,24 +4943,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c26fe2b4fef6c484089497b549dd6b04, type: 3}
---- !u!1 &4021168644610805053
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 584816677121546027}
- - component: {fileID: 4959874663812492082}
- - component: {fileID: 4959874663812492083}
- m_Layer: 0
- m_Name: bob_25002
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!1 &4066733549998169382
GameObject:
m_ObjectHideFlags: 0
@@ -5359,24 +4997,6 @@ MonoBehaviour:
_Material: {fileID: 0}
_BelowSurfaceMaterial: {fileID: 0}
_VolumeMaterial: {fileID: 0}
---- !u!1 &4246241372715793810
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7878523915952501581}
- - component: {fileID: 2096859472366292387}
- - component: {fileID: 7515693914261408895}
- m_Layer: 0
- m_Name: _mesh
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!224 &4262266657851529727
RectTransform:
m_ObjectHideFlags: 0
@@ -5405,21 +5025,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8737220161078195139}
m_CullTransparentMesh: 1
---- !u!4 &4333116976202729697
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2466777408151505905}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.00002, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 7338767763573152696}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!222 &4334316862751883177
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -5553,29 +5158,20 @@ Transform:
- {fileID: 3430072966807144692}
m_Father: {fileID: 5388330205210097294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4772159711372274701
+--- !u!114 &4786584391207899871
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8129510738604895356}
+ m_GameObject: {fileID: 6403200268267948197}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 6f273ba33ebe49cd8b31b92db8288a90, type: 3}
+ m_Script: {fileID: 11500000, guid: ed5bbbc032ec4ca1bb56991d9141e311, type: 3}
m_Name:
- m_EditorClassIdentifier: Assembly-CSharp::Buoyancy
- _water: {fileID: 2531380344179187550}
- sphereRadiusApproximation: 0.1
- waveForceMultiplier: 0.01
- currentSpeedMultiplier: 0.01
- dragMultiplier: 1
- defaultRigidbodyDrag: 5
- underwaterRigidbodyAngularDrag: 5
- overwaterRigidbodyAngularDrag: 1
- surfaceTensionDamping: 10
- applyForceWithRandomOffset: 0
- drawDebug: 1
+ m_EditorClassIdentifier: Assembly-CSharp::NBF.LureController
+ rBody: {fileID: 6349322619983963745}
+ joint: {fileID: 6556868816483829475}
--- !u!1001 &4903999546382904164
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5633,46 +5229,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5e01cffb9e8324147affb8e08fd5ed13, type: 3}
---- !u!114 &4959874663812492082
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4021168644610805053}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3e885da772834bb289c2368be2f6eb5b, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- body: {fileID: 869141368029001109}
- stick: {fileID: 530731981639178553}
- topConnector: {fileID: 9066712976035742038}
- bottomConnector: {fileID: 5901816832231670898}
- waterline: {fileID: 269017554130809855}
---- !u!136 &4959874663812492083
-CapsuleCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4021168644610805053}
- 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.003
- m_Height: 0.04
- m_Direction: 1
- m_Center: {x: 0, y: 0.05, z: 0}
--- !u!224 &5096569463460343103
RectTransform:
m_ObjectHideFlags: 0
@@ -5758,22 +5314,6 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
---- !u!1 &5372866695071686529
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7046702632142338310}
- m_Layer: 0
- m_Name: _body
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!114 &5379033684082313598
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5969,22 +5509,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!1 &5764296597173438306
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5901816832231670898}
- m_Layer: 0
- m_Name: _bottomConnector
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!33 &5777952278598528620
MeshFilter:
m_ObjectHideFlags: 0
@@ -6035,21 +5559,116 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1065788238234039155}
m_CullTransparentMesh: 1
---- !u!4 &5901816832231670898
-Transform:
+--- !u!120 &6133209827788439524
+LineRenderer:
+ serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5764296597173438306}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.00002, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 584816677121546027}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+ m_GameObject: {fileID: 6403147493081495985}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 0
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RayTracingMode: 0
+ 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: 0}
+ 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_Positions:
+ - {x: 0, y: 0, z: 0}
+ - {x: 0, y: 0, z: 1}
+ m_Parameters:
+ serializedVersion: 3
+ widthMultiplier: 1
+ widthCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ colorGradient:
+ serializedVersion: 2
+ key0: {r: 1, g: 1, b: 1, a: 1}
+ key1: {r: 1, g: 1, b: 1, a: 1}
+ key2: {r: 0, g: 0, b: 0, a: 0}
+ key3: {r: 0, g: 0, b: 0, a: 0}
+ key4: {r: 0, g: 0, b: 0, a: 0}
+ key5: {r: 0, g: 0, b: 0, a: 0}
+ key6: {r: 0, g: 0, b: 0, a: 0}
+ key7: {r: 0, g: 0, b: 0, a: 0}
+ ctime0: 0
+ ctime1: 65535
+ ctime2: 0
+ ctime3: 0
+ ctime4: 0
+ ctime5: 0
+ ctime6: 0
+ ctime7: 0
+ atime0: 0
+ atime1: 65535
+ atime2: 0
+ atime3: 0
+ atime4: 0
+ atime5: 0
+ atime6: 0
+ atime7: 0
+ m_Mode: 0
+ m_ColorSpace: -1
+ m_NumColorKeys: 2
+ m_NumAlphaKeys: 2
+ numCornerVertices: 0
+ numCapVertices: 0
+ alignment: 0
+ textureMode: 0
+ textureScale: {x: 1, y: 1}
+ shadowBias: 0.5
+ generateLightingData: 0
+ m_MaskInteraction: 0
+ m_UseWorldSpace: 1
+ m_Loop: 0
+ m_ApplyActiveColorSpace: 1
--- !u!114 &6135364979465448005
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -6116,24 +5735,60 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!1 &6280423383106253057
-GameObject:
+--- !u!54 &6349322619983963745
+Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 41383484053585886}
- - component: {fileID: 8132567827201524016}
- - component: {fileID: 398636765974200556}
- m_Layer: 0
- m_Name: _mesh
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_GameObject: {fileID: 6403200268267948197}
+ serializedVersion: 5
+ m_Mass: 0.01
+ m_LinearDamping: 1
+ m_AngularDamping: 0.1
+ 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}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ImplicitCom: 1
+ m_ImplicitTensor: 0
+ m_UseGravity: 0
+ m_IsKinematic: 0
+ m_Interpolate: 0
+ m_Constraints: 0
+ m_CollisionDetection: 2
+--- !u!54 &6350068121866578306
+Rigidbody:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6402298104626586630}
+ serializedVersion: 5
+ m_Mass: 0.1
+ m_LinearDamping: 1
+ m_AngularDamping: 0.1
+ 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}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ImplicitCom: 1
+ m_ImplicitTensor: 0
+ m_UseGravity: 1
+ m_IsKinematic: 0
+ m_Interpolate: 0
+ m_Constraints: 0
+ m_CollisionDetection: 2
--- !u!1 &6374285101834327718
GameObject:
m_ObjectHideFlags: 0
@@ -6172,6 +5827,472 @@ RectTransform:
m_AnchoredPosition: {x: -40, y: -40}
m_SizeDelta: {x: 70, y: 70}
m_Pivot: {x: 1, y: 1}
+--- !u!4 &6399344496932780280
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6402298104626586630}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: -1, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 315881828}
+ m_Father: {fileID: 6399656922482562798}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &6399353457431780186
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6402419790999046877}
+ 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: 6399656922482562798}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &6399656922482562798
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6402992688642991981}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 1, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 6399353457431780186}
+ - {fileID: 6399852423185467688}
+ - {fileID: 6400050113314258284}
+ - {fileID: 6400001893494956264}
+ - {fileID: 6399344496932780280}
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &6399852423185467688
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6403147493081495985}
+ 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: 6399656922482562798}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &6400001893494956264
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6403200268267948197}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: -1.5, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 756008540}
+ m_Father: {fileID: 6399656922482562798}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &6400050113314258284
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6402377032129293397}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: -1, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 6399656922482562798}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6402298104626586630
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6399344496932780280}
+ - component: {fileID: 6350068121866578306}
+ - component: {fileID: 6556419073564156073}
+ - component: {fileID: 9036762790650551082}
+ - component: {fileID: 319875407907189953}
+ m_Layer: 16
+ m_Name: Float
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!1 &6402377032129293397
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6400050113314258284}
+ - component: {fileID: 6433916773520363633}
+ - component: {fileID: 6802039863377456952}
+ m_Layer: 0
+ m_Name: Float Line
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!1 &6402419790999046877
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6399353457431780186}
+ - component: {fileID: 6445716215790611420}
+ - component: {fileID: 2058081563751530344}
+ m_Layer: 0
+ m_Name: Rod Line
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!1 &6402992688642991981
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6399656922482562798}
+ - component: {fileID: 6434087796225375415}
+ - component: {fileID: 8480399148068670222}
+ m_Layer: 0
+ m_Name: fishing line float set (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!1 &6403147493081495985
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6399852423185467688}
+ - component: {fileID: 6433395340666563273}
+ - component: {fileID: 6133209827788439524}
+ m_Layer: 19
+ m_Name: Fishing Line
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!1 &6403200268267948197
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6400001893494956264}
+ - component: {fileID: 6349322619983963745}
+ - component: {fileID: 6556868816483829475}
+ - component: {fileID: 6430449945150017124}
+ - component: {fileID: 4786584391207899871}
+ - component: {fileID: 8828354455312101551}
+ m_Layer: 7
+ m_Name: Lure
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!135 &6430449945150017124
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6403200268267948197}
+ 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_Radius: 0.003
+ m_Center: {x: 0, y: -0.0015, z: 0}
+--- !u!114 &6433395340666563273
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6403147493081495985}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 98ba9d435a0e49c9bb527c34cc91894d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ startAnchor: {fileID: 0}
+ endAnchor: {fileID: 6350068121866578306}
+ LineMultiple: 1
+ physicsSegmentLen: 0.1
+ minPhysicsNodes: 2
+ maxPhysicsNodes: 200
+ gravityStrength: 6
+ velocityDampen: 0.95
+ stiffness: 0.8
+ iterations: 10
+ initialLength: 0
+ lengthSmoothTime: 0.15
+ lengthChangeVelocityKill: 0.4
+ minSlack: 0.002
+ headMinLen: 0.01
+ nodeHysteresis: 0.05
+ constrainToGround: 1
+ groundMask:
+ serializedVersion: 2
+ m_Bits: 24
+ groundRadius: 0.01
+ groundCastHeight: 1
+ groundCastDistance: 2.5
+ groundSampleStep: 3
+ groundInterpolate: 1
+ groundUpdateEvery: 1
+ constrainToWaterSurface: 1
+ waterLevelY: 0
+ waterSurfaceOffset: 0.002
+ waterSampleStep: 2
+ waterInterpolate: 1
+ waterUpdateEvery: 1
+ waterPostConstraintIterations: 2
+ renderSubdivisionsIdle: 6
+ renderSubdivisionsMoving: 2
+ movingSpeedThreshold: 2
+ smooth: 1
+ lineWidth: 0.001
+ airDrag: 0.2
+ airDragXZ: 0.6
+--- !u!114 &6433916773520363633
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6402377032129293397}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 98ba9d435a0e49c9bb527c34cc91894d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ startAnchor: {fileID: 6350068121866578306}
+ endAnchor: {fileID: 6349322619983963745}
+ LineMultiple: 1
+ physicsSegmentLen: 0.1
+ minPhysicsNodes: 2
+ maxPhysicsNodes: 120
+ gravityStrength: 6
+ velocityDampen: 0.95
+ stiffness: 0.8
+ iterations: 10
+ initialLength: 0
+ lengthSmoothTime: 0.15
+ lengthChangeVelocityKill: 0.4
+ minSlack: 0.002
+ headMinLen: 0.01
+ nodeHysteresis: 0.05
+ constrainToGround: 1
+ groundMask:
+ serializedVersion: 2
+ m_Bits: 8
+ groundRadius: 0.01
+ groundCastHeight: 1
+ groundCastDistance: 2.5
+ groundSampleStep: 3
+ groundInterpolate: 1
+ groundUpdateEvery: 1
+ constrainToWaterSurface: 0
+ waterLevelY: 0
+ waterSurfaceOffset: 0.002
+ waterSampleStep: 2
+ waterInterpolate: 1
+ waterUpdateEvery: 1
+ waterPostConstraintIterations: 2
+ renderSubdivisionsIdle: 6
+ renderSubdivisionsMoving: 2
+ movingSpeedThreshold: 2
+ smooth: 1
+ lineWidth: 0.001
+ airDrag: 0.9
+ airDragXZ: 0.6
+--- !u!114 &6434087796225375415
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6402992688642991981}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c0403ffd74ce46fab8bd4ef057e51432, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ ConfigId: 0
+ LineType: 0
+ isLureConnect: 0
+ rodLine: {fileID: 2058081563751530344}
+ fishingRope: {fileID: 6433395340666563273}
+ bobberRope: {fileID: 6433916773520363633}
+ Lure: {fileID: 4786584391207899871}
+ Bobber: {fileID: 9036762790650551082}
+ PinchController: {fileID: 8828354455312101551}
+--- !u!120 &6445716215790611420
+LineRenderer:
+ serializedVersion: 2
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6402419790999046877}
+ m_Enabled: 0
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 0
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RayTracingMode: 0
+ 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: 4be07647ecdb4b845a9e0fbc74bb0e0a, 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_Positions:
+ - {x: 0, y: 0, z: 0}
+ - {x: 0, y: 0, z: 1}
+ m_Parameters:
+ serializedVersion: 3
+ widthMultiplier: 1
+ widthCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ colorGradient:
+ serializedVersion: 2
+ key0: {r: 1, g: 1, b: 1, a: 1}
+ key1: {r: 1, g: 1, b: 1, a: 1}
+ key2: {r: 0, g: 0, b: 0, a: 0}
+ key3: {r: 0, g: 0, b: 0, a: 0}
+ key4: {r: 0, g: 0, b: 0, a: 0}
+ key5: {r: 0, g: 0, b: 0, a: 0}
+ key6: {r: 0, g: 0, b: 0, a: 0}
+ key7: {r: 0, g: 0, b: 0, a: 0}
+ ctime0: 0
+ ctime1: 65535
+ ctime2: 0
+ ctime3: 0
+ ctime4: 0
+ ctime5: 0
+ ctime6: 0
+ ctime7: 0
+ atime0: 0
+ atime1: 65535
+ atime2: 0
+ atime3: 0
+ atime4: 0
+ atime5: 0
+ atime6: 0
+ atime7: 0
+ m_Mode: 0
+ m_ColorSpace: -1
+ m_NumColorKeys: 2
+ m_NumAlphaKeys: 2
+ numCornerVertices: 0
+ numCapVertices: 0
+ alignment: 0
+ textureMode: 0
+ textureScale: {x: 1, y: 1}
+ shadowBias: 0.5
+ generateLightingData: 0
+ m_MaskInteraction: 0
+ m_UseWorldSpace: 1
+ m_Loop: 0
+ m_ApplyActiveColorSpace: 1
--- !u!114 &6451968783914721810
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -6224,23 +6345,320 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 25}
m_Pivot: {x: 0.5, y: 0.25}
---- !u!1 &6488326274017591726
-GameObject:
+--- !u!153 &6556419073564156073
+ConfigurableJoint:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7338767763573152696}
- - component: {fileID: 2958907248619857825}
- m_Layer: 0
- m_Name: bob_25002
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_GameObject: {fileID: 6402298104626586630}
+ 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
+--- !u!153 &6556868816483829475
+ConfigurableJoint:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6403200268267948197}
+ serializedVersion: 4
+ m_ConnectedBody: {fileID: 6350068121866578306}
+ m_ConnectedArticulationBody: {fileID: 0}
+ m_Anchor: {x: 0, y: 0, 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
+--- !u!120 &6802039863377456952
+LineRenderer:
+ serializedVersion: 2
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6402377032129293397}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 0
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RayTracingMode: 0
+ 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: 0}
+ 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_Positions:
+ - {x: 0, y: 0, z: 0}
+ - {x: 0, y: 0, z: 1}
+ m_Parameters:
+ serializedVersion: 3
+ widthMultiplier: 1
+ widthCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ colorGradient:
+ serializedVersion: 2
+ key0: {r: 1, g: 1, b: 1, a: 1}
+ key1: {r: 1, g: 1, b: 1, a: 1}
+ key2: {r: 0, g: 0, b: 0, a: 0}
+ key3: {r: 0, g: 0, b: 0, a: 0}
+ key4: {r: 0, g: 0, b: 0, a: 0}
+ key5: {r: 0, g: 0, b: 0, a: 0}
+ key6: {r: 0, g: 0, b: 0, a: 0}
+ key7: {r: 0, g: 0, b: 0, a: 0}
+ ctime0: 0
+ ctime1: 65535
+ ctime2: 0
+ ctime3: 0
+ ctime4: 0
+ ctime5: 0
+ ctime6: 0
+ ctime7: 0
+ atime0: 0
+ atime1: 65535
+ atime2: 0
+ atime3: 0
+ atime4: 0
+ atime5: 0
+ atime6: 0
+ atime7: 0
+ m_Mode: 0
+ m_ColorSpace: -1
+ m_NumColorKeys: 2
+ m_NumAlphaKeys: 2
+ numCornerVertices: 0
+ numCapVertices: 0
+ alignment: 0
+ textureMode: 0
+ textureScale: {x: 1, y: 1}
+ shadowBias: 0.5
+ generateLightingData: 0
+ m_MaskInteraction: 0
+ m_UseWorldSpace: 1
+ m_Loop: 0
+ m_ApplyActiveColorSpace: 1
--- !u!1 &6871473421737383571
GameObject:
m_ObjectHideFlags: 0
@@ -6276,21 +6694,6 @@ MonoBehaviour:
_IsLocal: 0
_Velocity: {x: -5, y: 0, z: 0}
_AngularVelocity: {x: 0, y: 0, z: 0}
---- !u!4 &7046702632142338310
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5372866695071686529}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.0295, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 7338767763573152696}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!1 &7126023296560485276
GameObject:
m_ObjectHideFlags: 0
@@ -6331,27 +6734,6 @@ Transform:
- {fileID: 1529912228}
m_Father: {fileID: 5388330205210097294}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &7338767763573152696
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6488326274017591726}
- 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: 7878523915952501581}
- - {fileID: 1159196036679945669}
- - {fileID: 4333116976202729697}
- - {fileID: 7046702632142338310}
- - {fileID: 7961972470609608556}
- - {fileID: 7681078425349166506}
- m_Father: {fileID: 7542518911993633412}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!1001 &7347139586361227608
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6441,123 +6823,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6871473421737383571}
m_CullTransparentMesh: 1
---- !u!23 &7515693914261408895
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4246241372715793810}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 0
- 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: 7881e4598f2626c4a8ffb3e956070a4b, type: 2}
- - {fileID: 2100000, guid: 940b6068f71807340a836245c4bbcb7e, 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!4 &7542518911993633412
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2095571565886628079}
- serializedVersion: 2
- m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
- m_LocalPosition: {x: 1, y: 1.08, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 7338767763573152696}
- m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
---- !u!114 &7542518911993633413
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2095571565886628079}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f91c9d873c83492ca6d5e3e3a67c1760, type: 3}
- m_Name:
- m_EditorClassIdentifier: Assembly-CSharp::CapsuleBuoyancyStable
- buoyancyScale: 1.6
- samplePoints: 9
- submergenceCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 1
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 1
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- verticalDamping: 3
- angularDamping: 0.6
- uprightSpring: 0
- uprightDamping: 0.5
- uprightAxis: 1
- extraDragInWater: 0.8
- extraAngularDragInWater: 0.8
- nearUprightDampingReduce: 0.6
- nearUprightAngleDeg: 12
- _waterRenderer: {fileID: 2531380344179187550}
- _Layer: 1
- _ObjectWidth: 3
- drawDebug: 0
- _init: 0
--- !u!114 &7647511515837834160
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -6572,67 +6837,6 @@ MonoBehaviour:
m_EditorClassIdentifier: Assembly-CSharp::NBF.LureController
rBody: {fileID: 8093361435069273870}
joint: {fileID: 8264839114692736908}
---- !u!4 &7681078425349166506
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1332661049252743747}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0.033460047, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 7338767763573152696}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &7878523915952501581
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4246241372715793810}
- 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: 7338767763573152696}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
---- !u!4 &7961972470609608556
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2046542269883901480}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.0415, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 7338767763573152696}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
---- !u!1 &8040762699284656957
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1159196036679945669}
- m_Layer: 0
- m_Name: _topConnector
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!54 &8093361435069273870
Rigidbody:
m_ObjectHideFlags: 0
@@ -6846,7 +7050,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &8114378222086924161
Transform:
m_ObjectHideFlags: 0
@@ -6913,32 +7117,6 @@ Transform:
m_Children: []
m_Father: {fileID: 8114378222086924161}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8129510738604895356
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 389927712696538647}
- - component: {fileID: 8380770180143436832}
- - component: {fileID: 4772159711372274701}
- m_Layer: 16
- m_Name: Float (4)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!33 &8132567827201524016
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6280423383106253057}
- m_Mesh: {fileID: 4300000, guid: 77d4b5d6e9e84794383ac9531cb04cae, type: 2}
--- !u!114 &8143692206562876326
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -6977,6 +7155,13 @@ MonoBehaviour:
groundSampleStep: 3
groundInterpolate: 1
groundUpdateEvery: 2
+ constrainToWaterSurface: 1
+ waterLevelY: 0
+ waterSurfaceOffset: 0.002
+ waterSampleStep: 2
+ waterInterpolate: 1
+ waterUpdateEvery: 1
+ waterPostConstraintIterations: 2
renderSubdivisionsIdle: 6
renderSubdivisionsMoving: 2
movingSpeedThreshold: 2
@@ -7022,6 +7207,13 @@ MonoBehaviour:
groundSampleStep: 3
groundInterpolate: 1
groundUpdateEvery: 2
+ constrainToWaterSurface: 1
+ waterLevelY: 0
+ waterSurfaceOffset: 0.002
+ waterSampleStep: 2
+ waterInterpolate: 1
+ waterUpdateEvery: 1
+ waterPostConstraintIterations: 2
renderSubdivisionsIdle: 6
renderSubdivisionsMoving: 2
movingSpeedThreshold: 2
@@ -7041,12 +7233,15 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c0403ffd74ce46fab8bd4ef057e51432, type: 3}
m_Name:
m_EditorClassIdentifier:
+ ConfigId: 0
+ LineType: 0
isLureConnect: 0
rodLine: {fileID: 3802146767125466631}
fishingRope: {fileID: 8143692206562876326}
bobberRope: {fileID: 8144174056997036318}
Lure: {fileID: 7647511515837834160}
Bobber: {fileID: 6135364979465448005}
+ PinchController: {fileID: 0}
--- !u!120 &8160521079362017971
LineRenderer:
serializedVersion: 2
@@ -7157,22 +7352,6 @@ LineRenderer:
m_UseWorldSpace: 1
m_Loop: 0
m_ApplyActiveColorSpace: 1
---- !u!1 &8188637675592362683
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 269017554130809855}
- m_Layer: 0
- m_Name: _waterline
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!224 &8263689906767965056
RectTransform:
m_ObjectHideFlags: 0
@@ -7452,33 +7631,19 @@ ConfigurableJoint:
m_EnablePreprocessing: 0
m_MassScale: 1
m_ConnectedMassScale: 1
---- !u!54 &8380770180143436832
-Rigidbody:
+--- !u!114 &8480399148068670222
+MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8129510738604895356}
- serializedVersion: 5
- m_Mass: 0.1
- m_LinearDamping: 5
- m_AngularDamping: 0.1
- 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}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ImplicitCom: 1
- m_ImplicitTensor: 0
- m_UseGravity: 0
- m_IsKinematic: 0
- m_Interpolate: 0
- m_Constraints: 0
- m_CollisionDetection: 2
+ m_GameObject: {fileID: 6402992688642991981}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 93df890e998f472382e1234d4cee6cf5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Assembly-CSharp::SimpleWaterSurfaceProvider
+ waterLevel: 0
--- !u!120 &8514482975972367959
LineRenderer:
serializedVersion: 2
@@ -7679,6 +7844,20 @@ MonoBehaviour:
Probe:
- _Weight: 1
_Position: {x: 0, y: 0, z: 0}
+--- !u!114 &8828354455312101551
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6403200268267948197}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1de1bec90e454664a860c5248170ff95, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Assembly-CSharp::NBF.JointPinchController
+ moveSpeed: 5
+ snapDistance: 0.1
--- !u!114 &8892033575196621664
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -7861,21 +8040,20 @@ LineRenderer:
m_UseWorldSpace: 1
m_Loop: 0
m_ApplyActiveColorSpace: 1
---- !u!4 &9066712976035742038
-Transform:
+--- !u!114 &9036762790650551082
+MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 167656693566734254}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.055, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 584816677121546027}
- m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
+ m_GameObject: {fileID: 6402298104626586630}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8e9411b5edc6466a8014c59e3821bbaa, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Assembly-CSharp::NBF.BobberController
+ _rbody: {fileID: 6350068121866578306}
+ joint: {fileID: 6556419073564156073}
--- !u!1 &9157164589531290079
GameObject:
m_ObjectHideFlags: 0
@@ -7916,23 +8094,6 @@ MonoBehaviour:
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
---- !u!1 &9204150256481453776
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 530731981639178553}
- - component: {fileID: 2238779523277448163}
- m_Layer: 0
- m_Name: _stick
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@@ -7941,12 +8102,10 @@ SceneRoots:
- {fileID: 203844589}
- {fileID: 3065509872725565573}
- {fileID: 8114378222086924161}
+ - {fileID: 6399656922482562798}
- {fileID: 1518432889}
- {fileID: 909052972}
- {fileID: 668361904}
- - {fileID: 154764977}
- - {fileID: 389927712696538647}
- - {fileID: 7542518911993633412}
- {fileID: 5388330205210097294}
- {fileID: 820800910}
- {fileID: 1876288045}
diff --git a/Assets/Scripts/Fishing/Rope/Rope.cs b/Assets/Scripts/Fishing/Rope/Rope.cs
index 9dc6f3bf1..019fd2a36 100644
--- a/Assets/Scripts/Fishing/Rope/Rope.cs
+++ b/Assets/Scripts/Fishing/Rope/Rope.cs
@@ -85,6 +85,12 @@ public class Rope : MonoBehaviour
[SerializeField, Range(1, 8), Tooltip("每隔多少次FixedUpdate更新一次水面约束")]
private int waterUpdateEvery = 1;
+ [SerializeField, Range(0f, 1f), Tooltip("水面约束抬升强度(每次更新的插值强度),越小越渐进")]
+ private float waterLiftStrength = 0.25f;
+
+ [SerializeField, Tooltip("startAnchor 在水下时,让其相邻端节点强制跟随 startAnchor,避免被抬到水面导致脱离")]
+ private bool keepStartAdjacentNodeFollow = true;
+
[SerializeField, Range(0, 8), Tooltip("水面约束后,再做几次长度约束,减少局部折角")]
private int waterPostConstraintIterations = 2;
@@ -201,6 +207,7 @@ public class Rope : MonoBehaviour
waterSampleStep = Mathf.Max(1, waterSampleStep);
waterUpdateEvery = Mathf.Max(1, waterUpdateEvery);
waterSurfaceOffset = Mathf.Max(0f, waterSurfaceOffset);
+ waterLiftStrength = Mathf.Clamp01(waterLiftStrength);
waterPostConstraintIterations = Mathf.Clamp(waterPostConstraintIterations, 0, 8);
}
@@ -630,16 +637,18 @@ public class Rope : MonoBehaviour
int step = Mathf.Max(1, waterSampleStep);
float surfaceY = waterLevelY + waterSurfaceOffset;
+ bool startUnderWater = _pCurr[0].y < surfaceY;
+ int startAdjacentIdx = GetStartAdjacentNodeIndex(last);
int prevSampleIdx = 1;
float prevSurfaceY = surfaceY;
- ApplyWaterSurface(prevSampleIdx, prevSurfaceY);
+ ApplyWaterSurface(prevSampleIdx, prevSurfaceY, startUnderWater, startAdjacentIdx);
for (int i = 1 + step; i < last; i += step)
{
float nextSurfaceY = surfaceY;
- ApplyWaterSurface(i, nextSurfaceY);
+ ApplyWaterSurface(i, nextSurfaceY, startUnderWater, startAdjacentIdx);
if (waterInterpolate)
{
@@ -651,13 +660,13 @@ public class Rope : MonoBehaviour
int idx = a + j;
float t = j / (float)span;
float y = Mathf.Lerp(prevSurfaceY, nextSurfaceY, t);
- ApplyWaterSurface(idx, y);
+ ApplyWaterSurface(idx, y, startUnderWater, startAdjacentIdx);
}
}
else
{
for (int idx = prevSampleIdx + 1; idx < i; idx++)
- ApplyWaterSurface(idx, prevSurfaceY);
+ ApplyWaterSurface(idx, prevSurfaceY, startUnderWater, startAdjacentIdx);
}
prevSampleIdx = i;
@@ -665,20 +674,38 @@ public class Rope : MonoBehaviour
}
for (int i = prevSampleIdx + 1; i < last; i++)
- ApplyWaterSurface(i, prevSurfaceY);
+ ApplyWaterSurface(i, prevSurfaceY, startUnderWater, startAdjacentIdx);
}
- private void ApplyWaterSurface(int i, float surfaceY)
+ private int GetStartAdjacentNodeIndex(int last)
{
+ if (last <= 1) return 1;
+
+ Vector3 s = _pCurr[0];
+ float d1 = (_pCurr[1] - s).sqrMagnitude;
+ float d2 = (_pCurr[last - 1] - s).sqrMagnitude;
+ return d1 <= d2 ? 1 : last - 1;
+ }
+
+ private void ApplyWaterSurface(int i, float surfaceY, bool startUnderWater, int startAdjacentIdx)
+ {
+ if (keepStartAdjacentNodeFollow && startUnderWater && i == startAdjacentIdx)
+ {
+ Vector3 s = _pCurr[0];
+ _pCurr[i] = s;
+ _pPrev[i] = s;
+ return;
+ }
+
Vector3 p = _pCurr[i];
if (p.y < surfaceY)
{
- p.y = surfaceY;
+ p.y = Mathf.Lerp(p.y, surfaceY, waterLiftStrength);
_pCurr[i] = p;
- // 同步 prev,杀掉向下惯性,避免反复穿透水面
+ // 渐进同步 prev,削弱向下惯性,避免反复穿透水面
Vector3 prev = _pPrev[i];
- if (prev.y < surfaceY) prev.y = surfaceY;
+ if (prev.y < p.y) prev.y = Mathf.Lerp(prev.y, p.y, waterLiftStrength);
_pPrev[i] = prev;
}
}
@@ -798,4 +825,4 @@ public class Rope : MonoBehaviour
for (int i = 0; i < _physicsNodes; i++)
Gizmos.DrawSphere(_pCurr[i], 0.01f);
}
-}
\ No newline at end of file
+}
diff --git a/Assets/Scripts/Test/New/BobberPresentationController.cs b/Assets/Scripts/Test/New/BobberPresentationController.cs
index 66654ac52..fe9ba80e9 100644
--- a/Assets/Scripts/Test/New/BobberPresentationController.cs
+++ b/Assets/Scripts/Test/New/BobberPresentationController.cs
@@ -1,5 +1,7 @@
using UnityEngine;
+using WaveHarmonic.Crest;
+
///
/// 简单水面接口。你可以替换成自己的水系统。
///
@@ -26,10 +28,10 @@ public enum BobberControlMode
public enum BobberBiteType
{
None,
- Tap, // 轻点
- SlowSink, // 缓沉
- Lift, // 送漂
- BlackDrift // 黑漂/快速拖入
+ Tap, // 轻点
+ SlowSink, // 缓沉
+ Lift, // 送漂
+ BlackDrift // 黑漂/快速拖入
}
public enum BobberPosture
@@ -43,135 +45,106 @@ public enum BobberPosture
[RequireComponent(typeof(Rigidbody))]
public class BobberPresentationController : MonoBehaviour
{
- [Header("Water")]
- [Tooltip("没有水提供器时使用固定水位")]
+ [Header("Water")] [Tooltip("没有水提供器时使用固定水位")]
public float fallbackWaterLevel = 0f;
+ [Tooltip("Crest 水体。为空时会尝试从 SceneSettings 读取")]
+ public WaterRenderer waterRenderer;
+
+ [Tooltip("Crest 查询层级")] public CollisionLayer waterCollisionLayer = CollisionLayer.AfterAnimatedWaves;
+
+ [Tooltip("Crest 波面查询宽度(参考 BobberFloating)")]
+ public float waterQueryObjectWidth = 0.5f;
+
[Tooltip("可选:挂实现了 IWaterSurfaceProvider 的组件")]
public MonoBehaviour waterProviderBehaviour;
- [Header("Enter Water")]
- [Tooltip("底部进入水面多少米后切换为漂像控制")]
+ [Header("Enter Water")] [Tooltip("底部进入水面多少米后切换为漂像控制")]
public float enterWaterDepth = 0.002f;
- [Tooltip("离开水面多少米后回到空中物理。一般给负值做滞回")]
- public float exitWaterDepth = -0.01f;
+ [Tooltip("离开水面多少米后回到空中物理。一般给负值做滞回")] public float exitWaterDepth = -0.01f;
- [Header("Geometry")]
- [Tooltip("浮漂总高度(米)")]
+ [Header("Geometry")] [Tooltip("浮漂总高度(米)")]
public float floatHeight = 0.08f;
[Tooltip("如果 Pivot 在浮漂底部,这里填 0;如果 Pivot 在模型中心,就填底部相对 Pivot 的本地 Y")]
public float bottomOffsetLocalY = 0f;
- [Header("Base Float")]
- [Tooltip("基础吃铅比例,决定静止时有多少在水下")]
- [Range(0.05f, 0.95f)]
+ [Header("Base Float")] [Tooltip("基础吃铅比例,决定静止时有多少在水下")] [Range(0.05f, 0.95f)]
public float baseSubmergeRatio = 0.28f;
- [Tooltip("Y 轴平滑时间,越小响应越快")]
- public float ySmoothTime = 0.08f;
+ [Tooltip("Y 轴平滑时间,越小响应越快")] public float ySmoothTime = 0.08f;
- [Tooltip("最大竖直速度限制(用于 SmoothDamp)")]
- public float maxYSpeed = 2f;
+ [Tooltip("最大竖直速度限制(用于 SmoothDamp)")] public float maxYSpeed = 2f;
- [Tooltip("静止小死区,减少微抖")]
- public float yDeadZone = 0.0005f;
+ [Tooltip("静止小死区,减少微抖")] public float yDeadZone = 0.0005f;
- [Header("Surface Motion")]
- [Tooltip("是否启用轻微水面起伏")]
+ [Header("Surface Motion")] [Tooltip("是否启用轻微水面起伏")]
public bool enableSurfaceBobbing = true;
- [Tooltip("水面轻微起伏振幅(米)")]
- public float surfaceBobAmplitude = 0.0015f;
+ [Tooltip("水面轻微起伏振幅(米)")] public float surfaceBobAmplitude = 0.0015f;
- [Tooltip("水面轻微起伏频率")]
- public float surfaceBobFrequency = 1.2f;
+ [Tooltip("水面轻微起伏频率")] public float surfaceBobFrequency = 1.2f;
- [Header("XZ Motion")]
- [Tooltip("入水后是否锁定 XZ 到入水点附近")]
+ [Header("XZ Motion")] [Tooltip("入水后是否锁定 XZ 到入水点附近")]
public bool lockXZAroundAnchor = true;
- [Tooltip("XZ 跟随平滑时间")]
- public float xzSmoothTime = 0.15f;
+ [Tooltip("XZ 跟随平滑时间")] public float xzSmoothTime = 0.15f;
- [Tooltip("水流/拖拽带来的额外平面偏移最大值")]
- public float maxPlanarOffset = 0.15f;
+ [Tooltip("水流/拖拽带来的额外平面偏移最大值")] public float maxPlanarOffset = 0.15f;
- [Header("Sink By Weight / Tension")]
- [Tooltip("外部向下拉力映射为下沉量的系数。你可以把钩/铅/线组的等效向下拉力喂进来")]
+ [Header("Sink By Weight / Tension")] [Tooltip("外部向下拉力映射为下沉量的系数。你可以把钩/铅/线组的等效向下拉力喂进来")]
public float downForceToSink = 0.0025f;
- [Tooltip("向下拉力下沉的最大附加量")]
- public float maxExtraSink = 0.08f;
+ [Tooltip("向下拉力下沉的最大附加量")] public float maxExtraSink = 0.08f;
- [Header("Bottom Touch")]
- [Tooltip("触底时是否启用修正")]
+ [Header("Bottom Touch")] [Tooltip("触底时是否启用修正")]
public bool enableBottomTouchAdjust = true;
- [Tooltip("触底后减少的下沉量(例如铅坠到底,漂会回升一点)")]
- public float bottomTouchLift = 0.01f;
+ [Tooltip("触底后减少的下沉量(例如铅坠到底,漂会回升一点)")] public float bottomTouchLift = 0.01f;
- [Header("Posture Source")]
- [Tooltip("下方 Lure / 钩组 / 铅坠的刚体。姿态主要根据它和浮漂的相对位置判断")]
+ [Header("Posture Source")] [Tooltip("下方 Lure / 钩组 / 铅坠的刚体。姿态主要根据它和浮漂的相对位置判断")]
public Rigidbody lureBody;
[Tooltip("用于归一化的参考长度。一般填:浮漂到 Lure 在“正常拉直”时的大致长度")]
public float referenceLength = 0.30f;
- [Header("Posture Threshold")]
- [Tooltip("最小入水比例。不够时优先躺漂")]
+ [Header("Posture Threshold")] [Tooltip("最小入水比例。不够时优先躺漂")]
public float minSubmergeToStand = 0.16f;
- [Tooltip("垂直分量比低于该值时,优先躺漂")]
- public float verticalLieThreshold = 0.18f;
+ [Tooltip("垂直分量比低于该值时,优先躺漂")] public float verticalLieThreshold = 0.18f;
- [Tooltip("垂直分量比高于该值,且水平分量较小时,允许立漂")]
- public float verticalUprightThreshold = 0.75f;
+ [Tooltip("垂直分量比高于该值,且水平分量较小时,允许立漂")] public float verticalUprightThreshold = 0.75f;
- [Tooltip("水平分量比高于该值时,不允许完全立漂")]
- public float planarTiltThreshold = 0.30f;
+ [Tooltip("水平分量比高于该值时,不允许完全立漂")] public float planarTiltThreshold = 0.30f;
- [Tooltip("水平分量明显大于垂直分量时,优先躺漂")]
- public float planarDominanceMultiplier = 1.20f;
+ [Tooltip("水平分量明显大于垂直分量时,优先躺漂")] public float planarDominanceMultiplier = 1.20f;
- [Tooltip("姿态切换滞回")]
- public float postureHysteresis = 0.04f;
+ [Tooltip("姿态切换滞回")] public float postureHysteresis = 0.04f;
- [Header("Posture Rotation")]
- [Tooltip("倾斜状态角度")]
+ [Header("Posture Rotation")] [Tooltip("倾斜状态角度")]
public float tiltedAngle = 38f;
- [Tooltip("躺漂角度")]
- public float lyingAngle = 88f;
+ [Tooltip("躺漂角度")] public float lyingAngle = 88f;
- [Tooltip("立漂时允许的最大附加倾角")]
- public float uprightMaxTiltAngle = 8f;
+ [Tooltip("立漂时允许的最大附加倾角")] public float uprightMaxTiltAngle = 8f;
- [Tooltip("平面方向对立漂/斜漂附加倾角的影响强度")]
- public float planarTiltFactor = 120f;
+ [Tooltip("平面方向对立漂/斜漂附加倾角的影响强度")] public float planarTiltFactor = 120f;
- [Tooltip("姿态平滑速度")]
- public float rotationLerpSpeed = 8f;
+ [Tooltip("姿态平滑速度")] public float rotationLerpSpeed = 8f;
- [Header("Debug Input")]
- [Tooltip("调试:按 R 恢复默认")]
+ [Header("Debug Input")] [Tooltip("调试:按 R 恢复默认")]
public bool debugResetKey = true;
- [Tooltip("调试:按 T 触发轻点")]
- public bool debugTapKey = true;
+ [Tooltip("调试:按 T 触发轻点")] public bool debugTapKey = true;
- [Tooltip("调试:按 G 触发缓沉")]
- public bool debugSlowSinkKey = true;
+ [Tooltip("调试:按 G 触发缓沉")] public bool debugSlowSinkKey = true;
- [Tooltip("调试:按 H 触发送漂")]
- public bool debugLiftKey = true;
+ [Tooltip("调试:按 H 触发送漂")] public bool debugLiftKey = true;
- [Tooltip("调试:按 B 触发黑漂")]
- public bool debugBlackDriftKey = true;
+ [Tooltip("调试:按 B 触发黑漂")] public bool debugBlackDriftKey = true;
- [Header("Debug")]
- public bool drawDebug = false;
+ [Header("Debug")] public bool drawDebug = false;
public BobberControlMode CurrentMode => _mode;
public BobberPosture CurrentPosture => _posture;
@@ -218,6 +191,12 @@ public class BobberPresentationController : MonoBehaviour
private float _verticalDistance;
private float _planarDistance;
+ private bool _hasCrestSampleThisFrame;
+ private readonly Vector3[] _waterQueryPoints = new Vector3[1];
+ private readonly Vector3[] _waterQueryResultDisplacements = new Vector3[1];
+ private readonly Vector3[] _waterQueryResultVelocities = new Vector3[1];
+ private readonly Vector3[] _waterQueryResultNormal = new Vector3[1];
+
private void Awake()
{
_rb = GetComponent();
@@ -229,6 +208,9 @@ public class BobberPresentationController : MonoBehaviour
if (waterProviderBehaviour != null)
_waterProvider = waterProviderBehaviour as IWaterSurfaceProvider;
+ if (waterRenderer == null && SceneSettings.Instance != null)
+ waterRenderer = SceneSettings.Instance.Water;
+
_targetRotation = transform.rotation;
}
@@ -404,7 +386,7 @@ public class BobberPresentationController : MonoBehaviour
}
float surfaceBob = 0f;
- if (enableSurfaceBobbing)
+ if (enableSurfaceBobbing && !_hasCrestSampleThisFrame)
{
surfaceBob = Mathf.Sin(Time.time * surfaceBobFrequency * Mathf.PI * 2f) * surfaceBobAmplitude;
}
@@ -701,6 +683,7 @@ public class BobberPresentationController : MonoBehaviour
float k = (t - 0.35f) / 0.65f;
targetOffset = -Mathf.Lerp(_biteAmplitude, 0f, k);
}
+
break;
case BobberBiteType.SlowSink:
@@ -742,7 +725,35 @@ public class BobberPresentationController : MonoBehaviour
private float GetWaterHeight(Vector3 worldPos)
{
- return _waterProvider != null ? _waterProvider.GetWaterHeight(worldPos) : fallbackWaterLevel;
+ if (_waterProvider != null)
+ {
+ _hasCrestSampleThisFrame = false;
+ return _waterProvider.GetWaterHeight(worldPos);
+ }
+
+ if (
+ waterRenderer != null
+ && waterRenderer.AnimatedWavesLod != null
+ && waterRenderer.AnimatedWavesLod.Provider != null
+ )
+ {
+ _waterQueryPoints[0] = worldPos;
+ waterRenderer.AnimatedWavesLod.Provider.Query(
+ GetHashCode(),
+ Mathf.Max(0.001f, waterQueryObjectWidth),
+ _waterQueryPoints,
+ _waterQueryResultDisplacements,
+ _waterQueryResultNormal,
+ _waterQueryResultVelocities,
+ waterCollisionLayer
+ );
+
+ _hasCrestSampleThisFrame = true;
+ return _waterQueryResultDisplacements[0].y + waterRenderer.SeaLevel;
+ }
+
+ _hasCrestSampleThisFrame = false;
+ return fallbackWaterLevel;
}
private Vector3 GetBottomWorldPosition()
@@ -821,6 +832,7 @@ public class BobberPresentationController : MonoBehaviour
maxExtraSink = Mathf.Max(0f, maxExtraSink);
surfaceBobAmplitude = Mathf.Max(0f, surfaceBobAmplitude);
surfaceBobFrequency = Mathf.Max(0f, surfaceBobFrequency);
+ waterQueryObjectWidth = Mathf.Max(0.001f, waterQueryObjectWidth);
yDeadZone = Mathf.Max(0f, yDeadZone);
referenceLength = Mathf.Max(0.0001f, referenceLength);
@@ -839,4 +851,4 @@ public class BobberPresentationController : MonoBehaviour
#endif
#endregion
-}
\ No newline at end of file
+}
diff --git a/Assets/Water2.mat b/Assets/Water2.mat
new file mode 100644
index 000000000..8d268b71a
--- /dev/null
+++ b/Assets/Water2.mat
@@ -0,0 +1,256 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-8686106315147607512
+MonoBehaviour:
+ m_ObjectHideFlags: 11
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Unity.RenderPipelines.HighDefinition.Editor::UnityEditor.Rendering.HighDefinition.AssetVersion
+ version: 13
+ hdPluginSubTargetMaterialVersions:
+ m_Keys: []
+ m_Values:
+--- !u!114 &-8485023484760234584
+MonoBehaviour:
+ m_ObjectHideFlags: 11
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+ version: 10
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Water2
+ m_Shader: {fileID: -6465566751694194690, guid: 00ffe7d0b7161420897069dc6e12822c, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords:
+ - _ALPHATEST_ON
+ - _BUILTIN_ALPHATEST_ON
+ - _BUILTIN_AlphaClip
+ - _BUILTIN_SURFACE_TYPE_TRANSPARENT
+ - _DOUBLESIDED_ON
+ - _ENABLE_FOG_ON_TRANSPARENT
+ - _REFRACTION_PLANE
+ - _SURFACE_TYPE_TRANSPARENT
+ - _TRANSPARENT_WRITES_MOTION_VEC
+ m_InvalidKeywords: []
+ m_LightmapFlags: 2
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 1
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ MotionVector: User
+ RenderType: Transparent
+ disabledShaderPasses:
+ - SHADOWCASTER
+ - MOTIONVECTORS
+ - TransparentDepthPostpass
+ - TransparentBackface
+ - RayTracingPrepass
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _Crest_CausticsDistortionTexture:
+ m_Texture: {fileID: 2800000, guid: 7aa3f69cfb40b429a865c45a7271c5f5, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Crest_CausticsTexture:
+ m_Texture: {fileID: 2800000, guid: 1407209016967410da2ae6fdd4d97fc6, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Crest_FoamTexture:
+ m_Texture: {fileID: 2800000, guid: 959dd0505e2c54585865f51257daa0e3, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _Crest_NormalMapTexture:
+ m_Texture: {fileID: 2800000, guid: 7aa3f69cfb40b429a865c45a7271c5f5, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_Lightmaps:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_LightmapsInd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - unity_ShadowMasks:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - CREST_FLOW: 0
+ - _AddPrecomputedVelocity: 0
+ - _AlphaClip: 1
+ - _AlphaCutoffEnable: 1
+ - _AlphaDstBlend: 10
+ - _AlphaSrcBlend: 1
+ - _AlphaToMask: 0
+ - _BUILTIN_AlphaClip: 1
+ - _BUILTIN_Blend: 0
+ - _BUILTIN_CullMode: 0
+ - _BUILTIN_DstBlend: 10
+ - _BUILTIN_QueueControl: 0
+ - _BUILTIN_QueueOffset: 0
+ - _BUILTIN_SrcBlend: 5
+ - _BUILTIN_Surface: 1
+ - _BUILTIN_TransparentReceiveShadows: 1
+ - _BUILTIN_WorkflowMode: 1
+ - _BUILTIN_ZTest: 4
+ - _BUILTIN_ZWrite: 1
+ - _BUILTIN_ZWriteControl: 1
+ - _Blend: 0
+ - _BlendMode: 0
+ - _BlendModePreserveSpecular: 0
+ - _CastShadows: 0
+ - _ConservativeDepthOffsetEnable: 0
+ - _Crest_AlbedoEnabled: 0
+ - _Crest_AlbedoIgnoreFoam: 1
+ - _Crest_AmbientTerm: 1
+ - _Crest_Anisotropy: 0.5
+ - _Crest_BUILTIN_ShadowCasterZTest: 4
+ - _Crest_CausticsDepthOfField: 6
+ - _Crest_CausticsDistortionScale: 250
+ - _Crest_CausticsDistortionStrength: 0.16
+ - _Crest_CausticsEnabled: 1
+ - _Crest_CausticsFocalDepth: 2
+ - _Crest_CausticsMotionBlur: 1
+ - _Crest_CausticsScrollSpeed: 1
+ - _Crest_CausticsStrength: 3.2
+ - _Crest_CausticsTextureAverage: 0.07
+ - _Crest_CausticsTextureScale: 50
+ - _Crest_DirectTerm: 1
+ - _Crest_FoamEnabled: 1
+ - _Crest_FoamFeather: 0.75
+ - _Crest_FoamIntensityAlbedo: 1
+ - _Crest_FoamNormalStrength: 1
+ - _Crest_FoamScale: 5
+ - _Crest_FoamScrollSpeed: 1
+ - _Crest_FoamSmoothness: 0.7
+ - _Crest_MinimumReflectionDirectionY: 0.03
+ - _Crest_NormalMapEnabled: 1
+ - _Crest_NormalMapScale: 3
+ - _Crest_NormalMapScrollSpeed: 1
+ - _Crest_NormalMapStrength: 0.15
+ - _Crest_NormalsStrengthOverall: 1
+ - _Crest_Occlusion: 1
+ - _Crest_OcclusionUnderwater: 0
+ - _Crest_PlanarReflectionsDistortion: 1
+ - _Crest_PlanarReflectionsEnabled: 0
+ - _Crest_PlanarReflectionsIntensity: 1
+ - _Crest_PlanarReflectionsRoughness: 1
+ - _Crest_RefractionStrength: 1
+ - _Crest_RefractiveIndexOfWater: 1.33
+ - _Crest_SSSDirectionalFalloff: 2
+ - _Crest_SSSEnabled: 0
+ - _Crest_SSSIntensity: 3
+ - _Crest_SSSPinchFalloff: 1.5
+ - _Crest_SSSPinchMaximum: 1.67
+ - _Crest_SSSPinchMinimum: 0.57
+ - _Crest_ShadowCasterThreshold: 0.5
+ - _Crest_ShadowsAffectsAmbientFactor: 0.5
+ - _Crest_ShadowsEnabled: 1
+ - _Crest_Smoothness: 0.9
+ - _Crest_SmoothnessFalloff: 0.5
+ - _Crest_SmoothnessFar: 0.8
+ - _Crest_SmoothnessFarDistance: 4000
+ - _Crest_Specular: 0.25
+ - _Crest_TotalInternalReflectionIntensity: 0.8
+ - _Crest_Version: 0
+ - _Cull: 0
+ - _CullMode: 0
+ - _CullModeForward: 0
+ - _DepthOffsetEnable: 0
+ - _DoubleSidedEnable: 1
+ - _DoubleSidedGIMode: 0
+ - _DoubleSidedNormalMode: 2
+ - _DstBlend: 10
+ - _DstBlend2: 10
+ - _DstBlendAlpha: 10
+ - _EnableBlendModePreserveSpecularLighting: 0
+ - _EnableFogOnTransparent: 1
+ - _ExcludeFromTUAndAA: 0
+ - _MaterialID: 1
+ - _MaterialTypeMask: 18
+ - _OpaqueCullMode: 2
+ - _PerPixelSorting: 0
+ - _QueueControl: 0
+ - _QueueOffset: 0
+ - _RayTracing: 0
+ - _ReceiveShadows: 1
+ - _ReceivesSSR: 1
+ - _ReceivesSSRTransparent: 1
+ - _RefractionModel: 1
+ - _RenderQueueType: 4
+ - _RequireSplitLighting: 0
+ - _SrcBlend: 5
+ - _SrcBlendAlpha: 1
+ - _StencilRef: 0
+ - _StencilRefDepth: 24
+ - _StencilRefDistortionVec: 4
+ - _StencilRefGBuffer: 10
+ - _StencilRefMV: 40
+ - _StencilWriteMask: 6
+ - _StencilWriteMaskDepth: 25
+ - _StencilWriteMaskDistortionVec: 4
+ - _StencilWriteMaskGBuffer: 15
+ - _StencilWriteMaskMV: 41
+ - _SupportDecals: 1
+ - _Surface: 1
+ - _SurfaceType: 1
+ - _TransmissionEnable: 1
+ - _TransparentBackfaceEnable: 0
+ - _TransparentCullMode: 2
+ - _TransparentDepthPostpassEnable: 0
+ - _TransparentDepthPrepassEnable: 0
+ - _TransparentSortPriority: 0
+ - _TransparentWritingMotionVec: 1
+ - _TransparentZWrite: 1
+ - _UseShadowThreshold: 0
+ - _WorkflowMode: 1
+ - _ZTest: 4
+ - _ZTestDepthEqualForOpaque: 4
+ - _ZTestGBuffer: 3
+ - _ZTestTransparent: 4
+ - _ZWrite: 1
+ - _ZWriteControl: 1
+ m_Colors:
+ - _Crest_Absorption: {r: 0.70086163, g: 0.236999, b: 0.106051564, a: 1}
+ - _Crest_AbsorptionColor: {r: 0.34162676, g: 0.6954546, b: 0.85, a: 0.1019608}
+ - _Crest_Scattering: {r: 0, g: 0.09803919, b: 0.19999996, a: 1}
+ - _DoubleSidedConstants: {r: 1, g: 1, b: 1, a: 0}
+ - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+ m_BuildTextureStacks: []
+ m_AllowLocking: 1
+--- !u!114 &5462340382208678671
+MonoBehaviour:
+ m_ObjectHideFlags: 11
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 639247ca83abc874e893eb93af2b5e44, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Unity.ShaderGraph.Editor::UnityEditor.Rendering.BuiltIn.AssetVersion
+ version: 0
diff --git a/Assets/Water2.mat.meta b/Assets/Water2.mat.meta
new file mode 100644
index 000000000..311a77dba
--- /dev/null
+++ b/Assets/Water2.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c45c61012a9f980468bfce0c6f6f5f54
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/com.waveharmonic.crest/Runtime/Materials/Water Volume.mat b/Packages/com.waveharmonic.crest/Runtime/Materials/Water Volume.mat
index ca31a78d1..8ec8d0d9c 100644
--- a/Packages/com.waveharmonic.crest/Runtime/Materials/Water Volume.mat
+++ b/Packages/com.waveharmonic.crest/Runtime/Materials/Water Volume.mat
@@ -15,11 +15,14 @@ Material:
- d_Crest_NoMaskDepth
- d_Dithering
m_InvalidKeywords:
+ - CREST_CAUSTICS_ON
+ - CREST_FOAM_ON
- _ALPHATEST_ON
- _BUILTIN_ALPHATEST_ON
- _BUILTIN_AlphaClip
- _BUILTIN_SURFACE_TYPE_TRANSPARENT
- _DOUBLESIDED_ON
+ - _EMISSION
- _ENABLE_FOG_ON_TRANSPARENT
- _REFRACTION_PLANE
- _SURFACE_TYPE_TRANSPARENT
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index d5c5cab1b..b69cfff0e 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -843,7 +843,7 @@ PlayerSettings:
QNX: TextMeshPro;UNITY_VISUAL_SCRIPTING;ES3_TMPRO;ES3_UGUI;ENVIRO_3;ENVIRO_URP;UNITY_POST_PROCESSING_STACK_V2;DotSpatial
ReservedCFE: TextMeshPro;ENVIRO_3;ENVIRO_URP;UNITY_POST_PROCESSING_STACK_V2;DotSpatial
Server: UNITY_VISUAL_SCRIPTING;ES3_TMPRO;ES3_UGUI
- Standalone: CINEMACHINE_URP;FAIRYGUI_TMPRO;OBI_ONI_SUPPORTED;TextMeshPro;UNITY_VISUAL_SCRIPTING;ES3_TMPRO;ES3_UGUI;STEAMWORKS_NET;ENVIRO_3;ENVIRO_URP;VLB_URP;UPPipeline;__MICROSPLAT__;__MICROSPLAT_SNOW__;__MICROSPLAT_ALPHAHOLE__;__MICROSPLAT_MESH__;__MICROSPLAT_STREAMS__;__MICROSPLAT_GLOBALTEXTURE__;__MICROSPLAT_TRAX__;__MICROSPLAT_DECAL__;__MICROSPLAT_SCATTER__;__MICROSPLAT_TEXTURECLUSTERS__;__MICROSPLAT_MESHTERRAIN__;__MICROSPLAT_DETAILRESAMPLE__;__MICROSPLAT_TERRAINBLEND__;__MICROSPLAT_TESSELLATION__;__MICROSPLAT_WINDGLITTER__;__MICROSPLAT_LOWPOLY__;__MICROSPLAT_OBJECTSHADER__;__MICROSPLAT_PROCTEX__;__MICROSPLAT_TRIPLANAR__;__MICROSPLAT_MICROVERSEPREVIEW__;UNITY_POST_PROCESSING_STACK_V2;DotSpatial;FANTASY_UNITY;KWS_HD_MODULE_INSTALLED;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;KWS_URP;NWH_DWP2;GAIA_CINEMACHINE;GAIA_INPUT_SYSTEM;GAIA_2023;GAIA_2023_PRO;GAIA_MESH_PRESENT;GTS_PRESENT;GeNa_URP;GENA_PRO
+ Standalone: CINEMACHINE_URP;FAIRYGUI_TMPRO;OBI_ONI_SUPPORTED;TextMeshPro;UNITY_VISUAL_SCRIPTING;ES3_TMPRO;ES3_UGUI;STEAMWORKS_NET;ENVIRO_3;ENVIRO_URP;VLB_URP;UPPipeline;__MICROSPLAT__;__MICROSPLAT_SNOW__;__MICROSPLAT_ALPHAHOLE__;__MICROSPLAT_MESH__;__MICROSPLAT_STREAMS__;__MICROSPLAT_GLOBALTEXTURE__;__MICROSPLAT_TRAX__;__MICROSPLAT_DECAL__;__MICROSPLAT_SCATTER__;__MICROSPLAT_TEXTURECLUSTERS__;__MICROSPLAT_MESHTERRAIN__;__MICROSPLAT_DETAILRESAMPLE__;__MICROSPLAT_TERRAINBLEND__;__MICROSPLAT_TESSELLATION__;__MICROSPLAT_WINDGLITTER__;__MICROSPLAT_LOWPOLY__;__MICROSPLAT_OBJECTSHADER__;__MICROSPLAT_PROCTEX__;__MICROSPLAT_TRIPLANAR__;__MICROSPLAT_MICROVERSEPREVIEW__;UNITY_POST_PROCESSING_STACK_V2;DotSpatial;FANTASY_UNITY;KWS_HD_MODULE_INSTALLED;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;KWS_URP;GAIA_INPUT_SYSTEM
VisionOS: TextMeshPro;UNITY_VISUAL_SCRIPTING;ES3_TMPRO;ES3_UGUI;ENVIRO_3;ENVIRO_URP;UNITY_POST_PROCESSING_STACK_V2;DotSpatial
WebGL: TextMeshPro;UNITY_VISUAL_SCRIPTING;ES3_TMPRO;ES3_UGUI;ENVIRO_3;ENVIRO_URP;UNITY_POST_PROCESSING_STACK_V2;DotSpatial
Windows Store Apps: UNITY_VISUAL_SCRIPTING;ES3_TMPRO;ES3_UGUI;DotSpatial
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 1b9dc4506..17049aaa0 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -18,26 +18,26 @@ EditorUserSettings:
value: 5606515f5605500b0e5c5c2615760a444615487c2a2a2467297d1932b7e4673a
flags: 0
RecentlyUsedSceneGuid-3:
- value: 0054045155060d5a5c575f7045270d44474f4e7c7f7924637e2a1832b1b5636d
- flags: 0
- RecentlyUsedSceneGuid-4:
value: 0608045752515c5d54580e7b167306444e4e1a7e2e7b71357c2d4b36e0b9656c
flags: 0
- RecentlyUsedSceneGuid-5:
+ RecentlyUsedSceneGuid-4:
value: 00050c5150005f5f54560f2640270d4410161c28282b72357e7c4835e4b63760
flags: 0
- RecentlyUsedSceneGuid-6:
+ RecentlyUsedSceneGuid-5:
value: 5302035e5c530f0b5c0c557416270d44134e4d28787c76332f7e1f6bb1b76169
flags: 0
- RecentlyUsedSceneGuid-7:
+ RecentlyUsedSceneGuid-6:
value: 0508070250545c58585e0924437b5d444f4e4b7f7d7a71627f794c64b2e5633a
flags: 0
- RecentlyUsedSceneGuid-8:
+ RecentlyUsedSceneGuid-7:
value: 5309035757065a0a54575f7216265c4444151d28792e72627d2f1935bbb8673a
flags: 0
- RecentlyUsedSceneGuid-9:
+ RecentlyUsedSceneGuid-8:
value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e
flags: 0
+ RecentlyUsedSceneGuid-9:
+ value: 0054045155060d5a5c575f7045270d44474f4e7c7f7924637e2a1832b1b5636d
+ flags: 0
UnityEditor.ShaderGraph.Blackboard:
value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9afeffa9ffff8e85dd8390e2969e8899daa7
flags: 0