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

ECM2

Browse Source
This commit is contained in:
BobSong
2025-05-11 00:46:26 +08:00
parent 366f9e95ec
commit 618f75f911
2404 changed files with 154475 additions and 924730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Scripts/Fishing/Player/FPlayer.Hand.cs
View File

@@ -85,7 +85,7 @@ public partial class FPlayer
interactionCCDIK = component;
if (Gears.Reel)
{
Gears.Reel.isHandOnHandle = false;
Data.isHandOnHandle = false;
}
return;
@@ -99,7 +99,7 @@ public partial class FPlayer
interactionCCDIK = component;
if ((bool)Gears.Rod && (bool)Gears.Reel)
{
Gears.Reel.isHandOnHandle = true;
Data.isHandOnHandle = true;
}
break;
@@ -110,11 +110,10 @@ public partial class FPlayer
interactionCCDIK = component;
if ((bool)Gears.Rod && (bool)Gears.Reel)
{
Gears.Reel.isHandOnHandle = false;
Data.isHandOnHandle = false;
}
break;
}
}
}

32
Assets/Scripts/Fishing/Player/Gear/FFloat.cs
View File

@@ -167,22 +167,22 @@ public class FFloat : FPlayerGear
currentFloatDeepth = newDeepth;
}
if (InputManager.isDeepthFloatUp)
{
newDeepth += 0.1f;
newDeepth = Mathf.Clamp(newDeepth, 0.15f, 2.5f);
Owner.Data.currentGear.SetBobberLastSetGroundValue(newDeepth);
// GameManager.Instance.ShowMessagePopup(LanguageManager.Instance.GetText("SET_FLOAT_DEEPTH_TO") + newDeepth.ToString("F2") + " m", FScriptsHandler.Instance.m_Canvas.transform, deleteLast: true);
}
if (InputManager.isDeepthFloatDown)
{
newDeepth -= 0.1f;
newDeepth = Mathf.Clamp(newDeepth, 0.15f, 2.5f);
Owner.Data.currentGear.SetBobberLastSetGroundValue(newDeepth);
// GameManager.Instance.ShowMessagePopup(LanguageManager.Instance.GetText("SET_FLOAT_DEEPTH_TO") + newDeepth.ToString("F2") + " m", FScriptsHandler.Instance.m_Canvas.transform, deleteLast: true);
}
// if (InputManager.isDeepthFloatUp)
// {
// newDeepth += 0.1f;
// newDeepth = Mathf.Clamp(newDeepth, 0.15f, 2.5f);
// Owner.Data.currentGear.SetBobberLastSetGroundValue(newDeepth);
// // GameManager.Instance.ShowMessagePopup(LanguageManager.Instance.GetText("SET_FLOAT_DEEPTH_TO") + newDeepth.ToString("F2") + " m", FScriptsHandler.Instance.m_Canvas.transform, deleteLast: true);
// }
//
// if (InputManager.isDeepthFloatDown)
// {
// newDeepth -= 0.1f;
// newDeepth = Mathf.Clamp(newDeepth, 0.15f, 2.5f);
//
// Owner.Data.currentGear.SetBobberLastSetGroundValue(newDeepth);
// // GameManager.Instance.ShowMessagePopup(LanguageManager.Instance.GetText("SET_FLOAT_DEEPTH_TO") + newDeepth.ToString("F2") + " m", FScriptsHandler.Instance.m_Canvas.transform, deleteLast: true);
// }
if (Owner.Data.selectorRodSetting == SelectorRodSetting.Leeder &&
Input.mouseScrollDelta.y != 0f && Time.timeScale != 0f)

6
Assets/Scripts/Fishing/Player/Gear/FLineHandler.cs
View File

@@ -137,9 +137,9 @@ public class FLineHandler : MonoBehaviour
LineConnector_1.maxDistance = 0.1f + Rod.Owner.Data.lineLength;
if (Input.GetKey(KeyCode.E))
{
var speed = 1;
obiRopeCursor_1.ChangeLength(LineConnector_1.maxDistance);
Debug.Log(obiRopeSegment_1.restLength);
// var speed = 1;
// obiRopeCursor_1.ChangeLength(LineConnector_1.maxDistance);
// Debug.Log(obiRopeSegment_1.restLength);
}
// var addLength = LineConnector_1.maxDistance - obiRopeSegment_1.restLength;

14
Assets/Scripts/Fishing/Player/Gear/FReel.cs
View File

@@ -6,15 +6,9 @@ public class FReel : FPlayerGear
{
public bool isBlockLineByFinger { get; set; }
/// <summary>
/// 手是否放在手柄上
/// </summary>
[HideInInspector]
public bool isHandOnHandle { get; set; }
[SerializeField] public float reelingDrag = 1f;
public ReelAsset reelAsset;
@@ -37,6 +31,12 @@ public class FReel : FPlayerGear
protected override void OnUpdate()
{
AnimatorCtrl.Reeling = Owner.Data.reelSpeed;
if (Owner.Data.reelSpeed > 0)
{
Unlock();
}
// Reeling();
}
public void Unlock(bool unlock = true)

4
Assets/Scripts/Fishing/Player/Gear/FRod.cs
View File

@@ -218,7 +218,7 @@ public class FRod : FPlayerGear
if ((bool)lineHandler)
{
ObiSolver component = lineHandler.GetComponent<ObiSolver>();
// SceneSettings.Instance.obiFixedUpdater.solvers.Remove(component);
SceneSettings.Instance.obiFixedUpdater.solvers.Remove(component);
Destroy(lineHandler.gameObject);
lineHandler = null;
}
@@ -265,7 +265,7 @@ public class FRod : FPlayerGear
// lineHandler.toRodConnector.target = rodAsset.lineConnector;
lineHandler.Rod = this;
var obiSolver = lineHandler.GetComponent<ObiSolver>();
// SceneSettings.Instance.obiFixedUpdater.solvers.Add(obiSolver);
SceneSettings.Instance.obiFixedUpdater.solvers.Add(obiSolver);
}
}

58
Assets/Scripts/Fishing/Player/Sync/FPlayerMainSync.cs
View File

@@ -44,11 +44,11 @@ namespace NBF
private void Update()
{
firstPersonController.horizontal = InputManager.movementAxis.x;
firstPersonController.vertical = InputManager.movementAxis.y;
firstPersonController.isJumping = InputManager.isJumping;
firstPersonController.isRuning = InputManager.isRunning;
// firstPersonController.horizontal = InputManager.movementAxis.x;
// firstPersonController.vertical = InputManager.movementAxis.y;
//
// firstPersonController.isJumping = InputManager.isJumping;
// firstPersonController.isRuning = InputManager.isRunning;
// firstPersonController.m_MouseLook.ControllerHandMode = GameManager.Instance._playerData
// .Player[GameManager.Instance._playerData.currentPlayerProfileIndex].controllerSetup;
@@ -77,30 +77,30 @@ namespace NBF
if (_player.CanChangeGear())
{
if (InputManager.isShowSlot0)
{
nextShowSlotIndex = 0;
}
if (InputManager.isShowSlot1)
{
nextShowSlotIndex = 1;
}
if (InputManager.isShowSlot2)
{
nextShowSlotIndex = 2;
}
if (InputManager.isShowSlot3)
{
nextShowSlotIndex = 3;
}
if (InputManager.isShowSlot4)
{
nextShowSlotIndex = 4;
}
// if (InputManager.isShowSlot0)
// {
// nextShowSlotIndex = 0;
// }
//
// if (InputManager.isShowSlot1)
// {
// nextShowSlotIndex = 1;
// }
//
// if (InputManager.isShowSlot2)
// {
// nextShowSlotIndex = 2;
// }
//
// if (InputManager.isShowSlot3)
// {
// nextShowSlotIndex = 3;
// }
//
// if (InputManager.isShowSlot4)
// {
// nextShowSlotIndex = 4;
// }
if (nextShowSlotIndex != -1)
{