修改线节点

2026-01-24 21:00:15 +08:00
parent 18f263e687
commit e94f0cd799
6 changed files with 573 additions and 463 deletions
--- a/Assets/ResRaw/Prefabs/Line/FishingRopeShort.asset
+++ b/Assets/ResRaw/Prefabs/Line/FishingRopeShort.asset
--- a/Assets/ResRaw/Prefabs/Line/LineSolver.prefab
+++ b/Assets/ResRaw/Prefabs/Line/LineSolver.prefab
@@ -99,7 +99,7 @@ MonoBehaviour:
  synchronousSpatialQueries: 0
  distanceConstraintParameters:
    evaluationOrder: 0
-    iterations: 1
+    iterations: 5
    SORFactor: 1
    enabled: 1
  bendingConstraintParameters:
--- a/Assets/ResRaw/Prefabs/Line/fishing
+++ b/Assets/ResRaw/Prefabs/Line/fishing
@@ -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: -0.6, z: 0}
+  m_LocalPosition: {x: 0, y: -1, 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.1
+    limit: 0.5
    bounciness: 0
    contactDistance: 0
  m_AngularXLimitSpring:
@@ -530,7 +530,7 @@ ConfigurableJoint:
    maximumForce: 3.4028233e+38
    useAcceleration: 0
  m_ProjectionMode: 1
-  m_ProjectionDistance: 0.1
+  m_ProjectionDistance: 0
  m_ProjectionAngle: 0
  m_ConfiguredInWorldSpace: 0
  m_SwapBodies: 0
@@ -555,12 +555,12 @@ SphereCollider:
    serializedVersion: 2
    m_Bits: 0
  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
+  m_IsTrigger: 0
  m_ProvidesContacts: 0
  m_Enabled: 1
  serializedVersion: 3
-  m_Radius: 5.19
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Radius: 0.003
+  m_Center: {x: 0, y: -0.0015, z: 0}
 --- !u!114 &1923684598771359451
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/ResRaw/Prefabs/Line/fishing
+++ b/Assets/ResRaw/Prefabs/Line/fishing
@@ -636,12 +636,12 @@ SphereCollider:
    serializedVersion: 2
    m_Bits: 0
  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
+  m_IsTrigger: 0
  m_ProvidesContacts: 0
  m_Enabled: 1
  serializedVersion: 3
-  m_Radius: 2
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Radius: 0.03
+  m_Center: {x: 0, y: -0.15, z: 0}
 --- !u!114 &5042341991661386448
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Scenes/RopeTest.unity
+++ b/Assets/Scenes/RopeTest.unity
@@ -335,7 +335,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: Obi::Obi.ObiRope
  solverIndices:
-    serializedContents: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f000000400000004100000042000000430000004400000045000000460000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f000000500000005100000052000000530000005400000055000000560000005700000058000000590000005a0000005b0000005c0000005d0000005e0000005f000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006b0000006c0000006d0000006e0000006f000000700000007100000072000000730000007400000075000000760000007700000078000000790000007a0000007b0000007c0000007d0000007e0000007f000000800000008100000082000000830000008400000085000000860000008700000088000000890000008a0000008b0000008c0000008d0000008e0000008f00000090000000910000009200000093000000940000009500000096000000
+    serializedContents: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f000000400000004100000042000000430000004400000045000000460000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f000000500000005100000052000000530000005400000055000000560000005700000058000000590000005a0000005b0000005c0000005d0000005e0000005f000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006b0000006c0000006d0000006e0000006f000000700000007100000072000000730000007400000075000000760000007700000078000000790000007a0000007b0000007c000000
    m_AlignBytes: 16
  groupID: 1
  m_CollisionMaterial: {fileID: 0}
@@ -346,258 +346,128 @@ MonoBehaviour:
  elements:
  - particle1: 0
    particle2: 1
-    restLength: 0.01
+    restLength: 0.022047479
    constraintForce: 0
    tearResistance: 1
  - particle1: 1
    particle2: 2
-    restLength: 0.01
+    restLength: 0.022272225
    constraintForce: 0
    tearResistance: 1
  - particle1: 2
    particle2: 3
-    restLength: 0.01
+    restLength: 0.022317044
    constraintForce: 0
    tearResistance: 1
  - particle1: 3
    particle2: 4
-    restLength: 0.01
+    restLength: 0.022227883
    constraintForce: 0
    tearResistance: 1
  - particle1: 4
    particle2: 5
-    restLength: 0.010000002
+    restLength: 0.022270732
    constraintForce: 0
    tearResistance: 1
  - particle1: 5
    particle2: 6
-    restLength: 0.009999998
+    restLength: 0.022227883
    constraintForce: 0
    tearResistance: 1
  - particle1: 6
    particle2: 7
-    restLength: 0.010000002
+    restLength: 0.022317037
    constraintForce: 0
    tearResistance: 1
  - particle1: 7
    particle2: 8
-    restLength: 0.009999998
+    restLength: 0.022272244
    constraintForce: 0
    tearResistance: 1
  - particle1: 8
    particle2: 9
-    restLength: 0.010000005
+    restLength: 0.022047475
    constraintForce: 0
    tearResistance: 1
  - particle1: 9
    particle2: 10
-    restLength: 0.009999998
+    restLength: 0.01999247
    constraintForce: 0
    tearResistance: 1
  - particle1: 10
    particle2: 11
-    restLength: 0.009999998
+    restLength: 0.020001456
    constraintForce: 0
    tearResistance: 1
  - particle1: 11
    particle2: 12
-    restLength: 0.009999998
+    restLength: 0.02001217
    constraintForce: 0
    tearResistance: 1
  - particle1: 12
    particle2: 13
-    restLength: 0.009999998
+    restLength: 0.020001411
    constraintForce: 0
    tearResistance: 1
  - particle1: 13
    particle2: 14
-    restLength: 0.010000005
+    restLength: 0.0199925
    constraintForce: 0
    tearResistance: 1
  - particle1: 14
    particle2: 15
-    restLength: 0.010000005
+    restLength: 0.01999253
    constraintForce: 0
    tearResistance: 1
  - particle1: 15
    particle2: 16
-    restLength: 0.00999999
+    restLength: 0.020001382
    constraintForce: 0
    tearResistance: 1
  - particle1: 16
    particle2: 17
-    restLength: 0.010000005
+    restLength: 0.02001217
    constraintForce: 0
    tearResistance: 1
  - particle1: 17
    particle2: 18
-    restLength: 0.010000005
+    restLength: 0.020001411
    constraintForce: 0
    tearResistance: 1
  - particle1: 18
    particle2: 19
-    restLength: 0.00999999
+    restLength: 0.0199925
    constraintForce: 0
    tearResistance: 1
  - particle1: 19
    particle2: 20
-    restLength: 0.010000005
+    restLength: 0.01999253
    constraintForce: 0
    tearResistance: 1
  - particle1: 20
    particle2: 21
-    restLength: 0.00999999
+    restLength: 0.020001382
    constraintForce: 0
    tearResistance: 1
  - particle1: 21
    particle2: 22
-    restLength: 0.010000005
+    restLength: 0.02001217
    constraintForce: 0
    tearResistance: 1
  - particle1: 22
    particle2: 23
-    restLength: 0.010000005
+    restLength: 0.020001382
    constraintForce: 0
    tearResistance: 1
  - particle1: 23
    particle2: 24
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 24
-    particle2: 25
-    restLength: 0.010000005
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 25
-    particle2: 26
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 26
-    particle2: 27
-    restLength: 0.01000002
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 27
-    particle2: 28
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 28
-    particle2: 29
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 29
-    particle2: 30
-    restLength: 0.01000002
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 30
-    particle2: 31
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 31
-    particle2: 32
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 32
-    particle2: 33
-    restLength: 0.01000002
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 33
-    particle2: 34
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 34
-    particle2: 35
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 35
-    particle2: 36
-    restLength: 0.01000002
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 36
-    particle2: 37
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 37
-    particle2: 38
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 38
-    particle2: 39
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 39
-    particle2: 40
-    restLength: 0.01000002
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 40
-    particle2: 41
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 41
-    particle2: 42
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 42
-    particle2: 43
-    restLength: 0.01000002
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 43
-    particle2: 44
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 44
-    particle2: 45
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 45
-    particle2: 46
-    restLength: 0.01000002
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 46
-    particle2: 47
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 47
-    particle2: 48
-    restLength: 0.00999999
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 48
-    particle2: 49
-    restLength: 0.01000002
-    constraintForce: 0
-    tearResistance: 1
-  - particle1: 49
-    particle2: 50
-    restLength: 0.00999999
+    restLength: 0.01999253
    constraintForce: 0
    tearResistance: 1
  _aerodynamicsEnabled: 1
  _drag: 0.05
  _lift: 0.02
-  m_RopeBlueprint: {fileID: 11400000, guid: c29a67f2195883840b049b2c2a54a55c, type: 2}
+  m_RopeBlueprint: {fileID: 11400000, guid: c70c206ebccc14c4eb6a0cdbe80779f7, type: 2}
  tearingEnabled: 0
  tearResistanceMultiplier: 1000
  tearRate: 1
@@ -747,7 +617,7 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1842296209
+--- !u!1 &1830790625
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -755,8 +625,8 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 1842296211}
-  - component: {fileID: 1842296210}
+  - component: {fileID: 1830790627}
+  - component: {fileID: 1830790626}
  m_Layer: 0
  m_Name: BurstCollisionWorld
  m_TagString: Untagged
@@ -764,13 +634,13 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!114 &1842296210
+--- !u!114 &1830790626
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1842296209}
+  m_GameObject: {fileID: 1830790625}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
@@ -778,13 +648,13 @@ MonoBehaviour:
  m_EditorClassIdentifier: Obi::Obi.BurstColliderWorld
  cellSpans:
    m_AlignBytes: 16
--- !u!4 &1842296211
+--- !u!4 &1830790627
 Transform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1842296209}
+  m_GameObject: {fileID: 1830790625}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -865,4 +735,4 @@ SceneRoots:
  - {fileID: 961739753}
  - {fileID: 203844589}
  - {fileID: 5634959157749674791}
-  - {fileID: 1842296211}
+  - {fileID: 1830790627}
--- a/Assets/Scripts/Fishing/Tackle/FRod.cs
+++ b/Assets/Scripts/Fishing/Tackle/FRod.cs
@@ -89,8 +89,8 @@ namespace NBF
            SceneSettings.Instance.GearNode.position = Player.transform.position;
            yield return 1;
            var obj = new GameObject($"rod_{itemInfo.Id}_{itemInfo.ConfigId}");
-            // obj.transform.SetParent(SceneSettings.Instance.GearNode);
-            obj.transform.SetParent(player.transform);
+            obj.transform.SetParent(SceneSettings.Instance.GearNode);
+            // obj.transform.SetParent(player.transform);
            // obj.transform.localPosition = Vector3.zero;
            obj.transform.position = player.transform.position;
            obj.transform.rotation = player.transform.rotation;
@@ -103,7 +103,7 @@ namespace NBF

            ItemInfo lineItemInfo = null;

-
+            CreateFishingHandler();
            // children.Sort();
            foreach (var child in children)
            {
@@ -150,8 +150,6 @@ namespace NBF
                }
            }

-            yield return 1;
-            CreateFishingHandler();
            yield return 1;
            if (Reel)
            {
@@ -218,21 +216,17 @@ namespace NBF

        public void CreateObiFishingLine(int currentLineTypeIndex)
        {
-            // if ((bool)Owner.Gears.Reel && !currentLineHandler)
            if (!Line)
            {
-                //Assets/ResRaw/Prefabs/Line/LineSolver.prefab
                var lineSolverPrefab = Assets.Load<GameObject>("Assets/ResRaw/Prefabs/Line/LineSolver.prefab");
                var solver = Instantiate(lineSolverPrefab, GearRoot);
                solver.transform.position = Asset.lineConnector.position;
                solver.transform.rotation = Asset.lineConnector.rotation;
-                // var indexNames = new[] { "FFishingLine_0", "FFishingLine_1" };
                var indexNames = new[] { "fishing line float set", "fishing line spinning" };
                var path =
-                    $"Assets/ResRaw/Prefabs/Line/{indexNames[currentLineTypeIndex]}.prefab"; //$"GameItemsPrefabs/Lines/{indexNames[currentLineTypeIndex]}";
+                    $"Assets/ResRaw/Prefabs/Line/{indexNames[currentLineTypeIndex]}.prefab"; 
                var prefab = Assets.Load<GameObject>(path);

-                // var toRodConnector = rodAsset.lineConnector.GetComponent<Rigidbody>();
                GameObject obj = Instantiate(prefab, solver.transform);
                obj.transform.localPosition = Vector3.zero;
                obj.transform.localScale = Vector3.one;
@@ -241,15 +235,6 @@ namespace NBF
                Line = obj.GetComponent<FLine>();
                Line.transform.position = Asset.lineConnector.position;
                Line.Init(this.Player, this);
-
-                // lineHandler = obj.GetComponent<FLineHandler>();
-                // // lineHandler.transform.SetParent(toRodConnector.transform);
-                // lineHandler.transform.position = Asset.lineConnector.position;
-                // lineHandler.LineConnector_0.target = Asset.lineConnector; //.GetComponent<Rigidbody>();
-                // lineHandler.Rod = this;
-                // // lineHandler.startParticleAttachment.target = Asset.lineConnector;
-                var obiSolver = solver.GetComponent<ObiSolver>();
-                // SceneSettings.Instance.obiFixedUpdater.solvers.Add(obiSolver);
            }
        }