diff --git a/DungeonShooting_Godot/src/game/role/IState.cs b/DungeonShooting_Godot/src/game/role/IState.cs
deleted file mode 100644
index 0a7c2b0..0000000
--- a/DungeonShooting_Godot/src/game/role/IState.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;/// <summary>
-/// 状态接口
-/// </summary>
-public interface IState<T, S> where T : ActivityObject where S : Enum
-{
-    /// <summary>
-    /// 当前状态对象对应的状态枚举类型
-    /// </summary>
-    S StateType { get; }
-
-    /// <summary>
-    /// 当前状态对象挂载的角色对象
-    /// </summary>
-    T Master { get; set; }
-
-    /// <summary>
-    /// 当前状态对象所处的状态机对象
-    /// </summary>
-    StateController<T, S> StateController { get; set; }
-
-    /// <summary>
-    /// 当从其他状态进入到当前状态时调用
-    /// </summary>
-    /// <param name="prev">上一个状态类型</param>
-    /// <param name="args">切换当前状态时附带的参数</param>
-    void Enter(S prev, params object[] args);
-
-    /// <summary>
-    /// 物理帧每帧更新
-    /// </summary>
-    void PhysicsProcess(float delta);
-
-    /// <summary>
-    /// 是否允许切换至下一个状态
-    /// </summary>
-    /// <param name="next">下一个状态类型</param>
-    bool CanChangeState(S next);
-
-    /// <summary>
-    /// 从当前状态退出时调用
-    /// </summary>
-    /// <param name="next">下一个状态类型</param>
-    void Exit(S next);
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/role/StateBase.cs b/DungeonShooting_Godot/src/game/role/StateBase.cs
new file mode 100644
index 0000000..531f049
--- /dev/null
+++ b/DungeonShooting_Godot/src/game/role/StateBase.cs
@@ -0,0 +1,63 @@
+using System;
+
+/// <summary>
+/// 状态基类
+/// </summary>
+public abstract class StateBase<T, S> where T : ActivityObject where S : Enum
+{
+    /// <summary>
+    /// 当前状态对象对应的状态枚举类型
+    /// </summary>
+    public S StateType { get; }
+
+    /// <summary>
+    /// 当前状态对象挂载的角色对象
+    /// </summary>
+    public T Master { get; set; }
+
+    /// <summary>
+    /// 当前状态对象所处的状态机对象
+    /// </summary>
+    public StateController<T, S> StateController { get; set; }
+
+    public StateBase(S state)
+    {
+        StateType = state;
+    }
+    
+    /// <summary>
+    /// 当从其他状态进入到当前状态时调用
+    /// </summary>
+    /// <param name="prev">上一个状态类型</param>
+    /// <param name="args">切换当前状态时附带的参数</param>
+    public virtual void Enter(S prev, params object[] args)
+    {
+        
+    }
+
+    /// <summary>
+    /// 物理帧每帧更新
+    /// </summary>
+    public virtual void PhysicsProcess(float delta)
+    {
+        
+    }
+
+    /// <summary>
+    /// 是否允许切换至下一个状态
+    /// </summary>
+    /// <param name="next">下一个状态类型</param>
+    public virtual bool CanChangeState(S next)
+    {
+        return true;
+    }
+
+    /// <summary>
+    /// 从当前状态退出时调用
+    /// </summary>
+    /// <param name="next">下一个状态类型</param>
+    public virtual void Exit(S next)
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/role/StateController.cs b/DungeonShooting_Godot/src/game/role/StateController.cs
index 18943c0..ad9557d 100644
--- a/DungeonShooting_Godot/src/game/role/StateController.cs
+++ b/DungeonShooting_Godot/src/game/role/StateController.cs
@@ -10,13 +10,13 @@
     /// <summary>
     /// 当前活跃的状态
     /// </summary>
-    public IState<T, S> CurrState => _currState;
-    private IState<T, S> _currState;
+    public StateBase<T, S> CurrStateBase => _currStateBase;
+    private StateBase<T, S> _currStateBase;
     
     /// <summary>
     /// 负责存放状态实例对象
     /// </summary>
-    private readonly Dictionary<S, IState<T, S>> _states = new Dictionary<S, IState<T, S>>();
+    private readonly Dictionary<S, StateBase<T, S>> _states = new Dictionary<S, StateBase<T, S>>();
 
     /// <summary>
     /// 记录下当前帧是否有改变的状态
@@ -26,9 +26,9 @@
     public override void PhysicsProcess(float delta)
     {
         _isChangeState = false;
-        if (CurrState != null)
+        if (CurrStateBase != null)
         {
-            CurrState.PhysicsProcess(delta);
+            CurrStateBase.PhysicsProcess(delta);
             //判断当前帧是否有改变的状态, 如果有, 则重新调用 PhysicsProcess() 方法
             if (_isChangeState)
             {
@@ -40,16 +40,16 @@
     /// <summary>
     /// 往状态机力注册一个新的状态
     /// </summary>
-    public void Register(IState<T, S> state)
+    public void Register(StateBase<T, S> stateBase)
     {
-        if (GetStateInstance(state.StateType) != null)
+        if (GetStateInstance(stateBase.StateType) != null)
         {
-            GD.PrintErr("当前状态已经在状态机中注册:", state);
+            GD.PrintErr("当前状态已经在状态机中注册:", stateBase);
             return;
         }
-        state.Master = ActivityObject as T;
-        state.StateController = this;
-        _states.Add(state.StateType, state);
+        stateBase.Master = ActivityObject as T;
+        stateBase.StateController = this;
+        _states.Add(stateBase.StateType, stateBase);
     }
 
     /// <summary>
@@ -71,7 +71,7 @@
     /// <summary>
     /// 根据状态类型获取相应的状态对象
     /// </summary>
-    private IState<T, S> GetStateInstance(S stateType)
+    private StateBase<T, S> GetStateInstance(S stateType)
     {
         _states.TryGetValue(stateType, out var v);
         return v;
@@ -82,7 +82,7 @@
     /// </summary>
     private void _changeState(bool late, S next, params object[] arg)
     {
-        if (_currState != null && _currState.StateType.Equals(next))
+        if (_currStateBase != null && _currStateBase.StateType.Equals(next))
         {
             return;
         }
@@ -92,19 +92,19 @@
             GD.PrintErr("当前状态机未找到相应状态:" + next);
             return;
         }
-        if (_currState == null)
+        if (_currStateBase == null)
         {
-            _currState = newState;
+            _currStateBase = newState;
             newState.Enter(default, arg);
         }
-        else if (_currState.CanChangeState(next))
+        else if (_currStateBase.CanChangeState(next))
         {
             _isChangeState = !late;
-            var prev = _currState.StateType;
-            _currState.Exit(next);
+            var prev = _currStateBase.StateType;
+            _currStateBase.Exit(next);
             GD.Print("nextState => " + next);
-            _currState = newState;
-            _currState.Enter(prev, arg);
+            _currStateBase = newState;
+            _currStateBase.Enter(prev, arg);
         }
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs b/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs
index 6e3eaa8..6d30caa 100644
--- a/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs
+++ b/DungeonShooting_Godot/src/game/role/enemy/Enemy.cs
@@ -38,10 +38,16 @@
     /// 视野检测射线, 朝玩家打射线, 检测是否碰到墙
     /// </summary>
     public RayCast2D ViewRay { get; }
+    
+    /// <summary>
+    /// 导航代理
+    /// </summary>
+    public NavigationAgent2D NavigationAgent2D { get; }
 
-    private Position2D _navigationPoint;
-    private NavigationAgent2D _navigationAgent2D;
-    private float _navigationUpdateTimer = 0;
+    /// <summary>
+    /// 导航代理中点
+    /// </summary>
+    public Position2D NavigationPoint { get; }
 
     public Enemy() : base(ResourcePath.prefab_role_Enemy_tscn)
     {
@@ -58,15 +64,15 @@
 
         //视野射线
         ViewRay = GetNode<RayCast2D>("ViewRay");
-        _navigationPoint = GetNode<Position2D>("NavigationPoint");
-        _navigationAgent2D = _navigationPoint.GetNode<NavigationAgent2D>("NavigationAgent2D");
+        NavigationPoint = GetNode<Position2D>("NavigationPoint");
+        NavigationAgent2D = NavigationPoint.GetNode<NavigationAgent2D>("NavigationAgent2D");
 
         //PathSign = new PathSign(this, PathSignLength, GameApplication.Instance.Room.Player);
 
         //注册Ai状态机
-        StateController.Register(new AINormalState());
-        StateController.Register(new AIProbeState());
-        StateController.Register(new AITailAfterState());
+        StateController.Register(new AiNormalStateBase());
+        StateController.Register(new AiProbeStateBase());
+        StateController.Register(new AiTailAfterStateBase());
     }
 
     public override void _Ready()
@@ -75,7 +81,7 @@
         //默认状态
         StateController.ChangeState(AIStateEnum.AINormal);
 
-        _navigationAgent2D.SetTargetLocation(GameApplication.Instance.Room.Player.GlobalPosition);
+        NavigationAgent2D.SetTargetLocation(GameApplication.Instance.Room.Player.GlobalPosition);
     }
 
     /// <summary>
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AINormalState.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AINormalState.cs
deleted file mode 100644
index 45b13c2..0000000
--- a/DungeonShooting_Godot/src/game/role/enemy/state/AINormalState.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-
-using Godot;
-
-/// <summary>
-/// AI 正常状态
-/// </summary>
-public class AINormalState : IState<Enemy, AIStateEnum>
-{
-    public AIStateEnum StateType { get; } = AIStateEnum.AINormal;
-    public Enemy Master { get; set; }
-    public StateController<Enemy, AIStateEnum> StateController { get; set; }
-    public void Enter(AIStateEnum prev, params object[] args)
-    {
-        
-    }
-
-    public void PhysicsProcess(float delta)
-    {
-        //检测玩家
-        var player = GameApplication.Instance.Room.Player;
-        //玩家中心点坐标
-        var playerPos = player.MountPoint.GlobalPosition;
-
-        if (Master.IsInViewRange(playerPos) && Master.TestViewRayCast(playerPos) == null)
-        {
-            //发现玩家
-            StateController.ChangeStateLate(AIStateEnum.AITailAfter);
-        }
-    }
-
-    public bool CanChangeState(AIStateEnum next)
-    {
-        return true;
-    }
-
-    public void Exit(AIStateEnum next)
-    {
-        
-    }
-}
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AIProbeState.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AIProbeState.cs
deleted file mode 100644
index 368947d..0000000
--- a/DungeonShooting_Godot/src/game/role/enemy/state/AIProbeState.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-
-/// <summary>
-/// Ai 不确定玩家位置
-/// </summary>
-public class AIProbeState : IState<Enemy, AIStateEnum>
-{
-    public AIStateEnum StateType { get; } = AIStateEnum.AIProbe;
-    public Enemy Master { get; set; }
-    public StateController<Enemy, AIStateEnum> StateController { get; set; }
-    public void Enter(AIStateEnum prev, params object[] args)
-    {
-        
-    }
-
-    public void PhysicsProcess(float delta)
-    {
-
-    }
-
-    public bool CanChangeState(AIStateEnum next)
-    {
-        return true;
-    }
-
-    public void Exit(AIStateEnum next)
-    {
-        
-    }
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AITailAfterState.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AITailAfterState.cs
deleted file mode 100644
index 0c1417e..0000000
--- a/DungeonShooting_Godot/src/game/role/enemy/state/AITailAfterState.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-
-/// <summary>
-/// AI 发现玩家
-/// </summary>
-public class AITailAfterState : IState<Enemy, AIStateEnum>
-{
-    public AIStateEnum StateType { get; } = AIStateEnum.AITailAfter;
-    public Enemy Master { get; set; }
-    public StateController<Enemy, AIStateEnum> StateController { get; set; }
-    public void Enter(AIStateEnum prev, params object[] args)
-    {
-        
-    }
-
-    public void PhysicsProcess(float delta)
-    {
-        
-    }
-
-    public bool CanChangeState(AIStateEnum next)
-    {
-        return true;
-    }
-
-    public void Exit(AIStateEnum next)
-    {
-        
-    }
-}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AiNormalStateBase.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AiNormalStateBase.cs
new file mode 100644
index 0000000..65a3148
--- /dev/null
+++ b/DungeonShooting_Godot/src/game/role/enemy/state/AiNormalStateBase.cs
@@ -0,0 +1,26 @@
+
+using Godot;
+
+/// <summary>
+/// AI 正常状态
+/// </summary>
+public class AiNormalStateBase : StateBase<Enemy, AIStateEnum>
+{
+    public AiNormalStateBase() : base(AIStateEnum.AINormal)
+    {
+    }
+    
+    public override void PhysicsProcess(float delta)
+    {
+        //检测玩家
+        var player = GameApplication.Instance.Room.Player;
+        //玩家中心点坐标
+        var playerPos = player.MountPoint.GlobalPosition;
+
+        if (Master.IsInViewRange(playerPos) && Master.TestViewRayCast(playerPos) == null)
+        {
+            //发现玩家
+            StateController.ChangeStateLate(AIStateEnum.AITailAfter);
+        }
+    }
+}
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AiProbeStateBase.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AiProbeStateBase.cs
new file mode 100644
index 0000000..be9854d
--- /dev/null
+++ b/DungeonShooting_Godot/src/game/role/enemy/state/AiProbeStateBase.cs
@@ -0,0 +1,10 @@
+
+/// <summary>
+/// Ai 不确定玩家位置
+/// </summary>
+public class AiProbeStateBase : StateBase<Enemy, AIStateEnum>
+{
+    public AiProbeStateBase() : base(AIStateEnum.AIProbe)
+    {
+    }
+}
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/role/enemy/state/AiTailAfterStateBase.cs b/DungeonShooting_Godot/src/game/role/enemy/state/AiTailAfterStateBase.cs
new file mode 100644
index 0000000..725bf8e
--- /dev/null
+++ b/DungeonShooting_Godot/src/game/role/enemy/state/AiTailAfterStateBase.cs
@@ -0,0 +1,43 @@
+
+/// <summary>
+/// AI 发现玩家
+/// </summary>
+public class AiTailAfterStateBase : StateBase<Enemy, AIStateEnum>
+{
+    
+    private float _navigationUpdateTimer = 0;
+    
+    public AiTailAfterStateBase() : base(AIStateEnum.AITailAfter)
+    {
+    }
+
+    public override void PhysicsProcess(float delta)
+    {
+        //跟随玩家
+        var master = Master;
+        if (master.NavigationAgent2D.IsNavigationFinished())
+        {
+            return;
+        }
+        var playerGlobalPosition = GameApplication.Instance.Room.Player.GlobalPosition;
+        //临时处理, 让敌人跟随玩家
+        if (_navigationUpdateTimer <= 0)
+        {
+            _navigationUpdateTimer = 0.2f;
+            if (master.NavigationAgent2D.GetTargetLocation() != playerGlobalPosition)
+            {
+                master.NavigationAgent2D.SetTargetLocation(playerGlobalPosition);
+            }
+        }
+        else
+        {
+            _navigationUpdateTimer -= delta;
+        }
+        
+        var nextPos = master.NavigationAgent2D.GetNextLocation();
+        master.LookTargetPosition(playerGlobalPosition);
+        master.AnimatedSprite.Animation = AnimatorNames.Run;
+        master.Velocity = (nextPos - master.GlobalPosition - master.NavigationPoint.Position).Normalized() * master.MoveSpeed;
+        master.CalcMove(delta);
+    }
+}
\ No newline at end of file