提交修改

2026-01-24 18:14:07 +08:00
parent d60b255a64
commit 18f263e687
22 changed files with 2505 additions and 13558 deletions
--- a/Assets/AssetCaches.asset
+++ b/Assets/AssetCaches.asset
@@ -18583,8 +18583,23 @@ MonoBehaviour:
      - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3}
      FilterEnum: 0
      Filter: '*'
-  - Path: Assets/ResRaw/Prefabs/Line/fishingLine.asset
-    Address: Plyaer/fishingLine
+  - Path: Assets/ResRaw/Prefabs/Line/FishingRopeLong.asset
+    Address: Plyaer/FishingRopeLong
+    Type: ObiRopeBlueprint
+    Bundle: main/plyaer.bundle
+    Tags: 
+    Group:
+      Name: Plyaer
+      Enable: 1
+      BundleMode: 0
+      AddressMode: 2
+      Tags: 
+      Collectors:
+      - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3}
+      FilterEnum: 0
+      Filter: '*'
+  - Path: Assets/ResRaw/Prefabs/Line/FishingRopeShort.asset
+    Address: Plyaer/FishingRopeShort
    Type: ObiRopeBlueprint
    Bundle: main/plyaer.bundle
    Tags: 
@@ -18613,81 +18628,6 @@ MonoBehaviour:
      - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3}
      FilterEnum: 0
      Filter: '*'
-  - Path: Assets/ResRaw/Prefabs/Line/rope blueprint.asset
-    Address: Plyaer/rope blueprint
-    Type: ObiRopeBlueprint
-    Bundle: main/plyaer.bundle
-    Tags: 
-    Group:
-      Name: Plyaer
-      Enable: 1
-      BundleMode: 0
-      AddressMode: 2
-      Tags: 
-      Collectors:
-      - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3}
-      FilterEnum: 0
-      Filter: '*'
-  - Path: Assets/ResRaw/Prefabs/Line/RopeSegment_1 1.asset
-    Address: Plyaer/RopeSegment_1 1
-    Type: ObiRopeBlueprint
-    Bundle: main/plyaer.bundle
-    Tags: 
-    Group:
-      Name: Plyaer
-      Enable: 1
-      BundleMode: 0
-      AddressMode: 2
-      Tags: 
-      Collectors:
-      - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3}
-      FilterEnum: 0
-      Filter: '*'
-  - Path: Assets/ResRaw/Prefabs/Line/RopeSegment_1.asset
-    Address: Plyaer/RopeSegment_1
-    Type: ObiRopeBlueprint
-    Bundle: main/plyaer.bundle
-    Tags: 
-    Group:
-      Name: Plyaer
-      Enable: 1
-      BundleMode: 0
-      AddressMode: 2
-      Tags: 
-      Collectors:
-      - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3}
-      FilterEnum: 0
-      Filter: '*'
-  - Path: Assets/ResRaw/Prefabs/Line/RopeSegment_2.asset
-    Address: Plyaer/RopeSegment_2
-    Type: ObiRopeBlueprint
-    Bundle: main/plyaer.bundle
-    Tags: 
-    Group:
-      Name: Plyaer
-      Enable: 1
-      BundleMode: 0
-      AddressMode: 2
-      Tags: 
-      Collectors:
-      - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3}
-      FilterEnum: 0
-      Filter: '*'
-  - Path: Assets/ResRaw/Prefabs/Line/RopeSegment_3.asset
-    Address: Plyaer/RopeSegment_3
-    Type: ObiRopeBlueprint
-    Bundle: main/plyaer.bundle
-    Tags: 
-    Group:
-      Name: Plyaer
-      Enable: 1
-      BundleMode: 0
-      AddressMode: 2
-      Tags: 
-      Collectors:
-      - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3}
-      FilterEnum: 0
-      Filter: '*'
  - Path: Assets/ResRaw/Prefabs/Line/RopeSegment_4.asset
    Address: Plyaer/RopeSegment_4
    Type: ObiRopeBlueprint
@@ -18718,21 +18658,6 @@ MonoBehaviour:
      - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3}
      FilterEnum: 0
      Filter: '*'
-  - Path: Assets/ResRaw/Prefabs/Line/Tip.prefab
-    Address: Plyaer/Tip
-    Type: GameObject
-    Bundle: main/plyaer.bundle
-    Tags: 
-    Group:
-      Name: Plyaer
-      Enable: 1
-      BundleMode: 0
-      AddressMode: 2
-      Tags: 
-      Collectors:
-      - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3}
-      FilterEnum: 0
-      Filter: '*'
  - Path: Assets/ResRaw/Prefabs/Player/Anim/AnimationClip/CameraCrouch.anim
    Address: Plyaer/CameraCrouch
    Type: AnimationClip
--- a/Assets/ResRaw/Prefabs/Line/FishingRopeLong.asset
+++ b/Assets/ResRaw/Prefabs/Line/FishingRopeLong.asset
--- a/Assets/ResRaw/Prefabs/Line/FishingRopeLong.asset.meta
+++ b/Assets/ResRaw/Prefabs/Line/FishingRopeLong.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 85c17c422242c8848a83af20ba2e4b52
+guid: c29a67f2195883840b049b2c2a54a55c
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/ResRaw/Prefabs/Line/FishingRopeShort.asset
+++ b/Assets/ResRaw/Prefabs/Line/FishingRopeShort.asset
--- a/Assets/ResRaw/Prefabs/Line/FishingRopeShort.asset.meta
+++ b/Assets/ResRaw/Prefabs/Line/FishingRopeShort.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 33cde1f36a74a9b4dbbd946e03633122
+guid: c70c206ebccc14c4eb6a0cdbe80779f7
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/ResRaw/Prefabs/Line/RopeSegment_1
+++ b/Assets/ResRaw/Prefabs/Line/RopeSegment_1
--- a/Assets/ResRaw/Prefabs/Line/RopeSegment_1.asset
+++ b/Assets/ResRaw/Prefabs/Line/RopeSegment_1.asset
--- a/Assets/ResRaw/Prefabs/Line/RopeSegment_1.asset.meta
+++ b/Assets/ResRaw/Prefabs/Line/RopeSegment_1.asset.meta
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 2ade1c037e0bf214783dcb44ae3b7be7
-timeCreated: 1716587617
-licenseType: Free
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/Assets/ResRaw/Prefabs/Line/RopeSegment_3.asset.meta
+++ b/Assets/ResRaw/Prefabs/Line/RopeSegment_3.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 259934ef326ba6d43a23dc96ce76b990
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ResRaw/Prefabs/Line/Tip.prefab
+++ b/Assets/ResRaw/Prefabs/Line/Tip.prefab
@@ -1,147 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1 &903790088561697036
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 909646399197019307}
-  - component: {fileID: 935008728413422328}
-  - component: {fileID: 926476543567730962}
-  - component: {fileID: 878411335310248169}
-  - component: {fileID: 943357420306358654}
-  - component: {fileID: 2058489824691423325}
-  m_Layer: 10
-  m_Name: Tip
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &909646399197019307
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 903790088561697036}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!33 &935008728413422328
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 903790088561697036}
-  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &926476543567730962
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 903790088561697036}
-  m_Enabled: 0
-  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: 3f3f67942f8bf7b4f85962904e41459f, 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!54 &878411335310248169
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 903790088561697036}
-  serializedVersion: 5
-  m_Mass: 0.1
-  m_LinearDamping: 0
-  m_AngularDamping: 0
-  m_CenterOfMass: {x: 0, y: 0, z: 0}
-  m_InertiaTensor: {x: 1, y: 1, z: 1}
-  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ImplicitCom: 1
-  m_ImplicitTensor: 1
-  m_UseGravity: 0
-  m_IsKinematic: 1
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 3
--- !u!114 &943357420306358654
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 903790088561697036}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 62359d80fdc0e4315ab6331b78ec5b90, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  kinematicForParticles: 1
--- !u!114 &2058489824691423325
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 903790088561697036}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ec22ad0246c24123a6511e60e753ee38, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  target: {fileID: 0}
--- a/Assets/ResRaw/Prefabs/Line/Tip.prefab.meta
+++ b/Assets/ResRaw/Prefabs/Line/Tip.prefab.meta
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 06317e2b94d096447aa63793136ce8de
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ResRaw/Prefabs/Line/fishing
+++ b/Assets/ResRaw/Prefabs/Line/fishing
@@ -171,7 +171,7 @@ MonoBehaviour:
  _aerodynamicsEnabled: 1
  _drag: 0.05
  _lift: 0.02
-  m_RopeBlueprint: {fileID: 11400000, guid: a41193e381908de44b097f1f57b43028, type: 2}
+  m_RopeBlueprint: {fileID: 11400000, guid: c29a67f2195883840b049b2c2a54a55c, type: 2}
  tearingEnabled: 0
  tearResistanceMultiplier: 1000
  tearRate: 1
@@ -296,7 +296,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Actor: {fileID: 114612983243751934}
  m_Target: {fileID: 0}
-  m_ParticleGroup: {fileID: -5395693579433732326, guid: a41193e381908de44b097f1f57b43028, type: 2}
+  m_ParticleGroup: {fileID: -5395693579433732326, guid: c29a67f2195883840b049b2c2a54a55c, type: 2}
  m_AttachmentType: 0
  m_ConstrainOrientation: 0
  m_Projection: 0
@@ -316,7 +316,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Actor: {fileID: 114612983243751934}
  m_Target: {fileID: 4530253318796540}
-  m_ParticleGroup: {fileID: -2515171973132415257, guid: a41193e381908de44b097f1f57b43028, type: 2}
+  m_ParticleGroup: {fileID: -2515171973132415257, guid: c29a67f2195883840b049b2c2a54a55c, type: 2}
  m_AttachmentType: 0
  m_ConstrainOrientation: 0
  m_Projection: 0
@@ -405,7 +405,7 @@ Transform:
  m_GameObject: {fileID: 1035052809208993}
  serializedVersion: 2
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -1, z: 0}
+  m_LocalPosition: {x: 0, y: -0.6, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@@ -463,7 +463,7 @@ ConfigurableJoint:
    spring: 0
    damper: 0
  m_LinearLimit:
-    limit: 0.5
+    limit: 0.1
    bounciness: 0
    contactDistance: 0
  m_AngularXLimitSpring:
@@ -1120,7 +1120,7 @@ MonoBehaviour:
  _aerodynamicsEnabled: 1
  _drag: 0.05
  _lift: 0.02
-  m_RopeBlueprint: {fileID: 11400000, guid: a41193e381908de44b097f1f57b43028, type: 2}
+  m_RopeBlueprint: {fileID: 11400000, guid: c70c206ebccc14c4eb6a0cdbe80779f7, type: 2}
  tearingEnabled: 0
  tearResistanceMultiplier: 1000
  tearRate: 1
@@ -1245,7 +1245,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Actor: {fileID: 114941221864603208}
  m_Target: {fileID: 4530253318796540}
-  m_ParticleGroup: {fileID: -5395693579433732326, guid: a41193e381908de44b097f1f57b43028, type: 2}
+  m_ParticleGroup: {fileID: -5395693579433732326, guid: c70c206ebccc14c4eb6a0cdbe80779f7, type: 2}
  m_AttachmentType: 0
  m_ConstrainOrientation: 0
  m_Projection: 0
@@ -1265,7 +1265,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Actor: {fileID: 114941221864603208}
  m_Target: {fileID: 4026445325167852}
-  m_ParticleGroup: {fileID: -2515171973132415257, guid: a41193e381908de44b097f1f57b43028, type: 2}
+  m_ParticleGroup: {fileID: -2515171973132415257, guid: c70c206ebccc14c4eb6a0cdbe80779f7, type: 2}
  m_AttachmentType: 0
  m_ConstrainOrientation: 0
  m_Projection: 0
--- a/Assets/ResRaw/Prefabs/Line/fishing
+++ b/Assets/ResRaw/Prefabs/Line/fishing
@@ -53,9 +53,8 @@ MonoBehaviour:
  rodLine: {fileID: 4297776814324645408}
  fishingRope: {fileID: 114821237079273711}
  bobberRope: {fileID: 0}
-  LureRoot: {fileID: 4890516850959192}
-  BobberRoot: {fileID: 0}
-  LineLength: 0.5
+  Lure: {fileID: 5042341991661386448}
+  Bobber: {fileID: 0}
 --- !u!1 &1283354022407552
 GameObject:
  m_ObjectHideFlags: 0
@@ -72,6 +71,7 @@ GameObject:
  - component: {fileID: 114606677337991535}
  - component: {fileID: 114052339901978322}
  - component: {fileID: 114975473824467752}
+  - component: {fileID: 8228744838889892096}
  - component: {fileID: 114821237079273711}
  m_Layer: 0
  m_Name: Fishing Line
@@ -120,7 +120,7 @@ MonoBehaviour:
  _aerodynamicsEnabled: 1
  _drag: 0.05
  _lift: 0.02
-  m_RopeBlueprint: {fileID: 11400000, guid: 85c17c422242c8848a83af20ba2e4b52, type: 2}
+  m_RopeBlueprint: {fileID: 11400000, guid: c29a67f2195883840b049b2c2a54a55c, type: 2}
  tearingEnabled: 0
  tearResistanceMultiplier: 1000
  tearRate: 1
@@ -201,7 +201,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 958c969cfb16745f192d4d7bd28b7178, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  decimation: 0
+  decimation: 0.15
  smoothing: 3
  twist: 25
  indexInSystem: 0
@@ -229,7 +229,7 @@ MonoBehaviour:
  uvAnchor: 0
  uvScale: {x: 1, y: 1}
  normalizeV: 1
-  section: {fileID: 0}
+  section: {fileID: 11400000, guid: a0bc36a59515f413e90e10895929c938, type: 2}
  thicknessScale: 0.8
 --- !u!114 &114052339901978322
 MonoBehaviour:
@@ -245,7 +245,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Actor: {fileID: 114183814398187982}
  m_Target: {fileID: 0}
-  m_ParticleGroup: {fileID: -3803899459416562112, guid: b9af42d80396eae47978edea24f03a71, type: 2}
+  m_ParticleGroup: {fileID: -5395693579433732326, guid: c29a67f2195883840b049b2c2a54a55c, type: 2}
  m_AttachmentType: 0
  m_ConstrainOrientation: 0
  m_Projection: 0
@@ -265,12 +265,27 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Actor: {fileID: 114183814398187982}
  m_Target: {fileID: 4890516850959192}
-  m_ParticleGroup: {fileID: 1168889126576124136, guid: b9af42d80396eae47978edea24f03a71, type: 2}
+  m_ParticleGroup: {fileID: -2515171973132415257, guid: c29a67f2195883840b049b2c2a54a55c, type: 2}
  m_AttachmentType: 0
  m_ConstrainOrientation: 0
  m_Projection: 0
  m_Compliance: 0
  breakThreshold: Infinity
+--- !u!114 &8228744838889892096
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1283354022407552}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8285ac97113f74d449053378d0e3a56b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Obi::Obi.ObiRopeCursor
+  m_CursorMu: 0
+  m_SourceMu: 1
+  direction: 1
 --- !u!114 &114821237079273711
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -283,8 +298,9 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 98ba9d435a0e49c9bb527c34cc91894d, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  rope: {fileID: 0}
-  cursor: {fileID: 0}
+  isFloatRope: 0
+  rope: {fileID: 114183814398187982}
+  cursor: {fileID: 8228744838889892096}
  percentageElasticity: 1
 --- !u!1 &1593910372182423
 GameObject:
@@ -453,6 +469,7 @@ GameObject:
  - component: {fileID: 54576891949597541}
  - component: {fileID: 153265847269300219}
  - component: {fileID: 135766751052608187}
+  - component: {fileID: 5042341991661386448}
  m_Layer: 7
  m_Name: Lure
  m_TagString: Untagged
@@ -469,7 +486,7 @@ Transform:
  m_GameObject: {fileID: 1900952002951889}
  serializedVersion: 2
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.1, z: 0}
+  m_LocalPosition: {x: 0, y: -0.5, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@@ -625,3 +642,17 @@ SphereCollider:
  serializedVersion: 3
  m_Radius: 2
  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &5042341991661386448
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900952002951889}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ed5bbbc032ec4ca1bb56991d9141e311, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::NBF.LureController
+  rBody: {fileID: 54576891949597541}
+  joint: {fileID: 153265847269300219}
--- a/Assets/ResRaw/Prefabs/Line/fishingLine.asset
+++ b/Assets/ResRaw/Prefabs/Line/fishingLine.asset
--- a/Assets/ResRaw/Prefabs/Line/fishingLine.asset.meta
+++ b/Assets/ResRaw/Prefabs/Line/fishingLine.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b9af42d80396eae47978edea24f03a71
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ResRaw/Prefabs/Line/rope
+++ b/Assets/ResRaw/Prefabs/Line/rope
--- a/Assets/ResRaw/Prefabs/Line/rope
+++ b/Assets/ResRaw/Prefabs/Line/rope
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4526308312ce0e045bbabdf3ff8b797b
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ResRaw/gfx/rods/syberia/spin_10034/spin_10034_S60H.prefab
+++ b/Assets/ResRaw/gfx/rods/syberia/spin_10034/spin_10034_S60H.prefab
@@ -712,6 +712,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 4113438615541107}
+  - component: {fileID: 3155692758023391108}
  m_Layer: 0
  m_Name: blanc_end
  m_TagString: Untagged
@@ -734,6 +735,33 @@ Transform:
  m_Children: []
  m_Father: {fileID: 4452163630135938}
  m_LocalEulerAnglesHint: {x: 0, y: -0, z: 0}
+--- !u!54 &3155692758023391108
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1536519554137441}
+  serializedVersion: 5
+  m_Mass: 1
+  m_LinearDamping: 0
+  m_AngularDamping: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 0
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
 --- !u!1 &1583669682424562
 GameObject:
  m_ObjectHideFlags: 0
@@ -823,6 +851,8 @@ LineRenderer:
  m_RayTracingAccelStructBuildFlagsOverride: 0
  m_RayTracingAccelStructBuildFlags: 1
  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -844,6 +874,7 @@ LineRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
@@ -969,7 +1000,9 @@ MonoBehaviour:
  - {fileID: 4572640672058984}
  - {fileID: 4452163630135938}
  lineRenderer: {fileID: -6700604067025401068}
-  lineConnector: {fileID: 0}
+  lineConnector: {fileID: 4113438615541107}
+  CCDIK: {fileID: -3660540612643729876}
+  LineConnectorRigidbody: {fileID: 3155692758023391108}
 --- !u!114 &-3660540612643729876
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -1294,6 +1327,8 @@ SkinnedMeshRenderer:
  m_RayTracingAccelStructBuildFlagsOverride: 0
  m_RayTracingAccelStructBuildFlags: 1
  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -1316,6 +1351,7 @@ SkinnedMeshRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
--- a/Assets/Scenes/RopeTest.unity
+++ b/Assets/Scenes/RopeTest.unity
--- a/Assets/Scripts/Fishing/Rope/Rope.cs
+++ b/Assets/Scripts/Fishing/Rope/Rope.cs
@@ -37,7 +37,7 @@ public class Rope : MonoBehaviour

    public void LineLength_OnValueChanged(float length)
    {
-        cursor = ((cursor == null) ? GetComponent<ObiRopeCursor>() : cursor);
+        cursor = cursor == null ? GetComponent<ObiRopeCursor>() : cursor;
        stretchScale = Mathf.Clamp(length - percentageElasticity, 0f, float.PositiveInfinity);
    }

--- a/Assets/Scripts/Fishing/Tackle/FLine.cs
+++ b/Assets/Scripts/Fishing/Tackle/FLine.cs
@@ -57,8 +57,16 @@ namespace NBF
            });

            StartCoroutine(test());
-            fishingRope.Init(Rod);
-            bobberRope.Init(Rod);
+            if (isLureConnect)
+            {
+                fishingRope.Init(Rod);
+            }
+            else
+            {
+                fishingRope.Init(Rod);
+                bobberRope.Init(Rod);
+            }
+            
            // rodLine.GenerateLineRendererRope(guides.ToArray(), _LineThickness);
        }

--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -27,14 +27,14 @@ EditorUserSettings:
      value: 02550255060d590c0c0b097016770b12444f1e2b7e2a2534797f4b60b6e46c60
      flags: 0
    RecentlyUsedSceneGuid-6:
-      value: 07060c5454040c0a545b547240700a441216417e7f2e7268752c4966b4b0663d
-      flags: 0
-    RecentlyUsedSceneGuid-7:
      value: 0754035e5454585d545e5f7345775e494e164e7b7b2a71687b2d4e65e3b36768
      flags: 0
-    RecentlyUsedSceneGuid-8:
+    RecentlyUsedSceneGuid-7:
      value: 5309035757065a0a54575f7216265c4444151d28792e72627d2f1935bbb8673a
      flags: 0
+    RecentlyUsedSceneGuid-8:
+      value: 07060c5454040c0a545b547240700a441216417e7f2e7268752c4966b4b0663d
+      flags: 0
    RecentlyUsedSceneGuid-9:
      value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e
      flags: 0