Game/Fishing2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改鱼线相关逻辑

Browse Source
This commit is contained in:
Bob.Song
2026-04-12 21:17:29 +08:00
parent 8fbb21a66c
commit b83dfd47b1
15 changed files with 1446 additions and 1389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/Fishing/New/View/Player/Tackle/FBobber.cs
View File

@@ -7,7 +7,9 @@ namespace NBF
protected override void OnInit()
{
// transform.position = Rod.lineHandler.LineConnector_1.transform.position;
SetParent(Rod.Line.Bobber.transform);
var node = Rod.Line.GetLogicalNode(FishingLineNode.NodeType.Float);
SetParent(node.transform);
transform.localPosition = Vector3.zero;
// var buoyancy = GetComponentInParent<CapsuleBuoyancyStable>();
// buoyancy.InitBobber();

4
Assets/Scripts/Fishing/New/View/Player/Tackle/FHook.cs
View File

@@ -18,8 +18,10 @@ namespace NBF
// transform.rotation = Rod.lineHandler.LineConnector_2.transform.rotation; // 确保旋转也同步
// SetParent(Rod.lineHandler.LineConnector_2.transform);
var node = Rod.Line.GetLogicalNode(FishingLineNode.NodeType.Tail);
SetParent(node.transform);
SetParent(Rod.Line.Lure.transform);
// SetParent(Rod.Line.Lure.transform);
transform.localPosition = Vector3.zero;
// var target = lineHandler.LineConnector_2.GetComponent<Rigidbody>();

346
Assets/Scripts/Fishing/New/View/Player/Tackle/FLine.cs
View File

@@ -1,173 +1,173 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using NBC;
// using Obi;
using UnityEngine;
namespace NBF
{
public enum LineType
{
Hand,
HandDouble,
Spinning,
SpinningFloat,
}
public class FLine : FGearBase
{
public LineType LineType;
[SerializeField] private bool isLureConnect;
[SerializeField] private RodLine rodLine;
/// <summary>
/// 主线
/// </summary>
[SerializeField] private Rope fishingRope;
/// <summary>
/// 浮漂和鱼钩线
/// </summary>
[SerializeField] private Rope bobberRope;
public LureController Lure;
public BobberController Bobber;
public JointPinchController PinchController;
public float LinelenghtDiferent;
protected override void OnInit()
{
var tipRb = Rod.Asset.LineConnectorRigidbody;
if (isLureConnect)
{
Lure.SetJoint(tipRb);
Lure.EnableCollision(false);
}
else
{
fishingRope.startAnchor = tipRb;
Bobber.SetJoint(tipRb);
Lure.SetJoint(Bobber.rbody);
Lure.gameObject.SetActive(true);
Lure.EnableCollision(false);
Lure.SetKinematic(false);
}
GetComponentsInChildren<Transform>(includeInactive: true).ToList().ForEach(delegate(Transform i)
{
i.gameObject.SetActive(true);
});
StartCoroutine(LureUseGravity());
if (isLureConnect)
{
fishingRope.Init(Rod);
}
else
{
fishingRope.Init(Rod);
bobberRope.Init(Rod);
}
// rodLine.GenerateLineRendererRope(guides.ToArray(), _LineThickness);
}
public void InitTest(Rigidbody tipRb)
{
if (isLureConnect)
{
Lure.SetJoint(tipRb);
Lure.EnableCollision(false);
}
else
{
fishingRope.startAnchor = tipRb;
Bobber.SetJoint(tipRb);
Lure.SetJoint(Bobber.rbody);
Lure.gameObject.SetActive(true);
Lure.EnableCollision(false);
Lure.SetKinematic(false);
}
GetComponentsInChildren<Transform>(includeInactive: true).ToList().ForEach(delegate(Transform i)
{
i.gameObject.SetActive(true);
});
StartCoroutine(LureUseGravity());
if (isLureConnect)
{
fishingRope.Init(Rod);
}
else
{
fishingRope.Init(Rod);
bobberRope.Init(Rod);
}
}
private IEnumerator LureUseGravity()
{
yield return 1;
Lure.gameObject.SetActive(false);
Lure.gameObject.SetActive(true);
yield return 1;
Lure.RBody.useGravity = true;
}
public void SetTargetLength(float value)
{
Log.Error($"SetObiRopeStretch={value}");
if (value > 3)
{
// value -= 0.2f;
}
fishingRope.SetTargetLength(value);
}
public void SetLureLength(float value)
{
Log.Error($"SetObiRopeStretch={value}");
bobberRope.SetTargetLength(value);
}
private void Update()
{
LinelenghtDiferent = GetLineDistance();
//非钓鱼状态
Rod.PlayerItem.Tension = Mathf.Clamp(LinelenghtDiferent, 0f, 0.05f);
}
#region Tension
private float GetLineDistance()
{
if (!Bobber.JointRb)
{
return 0;
}
// return 0;
//第一个节点到竿稍的位置-第一段鱼线长度
return Vector3.Distance(Bobber.transform.position, Bobber.JointRb.transform.position) -
fishingRope.GetCurrentLength();
}
public float GetTension(float weight)
{
return weight * GetLineDistance();
}
#endregion
}
}
// using System;
// using System.Collections;
// using System.Collections.Generic;
// using System.Linq;
// using NBC;
// // using Obi;
// using UnityEngine;
//
// namespace NBF
// {
// public enum LineType
// {
// Hand,
// HandDouble,
// Spinning,
// SpinningFloat,
// }
//
// public class FLine : FGearBase
// {
// public LineType LineType;
//
// [SerializeField] private bool isLureConnect;
// [SerializeField] private RodLine rodLine;
//
// /// <summary>
// /// 主线
// /// </summary>
// [SerializeField] private Rope fishingRope;
//
// /// <summary>
// /// 浮漂和鱼钩线
// /// </summary>
// [SerializeField] private Rope bobberRope;
//
// public LureController Lure;
// public BobberController Bobber;
//
// public JointPinchController PinchController;
//
//
// public float LinelenghtDiferent;
//
// protected override void OnInit()
// {
// var tipRb = Rod.Asset.LineConnectorRigidbody;
// if (isLureConnect)
// {
// Lure.SetJoint(tipRb);
// Lure.EnableCollision(false);
// }
// else
// {
// fishingRope.startAnchor = tipRb;
// Bobber.SetJoint(tipRb);
// Lure.SetJoint(Bobber.rbody);
// Lure.gameObject.SetActive(true);
// Lure.EnableCollision(false);
// Lure.SetKinematic(false);
// }
//
// GetComponentsInChildren<Transform>(includeInactive: true).ToList().ForEach(delegate(Transform i)
// {
// i.gameObject.SetActive(true);
// });
//
// StartCoroutine(LureUseGravity());
// if (isLureConnect)
// {
// fishingRope.Init(Rod);
// }
// else
// {
// fishingRope.Init(Rod);
// bobberRope.Init(Rod);
// }
//
// // rodLine.GenerateLineRendererRope(guides.ToArray(), _LineThickness);
// }
//
// public void InitTest(Rigidbody tipRb)
// {
// if (isLureConnect)
// {
// Lure.SetJoint(tipRb);
// Lure.EnableCollision(false);
// }
// else
// {
// fishingRope.startAnchor = tipRb;
// Bobber.SetJoint(tipRb);
// Lure.SetJoint(Bobber.rbody);
// Lure.gameObject.SetActive(true);
// Lure.EnableCollision(false);
// Lure.SetKinematic(false);
// }
//
// GetComponentsInChildren<Transform>(includeInactive: true).ToList().ForEach(delegate(Transform i)
// {
// i.gameObject.SetActive(true);
// });
//
// StartCoroutine(LureUseGravity());
// if (isLureConnect)
// {
// fishingRope.Init(Rod);
// }
// else
// {
// fishingRope.Init(Rod);
// bobberRope.Init(Rod);
// }
// }
//
// private IEnumerator LureUseGravity()
// {
// yield return 1;
// Lure.gameObject.SetActive(false);
// Lure.gameObject.SetActive(true);
// yield return 1;
// Lure.RBody.useGravity = true;
// }
//
// public void SetTargetLength(float value)
// {
// Log.Error($"SetObiRopeStretch={value}");
// if (value > 3)
// {
// // value -= 0.2f;
// }
//
// fishingRope.SetTargetLength(value);
// }
//
// public void SetLureLength(float value)
// {
// Log.Error($"SetObiRopeStretch={value}");
// bobberRope.SetTargetLength(value);
// }
//
//
// private void Update()
// {
// LinelenghtDiferent = GetLineDistance();
//
// //非钓鱼状态
// Rod.PlayerItem.Tension = Mathf.Clamp(LinelenghtDiferent, 0f, 0.05f);
// }
//
// #region Tension
//
// private float GetLineDistance()
// {
// if (!Bobber.JointRb)
// {
// return 0;
// }
//
// // return 0;
//
// //第一个节点到竿稍的位置-第一段鱼线长度
// return Vector3.Distance(Bobber.transform.position, Bobber.JointRb.transform.position) -
// fishingRope.GetCurrentLength();
// }
//
// public float GetTension(float weight)
// {
// return weight * GetLineDistance();
// }
//
// #endregion
// }
// }

5
Assets/Scripts/Fishing/New/View/Player/Tackle/FLure.cs
View File

@@ -14,7 +14,10 @@ namespace NBF
// SetParent(Rod.lineHandler.LineConnector_1.transform);
SetParent(Rod.Line.Lure.transform);
var node = Rod.Line.GetLogicalNode(FishingLineNode.NodeType.Float);
SetParent(node.transform);
// SetParent(Rod.Line.Lure.transform);
transform.localPosition = Vector3.zero;
}
}

45
Assets/Scripts/Fishing/New/View/Player/Tackle/FRod.cs
View File

@@ -25,7 +25,7 @@ namespace NBF
public FBait Bait;
public FLure Lure;
public FWeight Weight;
public FLine Line;
public FishingLineSolver Line;
public Transform GearRoot;
@@ -72,24 +72,29 @@ namespace NBF
if (Line.LineType == LineType.Spinning)
{
//没有浮漂类型
Line.Lure.SetJointDistance(PlayerItem.LineLength);
if (PlayerItem.StretchRope)
{
// Line.SetTargetLength(PlayerItem.Tension > 0f ? 0f : PlayerItem.LineLength);
Line.SetTargetLength(PlayerItem.LineLength);
}
// Line.Lure.SetJointDistance(PlayerItem.LineLength);
// if (PlayerItem.StretchRope)
// {
// // Line.SetTargetLength(PlayerItem.Tension > 0f ? 0f : PlayerItem.LineLength);
// Line.SetTargetLength(PlayerItem.LineLength);
// }
Line.SetLenght(PlayerItem.LineLength);
}
else
{
//有浮漂
Line.Lure.SetJointDistance(PlayerItem.FloatLength);
Line.Bobber.SetJointDistance(PlayerItem.LineLength - PlayerItem.FloatLength);
if (PlayerItem.StretchRope)
{
// Line.SetTargetLength(PlayerItem.Tension > 0f ? 0f : PlayerItem.LineLength - PlayerItem.FloatLength);
Line.SetTargetLength(PlayerItem.LineLength - PlayerItem.FloatLength);
Line.SetLureLength(PlayerItem.FloatLength);
}
// Line.Lure.SetJointDistance(PlayerItem.FloatLength);
// Line.Bobber.SetJointDistance(PlayerItem.LineLength - PlayerItem.FloatLength);
// if (PlayerItem.StretchRope)
// {
// // Line.SetTargetLength(PlayerItem.Tension > 0f ? 0f : PlayerItem.LineLength - PlayerItem.FloatLength);
// Line.SetTargetLength(PlayerItem.LineLength - PlayerItem.FloatLength);
// Line.SetLureLength(PlayerItem.FloatLength);
// }
Line.SetLenght(PlayerItem.LineLength - PlayerItem.FloatLength);
Line.SetLenght(PlayerItem.FloatLength, 1);
}
}
@@ -251,7 +256,7 @@ namespace NBF
var solver = Instantiate(lineSolverPrefab, GearRoot);
solver.transform.position = Asset.lineConnector.position;
solver.transform.rotation = Asset.lineConnector.rotation;
var indexNames = new[] { "fishing line float set", "fishing line spinning" };
var indexNames = new[] { "FishingLine1", "FishingLine1" };
var path =
$"Assets/ResRaw/Prefabs/Line/{indexNames[currentLineTypeIndex]}.prefab";
var prefab = Assets.Load<GameObject>(path);
@@ -261,7 +266,7 @@ namespace NBF
obj.transform.localScale = Vector3.one;
obj.transform.rotation = Quaternion.identity;
Line = obj.GetComponent<FLine>();
Line = obj.GetComponent<FishingLineSolver>();
Line.transform.position = Asset.lineConnector.position;
Line.Init(this);
}
@@ -339,11 +344,13 @@ namespace NBF
var state = PlayerItem.Owner.State;
Vector3 vector = Line.Lure.transform.position;
var endNode = Line.GetEndNode();
Vector3 vector = endNode.transform.position;
// 当前物体的朝向与指向 Lure 的方向之间的夹角，在 0（完全对齐）到 1（完全相反）之间的一个比例值
float headingAlignment = Vector3.Angle(base.transform.forward,
(Line.Lure.transform.position - transform.position).normalized) / 180f;
(endNode.transform.position - transform.position).normalized) / 180f;
// 经过朝向调制后的有效张力
var effectiveTension = Mathf.Clamp(CurrentTension01 * headingAlignment, 0f, 1f);