From 70769f7e39a9c923debbe760b366b5ee79eada28 Mon Sep 17 00:00:00 2001 From: "Bob.Song" Date: Wed, 29 Apr 2026 17:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ResRaw/Prefabs/Player/Player.prefab | 22 +++++ Assets/Scripts/Fishing/Player/Player.State.cs | 80 +++++++++++++++++++ .../Fishing/Player/Player.State.cs.meta | 3 + Assets/Scripts/Fishing/Player/Player.cs | 13 ++- Assets/Scripts/Fishing/Player/PlayerFSM.cs | 32 ++++++++ .../Scripts/Fishing/Player/PlayerFSM.cs.meta | 3 + .../New/View => Fishing}/Player/States.meta | 0 .../Player/States/IPlayerThrowAnimation.cs | 0 .../States/IPlayerThrowAnimation.cs.meta | 0 .../States/ParabolaPlayerThrowAnimation.cs | 0 .../ParabolaPlayerThrowAnimation.cs.meta | 0 .../Player/States/PlayerStageViewBase.cs | 66 +++++++-------- .../Player/States/PlayerStageViewBase.cs.meta | 0 .../Player/States/PlayerStageViewFight.cs | 2 +- .../States/PlayerStageViewFight.cs.meta | 0 .../Player/States/PlayerStageViewFishing.cs | 4 +- .../States/PlayerStageViewFishing.cs.meta | 0 .../Player/States/PlayerStageViewIdle.cs | 2 +- .../Player/States/PlayerStageViewIdle.cs.meta | 0 .../Player/States/PlayerStageViewPrepare.cs | 4 +- .../States/PlayerStageViewPrepare.cs.meta | 0 .../Player/States/PlayerStageViewThrow.cs | 12 +-- .../States/PlayerStageViewThrow.cs.meta | 0 .../Player/States}/StateEnterParams.cs | 0 .../Player/States}/StateEnterParams.cs.meta | 0 Assets/Scripts/NBC/FSM/FsmTransmit.cs | 42 ---------- Assets/Scripts/NBC/{FSM.meta => FSM~.meta} | 0 Assets/Scripts/NBC/{FSM => FSM~}/Fsm.cs | 4 +- Assets/Scripts/NBC/{FSM => FSM~}/Fsm.cs.meta | 0 .../Scripts/NBC/{FSM => FSM~}/FsmBaseState.cs | 2 +- .../NBC/{FSM => FSM~}/FsmBaseState.cs.meta | 0 Assets/Scripts/NBC/FSM~/FsmTransmit.cs | 42 ++++++++++ .../NBC/{FSM => FSM~}/FsmTransmit.cs.meta | 0 33 files changed, 237 insertions(+), 96 deletions(-) create mode 100644 Assets/Scripts/Fishing/Player/Player.State.cs create mode 100644 Assets/Scripts/Fishing/Player/Player.State.cs.meta create mode 100644 Assets/Scripts/Fishing/Player/PlayerFSM.cs create mode 100644 Assets/Scripts/Fishing/Player/PlayerFSM.cs.meta rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States.meta (100%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/IPlayerThrowAnimation.cs (100%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/IPlayerThrowAnimation.cs.meta (100%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/ParabolaPlayerThrowAnimation.cs (100%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/ParabolaPlayerThrowAnimation.cs.meta (100%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/PlayerStageViewBase.cs (61%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/PlayerStageViewBase.cs.meta (100%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/PlayerStageViewFight.cs (87%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/PlayerStageViewFight.cs.meta (100%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/PlayerStageViewFishing.cs (95%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/PlayerStageViewFishing.cs.meta (100%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/PlayerStageViewIdle.cs (89%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/PlayerStageViewIdle.cs.meta (100%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/PlayerStageViewPrepare.cs (92%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/PlayerStageViewPrepare.cs.meta (100%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/PlayerStageViewThrow.cs (88%) rename Assets/Scripts/{Fishing~/New/View => Fishing}/Player/States/PlayerStageViewThrow.cs.meta (100%) rename Assets/Scripts/{Fishing~/New/Data => Fishing/Player/States}/StateEnterParams.cs (100%) rename Assets/Scripts/{Fishing~/New/Data => Fishing/Player/States}/StateEnterParams.cs.meta (100%) delete mode 100644 Assets/Scripts/NBC/FSM/FsmTransmit.cs rename Assets/Scripts/NBC/{FSM.meta => FSM~.meta} (100%) rename Assets/Scripts/NBC/{FSM => FSM~}/Fsm.cs (97%) rename Assets/Scripts/NBC/{FSM => FSM~}/Fsm.cs.meta (100%) rename Assets/Scripts/NBC/{FSM => FSM~}/FsmBaseState.cs (96%) rename Assets/Scripts/NBC/{FSM => FSM~}/FsmBaseState.cs.meta (100%) create mode 100644 Assets/Scripts/NBC/FSM~/FsmTransmit.cs rename Assets/Scripts/NBC/{FSM => FSM~}/FsmTransmit.cs.meta (100%) diff --git a/Assets/ResRaw/Prefabs/Player/Player.prefab b/Assets/ResRaw/Prefabs/Player/Player.prefab index cea6419bc..5b3e855a4 100644 --- a/Assets/ResRaw/Prefabs/Player/Player.prefab +++ b/Assets/ResRaw/Prefabs/Player/Player.prefab @@ -172,6 +172,7 @@ GameObject: - component: {fileID: 2059248182290203691} - component: {fileID: 8101446342893690422} - component: {fileID: 2923025939212586282} + - component: {fileID: 644643694351368293} m_Layer: 14 m_Name: Player m_TagString: Untagged @@ -259,6 +260,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7c69e72330154a86b756d89e82d276e9, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::NBF.Player + PreviousState: 0 + State: 0 + StateParams: + _keys: [] + _intValues: + _floatValues: [] + _vector3Values: [] + _quaternionValues: [] EyeAngle: 0 IsGrounded: 0 Speed: 0 @@ -277,6 +286,7 @@ MonoBehaviour: minPitch: -75 maxPitch: 60 IsSelf: 0 + TrajectoryPoints: [] --- !u!114 &8101446342893690422 MonoBehaviour: m_ObjectHideFlags: 0 @@ -372,6 +382,18 @@ MonoBehaviour: _standingDownwardForceScale: 1 _camera: {fileID: 0} cameraParent: {fileID: 6835675132305341997} +--- !u!114 &644643694351368293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8172838236951268422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: df8de819db7747ddad97ff39505814a4, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::NBF.PlayerFSM --- !u!1 &8378981416044742488 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Fishing/Player/Player.State.cs b/Assets/Scripts/Fishing/Player/Player.State.cs new file mode 100644 index 000000000..f27fcfa74 --- /dev/null +++ b/Assets/Scripts/Fishing/Player/Player.State.cs @@ -0,0 +1,80 @@ +using System.Collections.Generic; + +namespace NBF +{ + public partial class Player + { + #region 状态 + + /// + /// 上一个状态 + /// + public PlayerState PreviousState; + + /// + /// 当前状态 + /// + public PlayerState State; + + /// + /// 状态参数 + /// + public StateEnterParams StateParams; + + private readonly Dictionary _stageViews = + new Dictionary(); + + private PlayerStageViewBase _currentStateView; + + private void InitState() + { + _stageViews.Add(PlayerState.Idle, new PlayerStageViewIdle()); + _stageViews.Add(PlayerState.Prepare, new PlayerStageViewPrepare()); + _stageViews.Add(PlayerState.Throw, new PlayerStageViewThrow()); + _stageViews.Add(PlayerState.Fishing, new PlayerStageViewFishing()); + _stageViews.Add(PlayerState.Fight, new PlayerStageViewFight()); + foreach (var playerStageView in _stageViews.Values) + { + playerStageView.Init(this); + } + } + + public void UpdateState() + { + _currentStateView?.Update(); + } + + /// + /// 切换状态 + /// + /// + /// + public void ChangeState(PlayerState state, StateEnterParams stateParams = null) + { + if (state == State) + { + return; + } + + PreviousState = State; + State = state; + StateParams = stateParams; + + OnStageChange(); + } + + + public void OnStageChange() + { + if (_currentStateView != null) + { + _currentStateView.Exit(); + } + + _currentStateView = _stageViews.GetValueOrDefault(State); + _currentStateView?.Enter(StateParams, PreviousState); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Player/Player.State.cs.meta b/Assets/Scripts/Fishing/Player/Player.State.cs.meta new file mode 100644 index 000000000..95ada7860 --- /dev/null +++ b/Assets/Scripts/Fishing/Player/Player.State.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4eda3ea2fee445de99d96eefc3acdb85 +timeCreated: 1777453996 \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Player/Player.cs b/Assets/Scripts/Fishing/Player/Player.cs index 197c2613b..bffb67f15 100644 --- a/Assets/Scripts/Fishing/Player/Player.cs +++ b/Assets/Scripts/Fishing/Player/Player.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace NBF { - public class Player : MonoBehaviour + public partial class Player : MonoBehaviour { [Header("角色参数")] public float EyeAngle; public bool IsGrounded; @@ -37,6 +37,11 @@ namespace NBF public bool IsSelf; + /// + /// 抛物线轨迹 + /// + public List TrajectoryPoints = new List(); + #region 生命周期 private void Awake() @@ -50,10 +55,13 @@ namespace NBF { gameObject.AddComponent(); } + + InitState(); } private void Update() { + UpdateState(); } private void FixedUpdate() @@ -61,10 +69,11 @@ namespace NBF } #endregion + #region 手持物品 - private FHandItem HandItem; + public FHandItem HandItem { get; private set; } private bool IsChangeItemIng; public async FTask UseItem(int configId, List bindItems) diff --git a/Assets/Scripts/Fishing/Player/PlayerFSM.cs b/Assets/Scripts/Fishing/Player/PlayerFSM.cs new file mode 100644 index 000000000..57ff90412 --- /dev/null +++ b/Assets/Scripts/Fishing/Player/PlayerFSM.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; + +namespace NBF +{ + public class PlayerFSM : PlayerMonoBehaviour + { + private readonly Dictionary _stageViews = + new Dictionary(); + + private PlayerState _currentState; + private PlayerStageViewBase _currentStateView; + + protected override void OnAwake() + { + _stageViews.Add(PlayerState.Idle, new PlayerStageViewIdle()); + _stageViews.Add(PlayerState.Prepare, new PlayerStageViewPrepare()); + _stageViews.Add(PlayerState.Throw, new PlayerStageViewThrow()); + _stageViews.Add(PlayerState.Fishing, new PlayerStageViewFishing()); + _stageViews.Add(PlayerState.Fight, new PlayerStageViewFight()); + foreach (var playerStageView in _stageViews.Values) + { + playerStageView.Init(Player); + } + } + + private void Update() + { + _currentStateView?.Update(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing/Player/PlayerFSM.cs.meta b/Assets/Scripts/Fishing/Player/PlayerFSM.cs.meta new file mode 100644 index 000000000..694c8c6c1 --- /dev/null +++ b/Assets/Scripts/Fishing/Player/PlayerFSM.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: df8de819db7747ddad97ff39505814a4 +timeCreated: 1777454838 \ No newline at end of file diff --git a/Assets/Scripts/Fishing~/New/View/Player/States.meta b/Assets/Scripts/Fishing/Player/States.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/States.meta rename to Assets/Scripts/Fishing/Player/States.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/IPlayerThrowAnimation.cs b/Assets/Scripts/Fishing/Player/States/IPlayerThrowAnimation.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/States/IPlayerThrowAnimation.cs rename to Assets/Scripts/Fishing/Player/States/IPlayerThrowAnimation.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/IPlayerThrowAnimation.cs.meta b/Assets/Scripts/Fishing/Player/States/IPlayerThrowAnimation.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/States/IPlayerThrowAnimation.cs.meta rename to Assets/Scripts/Fishing/Player/States/IPlayerThrowAnimation.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/ParabolaPlayerThrowAnimation.cs b/Assets/Scripts/Fishing/Player/States/ParabolaPlayerThrowAnimation.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/States/ParabolaPlayerThrowAnimation.cs rename to Assets/Scripts/Fishing/Player/States/ParabolaPlayerThrowAnimation.cs diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/ParabolaPlayerThrowAnimation.cs.meta b/Assets/Scripts/Fishing/Player/States/ParabolaPlayerThrowAnimation.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/States/ParabolaPlayerThrowAnimation.cs.meta rename to Assets/Scripts/Fishing/Player/States/ParabolaPlayerThrowAnimation.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewBase.cs b/Assets/Scripts/Fishing/Player/States/PlayerStageViewBase.cs similarity index 61% rename from Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewBase.cs rename to Assets/Scripts/Fishing/Player/States/PlayerStageViewBase.cs index 5e57e3cd9..f91ef2f21 100644 --- a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewBase.cs +++ b/Assets/Scripts/Fishing/Player/States/PlayerStageViewBase.cs @@ -36,7 +36,6 @@ namespace NBF public abstract class PlayerStageViewBase { public Player Player { get; private set; } - public PlayerView PlayerView { get; private set; } protected float EnterTime { get; set; } protected PlayerState PreviousState { get; private set; } @@ -45,7 +44,6 @@ namespace NBF public void Init(Player player) { Player = player; - PlayerView = player.GetComponent(); } /// @@ -95,18 +93,13 @@ namespace NBF public void TakeLine() { if (Player == null) return; - var view = Player.GetComponent(); - if (view != null) + if (Player.HandItem is FRod rod) { - var handItemView = Player.HandItem.GetComponent(); - if (handItemView != null && handItemView.Rod != null) + var endNode = rod.Line.EndNode; + var pinch = endNode.GetComponent(); + if (pinch != null) { - var endNode = handItemView.Rod.Line.EndNode; - var pinch = endNode.GetComponent(); - if (pinch != null) - { - pinch.StartPinch(view.Unity.ModelAsset.Pinch); - } + pinch.StartPinch(Player.ModelAsset.Pinch); } } } @@ -114,18 +107,13 @@ namespace NBF public void UnTakeLine() { if (Player == null) return; - var view = Player.GetComponent(); - if (view != null) + if (Player.HandItem is FRod rod) { - var handItemView = Player.HandItem.GetComponent(); - if (handItemView != null && handItemView.Rod != null) + var endNode = rod.Line.EndNode; + var pinch = endNode.GetComponent(); + if (pinch != null) { - var endNode = handItemView.Rod.Line.EndNode; - var pinch = endNode.GetComponent(); - if (pinch != null) - { - pinch.ReleasePinch(); - } + pinch.ReleasePinch(); } } } @@ -163,7 +151,7 @@ namespace NBF } } - if (isUpRod || PlayerView.Unity.ModelAsset.PlayerAnimator.FishingUp > 0) + if (isUpRod || Player.ModelAsset.PlayerAnimator.FishingUp > 0) { var upForce = 1; var addNum = upForce * Time.deltaTime; @@ -176,20 +164,20 @@ namespace NBF addNum *= 0.5f; } - PlayerView.Unity.ModelAsset.PlayerAnimator.FishingUp += addNum; - Debug.Log($"addNum={addNum} ishingFinal={PlayerView.Unity.ModelAsset.PlayerAnimator.FishingUp}"); - if (PlayerView.Unity.ModelAsset.PlayerAnimator.FishingUp >= 1) + Player.ModelAsset.PlayerAnimator.FishingUp += addNum; + Debug.Log($"addNum={addNum} ishingFinal={Player.ModelAsset.PlayerAnimator.FishingUp}"); + if (Player.ModelAsset.PlayerAnimator.FishingUp >= 1) { - PlayerView.Unity.ModelAsset.PlayerAnimator.FishingUp = 1; + Player.ModelAsset.PlayerAnimator.FishingUp = 1; } - else if (PlayerView.Unity.ModelAsset.PlayerAnimator.FishingUp < 0) + else if (Player.ModelAsset.PlayerAnimator.FishingUp < 0) { - PlayerView.Unity.ModelAsset.PlayerAnimator.FishingUp = 0; + Player.ModelAsset.PlayerAnimator.FishingUp = 0; } } else { - PlayerView.Unity.ModelAsset.PlayerAnimator.FishingUp = 0; + Player.ModelAsset.PlayerAnimator.FishingUp = 0; } } @@ -197,14 +185,18 @@ namespace NBF public FRod GetRod() { - var view = Player.GetComponent(); - if (view != null) + // var view = Player.GetComponent(); + // if (view != null) + // { + // var handItemView = Player.HandItem.GetComponent(); + // if (handItemView != null && handItemView.Rod != null) + // { + // return handItemView.Rod; + // } + // } + if (Player != null) { - var handItemView = Player.HandItem.GetComponent(); - if (handItemView != null && handItemView.Rod != null) - { - return handItemView.Rod; - } + return Player.HandItem as FRod; } return null; diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewBase.cs.meta b/Assets/Scripts/Fishing/Player/States/PlayerStageViewBase.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewBase.cs.meta rename to Assets/Scripts/Fishing/Player/States/PlayerStageViewBase.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewFight.cs b/Assets/Scripts/Fishing/Player/States/PlayerStageViewFight.cs similarity index 87% rename from Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewFight.cs rename to Assets/Scripts/Fishing/Player/States/PlayerStageViewFight.cs index 6569d82d8..1e50f0860 100644 --- a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewFight.cs +++ b/Assets/Scripts/Fishing/Player/States/PlayerStageViewFight.cs @@ -15,7 +15,7 @@ PlayerState ret = PlayerState.None; RodUpDown(); - if (PlayerView.Unity.ModelAsset.PlayerAnimator.FishingUp >= 0.8f) + if (Player.ModelAsset.PlayerAnimator.FishingUp >= 0.8f) { // ret = CheckTackFish(); } diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewFight.cs.meta b/Assets/Scripts/Fishing/Player/States/PlayerStageViewFight.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewFight.cs.meta rename to Assets/Scripts/Fishing/Player/States/PlayerStageViewFight.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewFishing.cs b/Assets/Scripts/Fishing/Player/States/PlayerStageViewFishing.cs similarity index 95% rename from Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewFishing.cs rename to Assets/Scripts/Fishing/Player/States/PlayerStageViewFishing.cs index c536b3f21..3b7026b80 100644 --- a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewFishing.cs +++ b/Assets/Scripts/Fishing/Player/States/PlayerStageViewFishing.cs @@ -7,7 +7,7 @@ namespace NBF protected override void OnEnter() { Debug.LogError("enter PlayerStateFishing"); - PlayerView.Unity.ModelAsset.PlayerAnimator.BaitThrown = true; + Player.ModelAsset.PlayerAnimator.BaitThrown = true; } protected override void OnExit() @@ -20,7 +20,7 @@ namespace NBF PlayerState ret = PlayerState.None; RodUpDown(); - if (PlayerView.Unity.ModelAsset.PlayerAnimator.FishingUp >= 0.8f) + if (Player.ModelAsset.PlayerAnimator.FishingUp >= 0.8f) { ret = CheckTackFish(); } diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewFishing.cs.meta b/Assets/Scripts/Fishing/Player/States/PlayerStageViewFishing.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewFishing.cs.meta rename to Assets/Scripts/Fishing/Player/States/PlayerStageViewFishing.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewIdle.cs b/Assets/Scripts/Fishing/Player/States/PlayerStageViewIdle.cs similarity index 89% rename from Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewIdle.cs rename to Assets/Scripts/Fishing/Player/States/PlayerStageViewIdle.cs index d1f68b762..1e071f397 100644 --- a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewIdle.cs +++ b/Assets/Scripts/Fishing/Player/States/PlayerStageViewIdle.cs @@ -4,7 +4,7 @@ { protected override void OnEnter() { - PlayerView.Unity.ModelAsset.PlayerAnimator.BaitThrown = false; + Player.ModelAsset.PlayerAnimator.BaitThrown = false; InputManager.OnOp1Action += OnOp1Action; TakeLine(); } diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewIdle.cs.meta b/Assets/Scripts/Fishing/Player/States/PlayerStageViewIdle.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewIdle.cs.meta rename to Assets/Scripts/Fishing/Player/States/PlayerStageViewIdle.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewPrepare.cs b/Assets/Scripts/Fishing/Player/States/PlayerStageViewPrepare.cs similarity index 92% rename from Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewPrepare.cs rename to Assets/Scripts/Fishing/Player/States/PlayerStageViewPrepare.cs index 0fe01accc..817482bcd 100644 --- a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewPrepare.cs +++ b/Assets/Scripts/Fishing/Player/States/PlayerStageViewPrepare.cs @@ -28,8 +28,8 @@ namespace NBF Log.Info("enter PlayerStatePrepare"); ChargedProgress = 0; Stage = Phase.Charged; - PlayerView.Unity.ModelAsset.PlayerAnimator.PrepareThrow = true; - PlayerView.Unity.ModelAsset.PlayerAnimator.FishingUp = 0; + Player.ModelAsset.PlayerAnimator.PrepareThrow = true; + Player.ModelAsset.PlayerAnimator.FishingUp = 0; } protected override void OnUpdate() diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewPrepare.cs.meta b/Assets/Scripts/Fishing/Player/States/PlayerStageViewPrepare.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewPrepare.cs.meta rename to Assets/Scripts/Fishing/Player/States/PlayerStageViewPrepare.cs.meta diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewThrow.cs b/Assets/Scripts/Fishing/Player/States/PlayerStageViewThrow.cs similarity index 88% rename from Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewThrow.cs rename to Assets/Scripts/Fishing/Player/States/PlayerStageViewThrow.cs index fb8d6bfb3..4d133756a 100644 --- a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewThrow.cs +++ b/Assets/Scripts/Fishing/Player/States/PlayerStageViewThrow.cs @@ -14,7 +14,7 @@ namespace NBF protected override void OnEnter() { Log.Info("enter PlayerStateThrow"); - PlayerView.Unity.ModelAsset.PlayerAnimator.StartThrow = true; + Player.ModelAsset.PlayerAnimator.StartThrow = true; ChargedProgress = 0; if (Params != null) @@ -57,8 +57,8 @@ namespace NBF { Debug.LogError("OnRodThrowStart"); UnTakeLine(); - PlayerView.Unity.ModelAsset.PlayerAnimator.PrepareThrow = false; - PlayerView.Unity.ModelAsset.PlayerAnimator.StartThrow = false; + Player.ModelAsset.PlayerAnimator.PrepareThrow = false; + Player.ModelAsset.PlayerAnimator.StartThrow = false; var rod = GetRod(); if (rod == null || rod.Line == null) @@ -71,9 +71,9 @@ namespace NBF _throwAnimation?.Play(new ThrowAnimationRequest { EndNode = rod.Line.EndNode, - ThrowOriginPosition = PlayerView.Unity.transform.position, + ThrowOriginPosition = Player.transform.position, StartPosition = rod.Line.EndNode.Rigidbody.position, - Forward = PlayerView.Unity.transform.forward, + Forward = Player.transform.forward, ChargedProgress = ChargedProgress }); } @@ -108,4 +108,4 @@ namespace NBF } } } -} +} \ No newline at end of file diff --git a/Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewThrow.cs.meta b/Assets/Scripts/Fishing/Player/States/PlayerStageViewThrow.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/View/Player/States/PlayerStageViewThrow.cs.meta rename to Assets/Scripts/Fishing/Player/States/PlayerStageViewThrow.cs.meta diff --git a/Assets/Scripts/Fishing~/New/Data/StateEnterParams.cs b/Assets/Scripts/Fishing/Player/States/StateEnterParams.cs similarity index 100% rename from Assets/Scripts/Fishing~/New/Data/StateEnterParams.cs rename to Assets/Scripts/Fishing/Player/States/StateEnterParams.cs diff --git a/Assets/Scripts/Fishing~/New/Data/StateEnterParams.cs.meta b/Assets/Scripts/Fishing/Player/States/StateEnterParams.cs.meta similarity index 100% rename from Assets/Scripts/Fishing~/New/Data/StateEnterParams.cs.meta rename to Assets/Scripts/Fishing/Player/States/StateEnterParams.cs.meta diff --git a/Assets/Scripts/NBC/FSM/FsmTransmit.cs b/Assets/Scripts/NBC/FSM/FsmTransmit.cs deleted file mode 100644 index f1cb590cd..000000000 --- a/Assets/Scripts/NBC/FSM/FsmTransmit.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System.Collections.Generic; -using System.Linq; - -namespace NBC -{ - public class FsmTransmit - { - private readonly List _queue = new List(); - - public List AllParam => _queue; - - public void Add(object o) - { - _queue.Add(o); - } - - public void AddRange(FsmTransmit transmit) - { - _queue.AddRange(transmit.AllParam); - } - - public void AddRange(IEnumerable o) - { - _queue.AddRange(o); - } - - public object Get(int index) - { - if (index >= 0 && index < _queue.Count) - { - return _queue[index]; - } - - return null; - } - - public void Clear() - { - _queue.Clear(); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/NBC/FSM.meta b/Assets/Scripts/NBC/FSM~.meta similarity index 100% rename from Assets/Scripts/NBC/FSM.meta rename to Assets/Scripts/NBC/FSM~.meta diff --git a/Assets/Scripts/NBC/FSM/Fsm.cs b/Assets/Scripts/NBC/FSM~/Fsm.cs similarity index 97% rename from Assets/Scripts/NBC/FSM/Fsm.cs rename to Assets/Scripts/NBC/FSM~/Fsm.cs index 81b8a8b85..db8fcdaad 100644 --- a/Assets/Scripts/NBC/FSM/Fsm.cs +++ b/Assets/Scripts/NBC/FSM~/Fsm.cs @@ -62,7 +62,7 @@ namespace NBC public void EnterState(uint stateId, FsmBaseState sourceState = null) { uint prevState = 0; - FsmTransmit param = null; + StateEnterParams param = null; if (_currentState != null) { prevState = _currentState.StateId; @@ -74,7 +74,7 @@ namespace NBC _currentState.PrevState = prevState; if (param != null) { - _currentState.Params.AddRange(param); + _currentState.Params = param; param.Clear(); } diff --git a/Assets/Scripts/NBC/FSM/Fsm.cs.meta b/Assets/Scripts/NBC/FSM~/Fsm.cs.meta similarity index 100% rename from Assets/Scripts/NBC/FSM/Fsm.cs.meta rename to Assets/Scripts/NBC/FSM~/Fsm.cs.meta diff --git a/Assets/Scripts/NBC/FSM/FsmBaseState.cs b/Assets/Scripts/NBC/FSM~/FsmBaseState.cs similarity index 96% rename from Assets/Scripts/NBC/FSM/FsmBaseState.cs rename to Assets/Scripts/NBC/FSM~/FsmBaseState.cs index c42b02261..a7f1836a0 100644 --- a/Assets/Scripts/NBC/FSM/FsmBaseState.cs +++ b/Assets/Scripts/NBC/FSM~/FsmBaseState.cs @@ -9,7 +9,7 @@ namespace NBC protected TOwnerClass _owner; protected Fsm Root; - public FsmTransmit Params = new FsmTransmit(); + public StateEnterParams Params = new FsmTransmit(); public abstract uint StateId { get; } diff --git a/Assets/Scripts/NBC/FSM/FsmBaseState.cs.meta b/Assets/Scripts/NBC/FSM~/FsmBaseState.cs.meta similarity index 100% rename from Assets/Scripts/NBC/FSM/FsmBaseState.cs.meta rename to Assets/Scripts/NBC/FSM~/FsmBaseState.cs.meta diff --git a/Assets/Scripts/NBC/FSM~/FsmTransmit.cs b/Assets/Scripts/NBC/FSM~/FsmTransmit.cs new file mode 100644 index 000000000..863dbc4e7 --- /dev/null +++ b/Assets/Scripts/NBC/FSM~/FsmTransmit.cs @@ -0,0 +1,42 @@ +// using System.Collections.Generic; +// using System.Linq; +// +// namespace NBC +// { +// public class FsmTransmit +// { +// private readonly List _queue = new List(); +// +// public List AllParam => _queue; +// +// public void Add(object o) +// { +// _queue.Add(o); +// } +// +// public void AddRange(FsmTransmit transmit) +// { +// _queue.AddRange(transmit.AllParam); +// } +// +// public void AddRange(IEnumerable o) +// { +// _queue.AddRange(o); +// } +// +// public object Get(int index) +// { +// if (index >= 0 && index < _queue.Count) +// { +// return _queue[index]; +// } +// +// return null; +// } +// +// public void Clear() +// { +// _queue.Clear(); +// } +// } +// } \ No newline at end of file diff --git a/Assets/Scripts/NBC/FSM/FsmTransmit.cs.meta b/Assets/Scripts/NBC/FSM~/FsmTransmit.cs.meta similarity index 100% rename from Assets/Scripts/NBC/FSM/FsmTransmit.cs.meta rename to Assets/Scripts/NBC/FSM~/FsmTransmit.cs.meta