From e800e59e9dfadf135b5584cc184d8a95d130af46 Mon Sep 17 00:00:00 2001
From: BobSong <605277374@qq.com>
Date: Sun, 29 Mar 2026 19:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8D=8F=E4=BD=8F=E9=B1=BC?=
 =?UTF-8?q?=E7=BA=BF=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ResRaw/Prefabs/Player/Human_Male.prefab   |  9 ++++----
 .../View/Player/Mono/JointPinchController.cs  | 21 ++++++++-----------
 .../Fishing/New/View/Player/Tackle/FRod.cs    |  1 +
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Assets/ResRaw/Prefabs/Player/Human_Male.prefab b/Assets/ResRaw/Prefabs/Player/Human_Male.prefab
index 1eee4fadb..6b14f6bbf 100644
--- a/Assets/ResRaw/Prefabs/Player/Human_Male.prefab
+++ b/Assets/ResRaw/Prefabs/Player/Human_Male.prefab
@@ -2302,10 +2302,11 @@ Animator:
     'pinky_01_l'\n\tTransform 'pinky_03_l'\n\tTransform 'lowerarm_r'\n\tTransform
     'ring_02_l'\n\tTransform 'index_metacarpal_r'\n\tTransform 'root'\n\tTransform
     'spine_04'\n\tTransform 'ring_metacarpal_r'\n\tand more ...\n\tFrom animation
-    clip 'FACS_001'\n\tFrom animation clip 'FACS_002'\n\tFrom animation clip 'FACS_003'\n\tFrom
-    animation clip 'FACS_004'\n\tFrom animation clip 'FACS_005'\n\tFrom animation
-    clip 'FACS_006'\n\tFrom animation clip 'FACS_007'\n\tFrom animation clip 'FACS_008'\n\tFrom
-    animation clip 'FACS_009'\n\tFrom animation clip 'FACS_010'\n\tand more ..."
+    clip 'eyeLookDownLeft'\n\tFrom animation clip 'eyeLookUpLeft'\n\tFrom animation
+    clip 'eyeBlinkRight'\n\tFrom animation clip 'eyeWideRight'\n\tFrom animation
+    clip 'jawForward'\n\tFrom animation clip 'jawLeft'\n\tFrom animation clip 'jawRight'\n\tFrom
+    animation clip 'jawOpen'\n\tFrom animation clip 'mouthFunnel'\n\tFrom animation
+    clip 'mouthPucker'\n\tand more ..."
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
diff --git a/Assets/Scripts/Fishing/New/View/Player/Mono/JointPinchController.cs b/Assets/Scripts/Fishing/New/View/Player/Mono/JointPinchController.cs
index 4f3787118..3b644dd5c 100644
--- a/Assets/Scripts/Fishing/New/View/Player/Mono/JointPinchController.cs
+++ b/Assets/Scripts/Fishing/New/View/Player/Mono/JointPinchController.cs
@@ -9,8 +9,6 @@ namespace NBF
         [SerializeField] private float moveSpeed = 5f;
         [SerializeField] private float snapDistance = 0.1f;
 
-        // 组件引用
-        private ConfigurableJoint originalSpringJoint;
         private FixedJoint pinchJoint;
         private Rigidbody rb;
 
@@ -22,15 +20,13 @@ namespace NBF
 
 
         public bool isPinched { get; private set; }
-
-
+        
         private bool moveToTargetDone;
         private float _speed;
 
         void Start()
         {
             rb = GetComponent<Rigidbody>();
-            originalSpringJoint = GetComponent<ConfigurableJoint>();
         }
 
         void FixedUpdate()
@@ -38,21 +34,22 @@ namespace NBF
             if (isPinched && !moveToTargetDone && targetTransform != null)
             {
                 pinchElapsedTime += Time.fixedDeltaTime;
-                // transform.position =
-                //     Vector3.MoveTowards(transform.position, targetTransform.position, Time.deltaTime * _speed);
-                rb.MovePosition(Vector3.MoveTowards(transform.position, targetTransform.position,
-                    Time.deltaTime * _speed));
+                transform.position =
+                    Vector3.MoveTowards(transform.position, targetTransform.position, Time.deltaTime * _speed);
                 if (Vector3.Distance(transform.position, targetTransform.position) < 0.1f ||
                     pinchElapsedTime >= maxCatchupDuration)
                 {
                     moveToTargetDone = true;
                 }
             }
-
-            SyncPosition();
         }
 
         private void LateUpdate()
+        {
+            // SyncPosition();
+        }
+
+        private void Update()
         {
             SyncPosition();
         }
@@ -61,7 +58,7 @@ namespace NBF
         {
             if (!isPinched) return;
             if (!moveToTargetDone) return;
-            rb.MovePosition(targetTransform.position);
+            transform.position = targetTransform.position;
         }
 
         // 外部调用：开始捏住流程
diff --git a/Assets/Scripts/Fishing/New/View/Player/Tackle/FRod.cs b/Assets/Scripts/Fishing/New/View/Player/Tackle/FRod.cs
index 3f97726d5..cb317ba46 100644
--- a/Assets/Scripts/Fishing/New/View/Player/Tackle/FRod.cs
+++ b/Assets/Scripts/Fishing/New/View/Player/Tackle/FRod.cs
@@ -79,6 +79,7 @@ namespace NBF
                 if (PlayerItem.StretchRope)
                 {
                     Line.SetTargetLength(PlayerItem.Tension > 0f ? 0f : PlayerItem.LineLength - PlayerItem.FloatLength);
+                    Line.SetLureLength(PlayerItem.FloatLength);
                 }
             }
         }