diff --git a/Assets/Scenes/RopeTest.unity b/Assets/Scenes/RopeTest.unity index 5baf0dfe6..3f97e72fc 100644 --- a/Assets/Scenes/RopeTest.unity +++ b/Assets/Scenes/RopeTest.unity @@ -246,6 +246,118 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &305036003 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 305036004} + - component: {fileID: 305036007} + - component: {fileID: 305036006} + - component: {fileID: 305036005} + m_Layer: 15 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &305036004 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 305036003} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.02, y: 0.02, z: 0.02} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1972679229} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &305036005 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 305036003} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &305036006 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 305036003} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &305036007 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 305036003} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &961739749 GameObject: m_ObjectHideFlags: 0 @@ -476,230 +588,83 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1250746685 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1250746686} - - component: {fileID: 1250746689} - - component: {fileID: 1250746688} - - component: {fileID: 1250746687} - m_Layer: 15 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1250746686 +--- !u!4 &1302094367 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 153991853389016720, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + m_PrefabInstance: {fileID: 1672280511} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1250746685} +--- !u!1001 &1672280511 +PrefabInstance: + m_ObjectHideFlags: 0 serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.02, y: 0.02, z: 0.02} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4530253928614098} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1250746687 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1250746685} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1250746688 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1250746685} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1250746689 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1250746685} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1968335314 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1968335315} - - component: {fileID: 1968335318} - - component: {fileID: 1968335317} - - component: {fileID: 1968335316} - m_Layer: 15 - m_Name: Cube (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1968335315 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1386063717907585334, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + propertyPath: m_Name + value: Line1 + objectReference: {fileID: 0} + - target: {fileID: 4162208118158024875, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + propertyPath: m_LocalPosition.x + value: 0.34499 + objectReference: {fileID: 0} + - target: {fileID: 4162208118158024875, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + propertyPath: m_LocalPosition.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4162208118158024875, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + propertyPath: m_LocalPosition.z + value: -0.55092 + objectReference: {fileID: 0} + - target: {fileID: 4162208118158024875, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4162208118158024875, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4162208118158024875, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4162208118158024875, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4162208118158024875, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4162208118158024875, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4162208118158024875, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6741752443570310990, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + propertyPath: anchorTransform + value: + objectReference: {fileID: 2055159199} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 153991853389016720, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + insertIndex: -1 + addedObject: {fileID: 2127675973} + - targetCorrespondingSourceObject: {fileID: 6385925521264460254, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + insertIndex: -1 + addedObject: {fileID: 305036004} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} +--- !u!4 &1972679229 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6385925521264460254, guid: ea6901d8aa7c41d41987d8ca92b02f6d, type: 3} + m_PrefabInstance: {fileID: 1672280511} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1968335314} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.02, y: 0.02, z: 0.02} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4026445415780546} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1968335316 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1968335314} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1968335317 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1968335314} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1968335318 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1968335314} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2055159198 GameObject: m_ObjectHideFlags: 0 @@ -853,14 +818,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5382d66f55f6463cb469c5094b0e7a6b, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::NBF.FishingLineTestController - solver: {fileID: 7888891488109129251} + solver: {fileID: 0} initialFirstSegmentLength: 1.2 minFirstSegmentLength: 0.1 maxFirstSegmentLength: 5 lineAdjustSpeed: 1 extendKey: 273 retractKey: 274 ---- !u!1 &1035053713012879 +--- !u!1 &2127675972 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -868,165 +833,39 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4026445415780546} - - component: {fileID: 54679399358797387} - - component: {fileID: 153611280143742665} - - component: {fileID: 135844594665913934} - - component: {fileID: 3199098294310598083} + - component: {fileID: 2127675973} + - component: {fileID: 2127675976} + - component: {fileID: 2127675975} + - component: {fileID: 2127675974} m_Layer: 15 - m_Name: Lure - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!1 &1387836520666951 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4283455506376388} - - component: {fileID: 7888891488109129251} - m_Layer: 0 - m_Name: Line1 + m_Name: Cube m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1858051426718764 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4530253928614098} - - component: {fileID: 54298865541355944} - - component: {fileID: 153691655873761411} - - component: {fileID: 420085638272326913} - m_Layer: 15 - m_Name: Float - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &4026445415780546 +--- !u!4 &2127675973 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035053713012879} + m_GameObject: {fileID: 2127675972} 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: 1968335315} - m_Father: {fileID: 4283455506376388} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4283455506376388 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1387836520666951} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.02, y: 0.02, z: 0.02} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 796266975745807470} - - {fileID: 4530253928614098} - - {fileID: 4026445415780546} - m_Father: {fileID: 0} + m_Children: [] + m_Father: {fileID: 1302094367} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4530253928614098 -Transform: +--- !u!65 &2127675974 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1858051426718764} - 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: 1250746686} - m_Father: {fileID: 4283455506376388} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &54298865541355944 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1858051426718764} - 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!54 &54679399358797387 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035053713012879} - 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: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 2 ---- !u!135 &135844594665913934 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035053713012879} + m_GameObject: {fileID: 2127675972} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -1039,369 +878,71 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 0.003 - m_Center: {x: 0, y: -0.0015, z: 0} ---- !u!153 &153611280143742665 -ConfigurableJoint: + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &2127675975 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035053713012879} - serializedVersion: 4 - m_ConnectedBody: {fileID: 54298865541355944} - 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!153 &153691655873761411 -ConfigurableJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1858051426718764} - serializedVersion: 4 - m_ConnectedBody: {fileID: 4189001003421396114} - 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!114 &420085638272326913 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1858051426718764} + m_GameObject: {fileID: 2127675972} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f89affce787d4a1cbcd68bed409183d7, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::NBF.FishingLineNode - _solver: {fileID: 0} - nodeType: 1 - body: {fileID: 54298865541355944} - Rope: {fileID: 0} - interaction: {fileID: 0} - _joint: {fileID: 153691655873761411} - segmentLengthToNext: 0.5 - runtimeChainIndex: -1 - features: [] - motionFeatures: [] - activeMotionFeature: {fileID: 0} ---- !u!4 &796266975745807470 -Transform: + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2127675976 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2317291906405060792} - 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: 4283455506376388} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2317291906405060792 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 796266975745807470} - - component: {fileID: 4189001003421396114} - - component: {fileID: 6255081998473500704} - m_Layer: 0 - m_Name: Start - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &3199098294310598083 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035053713012879} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f89affce787d4a1cbcd68bed409183d7, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::NBF.FishingLineNode - _solver: {fileID: 0} - nodeType: 3 - body: {fileID: 54679399358797387} - Rope: {fileID: 0} - interaction: {fileID: 0} - _joint: {fileID: 153611280143742665} - segmentLengthToNext: 0.5 - runtimeChainIndex: -1 - features: [] - motionFeatures: [] - activeMotionFeature: {fileID: 0} ---- !u!54 &4189001003421396114 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2317291906405060792} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 0 - m_ImplicitTensor: 0 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &6255081998473500704 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2317291906405060792} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f89affce787d4a1cbcd68bed409183d7, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::NBF.FishingLineNode - _solver: {fileID: 0} - nodeType: 0 - body: {fileID: 4189001003421396114} - Rope: {fileID: 0} - interaction: {fileID: 0} - _joint: {fileID: 0} - segmentLengthToNext: 0.5 - runtimeChainIndex: -1 - features: [] - motionFeatures: [] - activeMotionFeature: {fileID: 0} ---- !u!114 &7888891488109129251 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1387836520666951} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 78dc478e56ff48849761861244c93535, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::NBF.FishingLineSolver - ConfigId: 0 - LineType: 0 - anchorTransform: {fileID: 2055159199} - logicalNodes: - - {fileID: 6255081998473500704} - - {fileID: 420085638272326913} - - {fileID: 3199098294310598083} - PinchController: {fileID: 0} - lengthLimitTolerance: 0.01 - breakStretchThreshold: 0.05 + m_GameObject: {fileID: 2127675972} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 961739753} - {fileID: 203844589} - - {fileID: 2055159199} - - {fileID: 4283455506376388} - {fileID: 1181671548} + - {fileID: 2055159199} + - {fileID: 1672280511} diff --git a/Assets/Scripts/Fishing/New/View/FishingLine/FishingLineSolver.cs b/Assets/Scripts/Fishing/New/View/FishingLine/FishingLineSolver.cs index 3458695ff..ff29a6d99 100644 --- a/Assets/Scripts/Fishing/New/View/FishingLine/FishingLineSolver.cs +++ b/Assets/Scripts/Fishing/New/View/FishingLine/FishingLineSolver.cs @@ -296,6 +296,7 @@ namespace NBF ropeObject.transform.SetParent(_ropeRoot); var rope = ropeObject.AddComponent(); node.Rope = rope; + // rope.groundMask = LayerMask.GetMask("Terrain"); rope.startAnchor = node.Joint.connectedBody; rope.endAnchor = node.body; } diff --git a/Assets/Scripts/Fishing/New/View/FishingLine/Rope.cs b/Assets/Scripts/Fishing/New/View/FishingLine/Rope.cs index fe1ee6151..1e65c84ab 100644 --- a/Assets/Scripts/Fishing/New/View/FishingLine/Rope.cs +++ b/Assets/Scripts/Fishing/New/View/FishingLine/Rope.cs @@ -60,7 +60,7 @@ public class Rope : MonoBehaviour [Header("Simple Ground/Water Constraint (Cheap)")] [SerializeField] private bool constrainToGround = false; - [SerializeField] private LayerMask groundMask = ~0; + [SerializeField] private LayerMask groundMask = 0; [SerializeField, Min(0f)] private float groundRadius = 0.01f; [SerializeField, Min(0f)] private float groundCastHeight = 1.0f; [SerializeField, Min(0.01f)] private float groundCastDistance = 2.5f; @@ -178,7 +178,7 @@ public class Rope : MonoBehaviour private bool _isCulledByVisibility; private int _tIdleSubdiv = -1; private int _tMovingSubdiv = -1; - + // Catmull t caches(只缓存 idle/moving 两档,减少每帧重复乘法) private struct TCaches @@ -204,6 +204,7 @@ public class Rope : MonoBehaviour RefreshVisibilityState(true); } + private void OnValidate() { renderSubdivisionsIdle = Mathf.Max(renderSubdivisionsIdle, 1); @@ -243,7 +244,7 @@ public class Rope : MonoBehaviour _startTr = startAnchor ? startAnchor.transform : null; _endTr = endAnchor ? endAnchor.transform : null; } - + private Transform GetActiveCameraTransform() { @@ -583,9 +584,10 @@ public class Rope : MonoBehaviour Time.fixedDeltaTime ); - // 长度变化时额外压一点速度,减少收放线时抖动 - float delta = Mathf.Abs(_targetLength - _currentLength); - if (delta > 0.0001f && lengthChangeVelocityKill > 0f) + // 仅在收线(目标长度小于当前长度)时额外压速度; + // 放线时不要压速度,否则新增节点下落会出现“顿一下再突然加速”。 + float reelInDelta = _currentLength - _targetLength; + if (reelInDelta > 0.0001f && lengthChangeVelocityKill > 0f) { float keep = 1f - Mathf.Clamp01(lengthChangeVelocityKill); for (int i = 1; i < _physicsNodes - 1; i++) @@ -750,7 +752,8 @@ public class Rope : MonoBehaviour SolveDistanceConstraintsSweep_Fast(last - 1, -1, -1, last, sweepStiffness); } - private void SolveDistanceConstraintsSweep_Fast(int start, int endExclusive, int step, int last, float sweepStiffness) + private void SolveDistanceConstraintsSweep_Fast(int start, int endExclusive, int step, int last, + float sweepStiffness) { for (int i = start; i != endExclusive; i += step) { @@ -1091,4 +1094,4 @@ public class Rope : MonoBehaviour for (int i = 0; i < _physicsNodes; i++) Gizmos.DrawSphere(_pCurr[i], 0.01f); } -} +} \ No newline at end of file