修改提交

Assets/ResRaw/Prefabs/Line/LineHand1.prefab

@@ -492,6 +492,7 @@ GameObject:
   - component: {fileID: 54298866000586118}
   - component: {fileID: 4367274852511404246}
   - component: {fileID: 8491405271793597799}
+  - component: {fileID: 6946262978138518655}
   m_Layer: 16
   m_Name: Float
   m_TagString: Untagged
@@ -658,6 +659,66 @@ MonoBehaviour:
   NodeType: 1
   rope: {fileID: 114581403422500557}
   preRigidbody: {fileID: 5597807613657979793}
+--- !u!114 &6946262978138518655
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1858052053854210}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2dedfafdc2d747d98c682cde3e28e513, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::BobberPresentationController
+  fallbackWaterLevel: 0
+  waterRenderer: {fileID: 0}
+  waterCollisionLayer: 1
+  waterQueryObjectWidth: 0.5
+  waterProviderBehaviour: {fileID: 0}
+  enterWaterDepth: 0.002
+  exitWaterDepth: -0.01
+  floatHeight: 0.08
+  bottomOffsetLocalY: 0
+  baseSubmergeRatio: 0.28
+  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: 0}
+  referenceLength: 0.3
+  minSubmergeToStand: 0.16
+  verticalLieThreshold: 0.18
+  verticalUprightThreshold: 0.75
+  planarTiltThreshold: 0.3
+  planarDominanceMultiplier: 1.2
+  postureHysteresis: 0.04
+  postureConfirmTime: 0.08
+  postureSwitchCooldown: 0.1
+  tiltedAngle: 38
+  lyingAngle: 88
+  uprightMaxTiltAngle: 8
+  planarTiltFactor: 120
+  planarDirectionDeadZone: 0.01
+  planarDirectionLerpSpeed: 10
+  rotationLerpSpeed: 8
+  debugResetKey: 1
+  debugTapKey: 1
+  debugSlowSinkKey: 1
+  debugLiftKey: 1
+  debugBlackDriftKey: 1
+  drawDebug: 0
+  UseTestPosture: 0
+  TestPosture: 0
 --- !u!1 &1933124697579601
 GameObject:
   m_ObjectHideFlags: 0
@@ -731,7 +792,7 @@ MonoBehaviour:
   groundInterpolate: 1
   groundUpdateEvery: 1
   groundPostConstraintIterations: 2
-  constrainToWaterSurface: 1
+  constrainToWaterSurface: 0
   waterLevelY: 0
   waterSurfaceOffset: 0.002
   waterSampleStep: 2

Assets/Scripts/Fishing/Player/States/PlayerStageViewFight.cs

@@ -4,10 +4,21 @@
     {
         protected override void OnEnter()
         {
+            // Player.ro
+            if (Player.HandItem is FRod rod)
+            {
+                rod.Line.EndNode.Rigidbody.isKinematic = true;
+                // rod.Line.ChangeMode(LineMode.Constraint);
+            }
         }
 
         protected override void OnExit()
         {
+            if (Player.HandItem is FRod rod)
+            {
+                rod.Line.EndNode.Rigidbody.isKinematic = false;
+                // rod.Line.ChangeMode(LineMode.Joint);
+            }
         }
 
         protected override void OnUpdate()

Assets/Scripts/Fishing/Player/States/PlayerStageViewFishing.cs

@@ -25,6 +25,11 @@ namespace NBF
                 ret = CheckTackFish();
             }
 
+            if (Input.GetKeyDown(KeyCode.F))
+            {
+                ret = PlayerState.Fight;
+            }
+
             if (ret != PlayerState.None)
             {
                 Player.ChangeState(ret);
@@ -100,8 +105,8 @@ namespace NBF
 
         private PlayerState CheckTackFish()
         {
-            // return PlayerState.Idle;
-            return PlayerState.Fight;
+            return PlayerState.Idle;
+            // return PlayerState.Fight;
         }
 
         #endregion

UserSettings/EditorUserSettings.asset

@@ -33,14 +33,14 @@ EditorUserSettings:
       value: 0257035f51050d090f0f5d734521094414164e797e7a20667d7a4536e0e36461
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 07060c5454040c0a545b547240700a441216417e7f2e7268752c4966b4b0663d
-      flags: 0
-    RecentlyUsedSceneGuid-7:
       value: 54070c5452075002590c0871127b5a4443161c2f797176312c2f1e6bb1b4353d
       flags: 0
-    RecentlyUsedSceneGuid-8:
+    RecentlyUsedSceneGuid-7:
       value: 5309035757065a0a54575f7216265c4444151d28792e72627d2f1935bbb8673a
       flags: 0
+    RecentlyUsedSceneGuid-8:
+      value: 07060c5454040c0a545b547240700a441216417e7f2e7268752c4966b4b0663d
+      flags: 0
     RecentlyUsedSceneGuid-9:
       value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e
       flags: 0