优化输入回放逻辑 + 调整项目结构

Assets/Scripts/Player/Input/IInputSource.cs

@@ -0,0 +1,11 @@
+using UnityEngine;
+
+/// <summary>
+/// 输入源接口，用于解耦输入捕获
+/// </summary>
+public interface IInputSource
+{
+    Vector3 GetPlanarInput();
+    bool ConsumeShootInput();
+    Vector3 GetAimDirection();
+}

Assets/Scripts/Player/Input/IInputSource.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e7d6671c80a243619f1f3dc34ca92d15
+timeCreated: 1775619222

Assets/Scripts/Player/Input/InputComponent.cs

@@ -0,0 +1,137 @@
+using System;
+using Network.Defines;
+using UnityEngine;
+using Vector3 = UnityEngine.Vector3;
+
+
+/// <summary>
+/// 输入组件，负责从 IInputSource 获取输入、发送 MoveInput 到服务器、管理 tick
+/// Update() 是唯一调用 SendMoveInput / SendShootInput 的地方
+/// </summary>
+public class InputComponent : MonoBehaviour
+{
+    [SerializeField] private string _playerId = "player";
+    [SerializeField] private float _sendInterval = 0.05f; // 50ms 发送间隔
+
+    private IInputSource _inputSource;
+    private Vector3 _currentInput;
+    private Vector3 _lastAimDirection = Vector3.forward;
+    private float _lastSendTime;
+    private bool _stopMessagePending;
+    private bool _wasMovingLastFrame;
+    private long _tick;
+
+    public event Action<MoveInput> OnMoveInputCreated;
+    public event Action<ShootInput> OnShootInputCreated;
+
+    public long CurrentTick => _tick;
+
+    /// <summary>
+    /// 设置玩家 ID（由 MovementComponent.Init 调用）
+    /// </summary>
+    public void InjectPlayerId(string playerId)
+    {
+        _playerId = playerId;
+    }
+
+    private void Awake()
+    {
+        var camera = Camera.main;
+        _inputSource = new UnityInputSource(camera?.transform);
+    }
+
+    /// <summary>
+    /// 设置自定义输入源（用于替换默认的 UnityInputSource）
+    /// </summary>
+    public void SetInputSource(IInputSource source)
+    {
+        _inputSource = source ?? throw new ArgumentNullException(nameof(source));
+    }
+
+    /// <summary>
+    /// 获取当前输入源（用于测试）
+    /// </summary>
+    public IInputSource GetInputSource()
+    {
+        return _inputSource;
+    }
+
+    /// <summary>
+    /// 重置 tick（用于测试）
+    /// </summary>
+    public void ResetTick(long tick = 0)
+    {
+        _tick = tick;
+    }
+
+    private void Update()
+    {
+        // 从输入源获取输入
+        _currentInput = _inputSource?.GetPlanarInput() ?? Vector3.zero;
+
+        // 检测移动状态变化
+        bool hasMovement = ClientGameplayInputFlow.HasPlanarInput(_currentInput);
+        if (hasMovement)
+        {
+            _stopMessagePending = false;
+        }
+        else if (_wasMovingLastFrame)
+        {
+            _stopMessagePending = true;
+        }
+
+        _wasMovingLastFrame = hasMovement;
+
+        // 处理射击输入
+        var shootInput = GetShootInput();
+        if (shootInput != null && NetworkManager.Instance != null)
+        {
+            NetworkManager.Instance.SendShootInput(shootInput);
+            OnShootInputCreated?.Invoke(shootInput);
+        }
+
+        // 定期发送移动输入
+        if (Time.time - _lastSendTime > _sendInterval)
+        {
+            SendMoveInput();
+        }
+    }
+
+    private void SendMoveInput()
+    {
+        if (!ClientGameplayInputFlow.TryCreateMoveInput(_playerId, _tick, _currentInput,
+                _stopMessagePending, out var moveInput))
+        {
+            return;
+        }
+
+        if (NetworkManager.Instance != null)
+        {
+            NetworkManager.Instance.SendMoveInput(moveInput);
+        }
+
+        OnMoveInputCreated?.Invoke(moveInput);
+        _stopMessagePending = false;
+        _lastSendTime = Time.time;
+        _tick++;
+    }
+
+    private ShootInput GetShootInput()
+    {
+        var shootTriggered = _inputSource?.ConsumeShootInput() ?? false;
+        var aimDirection = _inputSource?.GetAimDirection() ?? Vector3.forward;
+
+        if (!shootTriggered)
+        {
+            return null;
+        }
+
+        var planarForward = Vector3.ProjectOnPlane(aimDirection, Vector3.up);
+        if (ClientGameplayInputFlow.HasPlanarInput(planarForward))
+        {
+            _lastAimDirection = planarForward;
+        }
+
+        return ClientGameplayInputFlow.CreateShootInput(_playerId, _tick, _lastAimDirection);
+    }
+}

Assets/Scripts/Player/Input/InputComponent.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 76493c52bd37a4a4db167d10a4dd6369
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Player/Input/SimulatedInputSource.cs

@@ -0,0 +1,82 @@
+using UnityEngine;
+
+/// <summary>
+/// 模拟输入源（测试用），提供预设的输入序列
+/// </summary>
+public class SimulatedInputSource : IInputSource
+{
+    private readonly (float turn, float throttle)[] _inputSequence;
+    private int _index;
+    private Vector3 _lastAimDirection = Vector3.forward;
+    private bool _shootTriggered;
+
+    public SimulatedInputSource((float turn, float throttle)[] sequence)
+    {
+        _inputSequence = sequence;
+        _index = 0;
+    }
+
+    public Vector3 GetPlanarInput()
+    {
+        if (_index >= _inputSequence.Length)
+        {
+            return Vector3.zero;
+        }
+
+        var (turn, throttle) = _inputSequence[_index];
+        return new Vector3(turn, 0f, throttle);
+    }
+
+    public bool ConsumeShootInput()
+    {
+        if (_shootTriggered)
+        {
+            _shootTriggered = false;
+            return true;
+        }
+
+        return false;
+    }
+
+    public Vector3 GetAimDirection()
+    {
+        return _lastAimDirection;
+    }
+
+    /// <summary>
+    /// 推进到下一个输入
+    /// </summary>
+    public void Advance()
+    {
+        if (_index < _inputSequence.Length)
+        {
+            _index++;
+        }
+    }
+
+    /// <summary>
+    /// 是否还有更多输入
+    /// </summary>
+    public bool HasMore => _index < _inputSequence.Length;
+
+    /// <summary>
+    /// 设置射击触发（下次 ConsumeShootInput 返回 true）
+    /// </summary>
+    public void SetShootTriggered()
+    {
+        _shootTriggered = true;
+    }
+
+    /// <summary>
+    /// 设置瞄准方向
+    /// </summary>
+    public void SetAimDirection(Vector3 direction)
+    {
+        _lastAimDirection = direction;
+    }
+
+    /// <summary>
+    /// 获取当前输入索引
+    /// </summary>
+    public int CurrentIndex => _index;
+}

Assets/Scripts/Player/Input/SimulatedInputSource.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 53e3773e493842e8861ac7522a6227a9
+timeCreated: 1775619270

Assets/Scripts/Player/Input/UnityInputSource.cs

@@ -0,0 +1,34 @@
+using UnityEngine;
+
+/// <summary>
+/// 真实的 Unity 输入源
+/// </summary>
+public class UnityInputSource : IInputSource
+{
+    private readonly Transform _cameraTransform;
+
+    public UnityInputSource(Transform cameraTransform)
+    {
+        _cameraTransform = cameraTransform;
+    }
+
+    public Vector3 GetPlanarInput()
+    {
+        return new Vector3(Input.GetAxisRaw("Horizontal"), 0f, Input.GetAxisRaw("Vertical"));
+    }
+
+    public bool ConsumeShootInput()
+    {
+        return Input.GetMouseButtonDown(0);
+    }
+
+    public Vector3 GetAimDirection()
+    {
+        if (_cameraTransform != null)
+        {
+            return _cameraTransform.forward;
+        }
+
+        return Vector3.forward;
+    }
+}

Assets/Scripts/Player/Input/UnityInputSource.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5d7f0a25d2b54decbf2c2386e5c0ebd2
+timeCreated: 1775619246