diff --git a/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs b/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs
index 320789b..d2619ed 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/Weapon.cs
@@ -102,38 +102,47 @@
     }
 
     //是否按下
-    private bool triggerFlag = false;
+    private bool _triggerFlag = false;
 
     //扳机计时器
-    private float triggerTimer = 0;
+    private float _triggerTimer = 0;
 
     //开火前延时时间
-    private float delayedTime = 0;
+    private float _delayedTime = 0;
 
     //开火间隙时间
-    private float fireInterval = 0;
+    private float _fireInterval = 0;
 
     //开火武器口角度
-    private float fireAngle = 0;
+    private float _fireAngle = 0;
 
     //攻击冷却计时
-    private float attackTimer = 0;
+    private float _attackTimer = 0;
 
     //攻击状态
-    private bool attackFlag = false;
+    private bool _attackFlag = false;
 
     //按下的时间
-    private float downTimer = 0;
+    private float _downTimer = 0;
 
     //松开的时间
-    private float upTimer = 0;
+    private float _upTimer = 0;
 
     //连发次数
-    private float continuousCount = 0;
+    private float _continuousCount = 0;
 
     //连发状态记录
-    private bool continuousShootFlag = false;
+    private bool _continuousShootFlag = false;
 
+    //松开扳机是否开火
+    private bool _looseShootFlag = false;
+
+    //蓄力攻击时长
+    private float _chargeTime = 0;
+
+    //是否需要重置武器数据
+    private bool _dirtyFlag = false;
+    
     /// <summary>
     /// 根据属性创建一把武器
     /// </summary>
@@ -159,12 +168,17 @@
         FirePoint.Position = new Vector2(Attribute.FirePosition.x, -Attribute.FirePosition.y);
         OriginPoint.Position = new Vector2(0, -Attribute.FirePosition.y);
 
+        if (Attribute.AmmoCapacity > Attribute.MaxAmmoCapacity)
+        {
+            Attribute.AmmoCapacity = Attribute.MaxAmmoCapacity;
+            GD.PrintErr("弹夹的容量不能超过弹药上限, 武器id: " + id);
+        }
         //弹药量
         CurrAmmo = Attribute.AmmoCapacity;
         //剩余弹药量
-        ResidueAmmo = Attribute.MaxAmmoCapacity - Attribute.AmmoCapacity;
+        ResidueAmmo = Mathf.Min(Attribute.StandbyAmmoCapacity + CurrAmmo, Attribute.MaxAmmoCapacity) - CurrAmmo;
     }
-
+    
     /// <summary>
     /// 单次开火时调用的函数
     /// </summary>
@@ -234,38 +248,49 @@
     {
     }
 
+    /// <summary>
+    /// 射击时调用, 返回消耗弹药数量, 默认为1, 如果返回为 0, 则不消耗弹药
+    /// </summary>
+    protected virtual int UseAmmoCount()
+    {
+        return 1;
+    }
+
     public override void _Process(float delta)
     {
         base._Process(delta);
-        if (Master == null) //这把武器被扔在地上
+        //这把武器被扔在地上, 或者当前武器没有被使用
+        if (Master == null || Master.Holster.ActiveWeapon != this)
         {
-            Reloading = false;
-            ReloadTimer = 0;
-            triggerTimer = triggerTimer > 0 ? triggerTimer - delta : 0;
-            triggerFlag = false;
-            attackFlag = false;
-            attackTimer = attackTimer > 0 ? attackTimer - delta : 0;
+            _triggerTimer = _triggerTimer > 0 ? _triggerTimer - delta : 0;
+            _attackTimer = _attackTimer > 0 ? _attackTimer - delta : 0;
             CurrScatteringRange = Mathf.Max(CurrScatteringRange - Attribute.ScatteringRangeBackSpeed * delta,
                 Attribute.StartScatteringRange);
-            continuousCount = 0;
-            delayedTime = 0;
-        }
-        else if (Master.Holster.ActiveWeapon != this) //当前武器没有被使用
-        {
-            Reloading = false;
-            ReloadTimer = 0;
-            triggerTimer = triggerTimer > 0 ? triggerTimer - delta : 0;
-            triggerFlag = false;
-            attackFlag = false;
-            attackTimer = attackTimer > 0 ? attackTimer - delta : 0;
-            CurrScatteringRange = Mathf.Max(CurrScatteringRange - Attribute.ScatteringRangeBackSpeed * delta,
-                Attribute.StartScatteringRange);
-            continuousCount = 0;
-            delayedTime = 0;
+            //松开扳机
+            if (_triggerFlag || _downTimer > 0)
+            {
+                UpTrigger();
+                _triggerFlag = false;
+                _downTimer = 0;
+            }
+
+            //重置数据
+            if (_dirtyFlag)
+            {
+                _dirtyFlag = false;
+                Reloading = false;
+                ReloadTimer = 0;
+                _attackFlag = false;
+                _continuousCount = 0;
+                _delayedTime = 0;
+                _upTimer = 0;
+                _looseShootFlag = false;
+                _chargeTime = 0;
+            }
         }
         else //正在使用中
         {
-
+            _dirtyFlag = true;
             //换弹
             if (Reloading)
             {
@@ -276,92 +301,95 @@
                 }
             }
 
-            if (triggerFlag)
+            if (_triggerFlag)
             {
-                if (upTimer > 0) //第一帧按下扳机
+                if (_looseShootFlag) //蓄力时长
                 {
-                    upTimer = 0;
-                    DownTrigger();
+                    _chargeTime += delta;
                 }
 
-                downTimer += delta;
+                _downTimer += delta;
+                if (_upTimer > 0) //第一帧按下扳机
+                {
+                    DownTrigger();
+                    _upTimer = 0;
+                }
             }
             else
             {
-                if (downTimer > 0) //第一帧松开扳机
+                _upTimer += delta;
+                if (_downTimer > 0) //第一帧松开扳机
                 {
-                    downTimer = 0;
                     UpTrigger();
+                    _downTimer = 0;
                 }
-
-                upTimer += delta;
             }
 
             // 攻击的计时器
-            if (attackTimer > 0)
+            if (_attackTimer > 0)
             {
-                attackTimer -= delta;
-                if (attackTimer < 0)
+                _attackTimer -= delta;
+                if (_attackTimer < 0)
                 {
-                    delayedTime += attackTimer;
-                    attackTimer = 0;
+                    _delayedTime += _attackTimer;
+                    _attackTimer = 0;
                 }
             }
-            else if (delayedTime > 0) //攻击延时
+            else if (_delayedTime > 0) //攻击延时
             {
-                delayedTime -= delta;
-                if (attackTimer < 0)
+                _delayedTime -= delta;
+                if (_attackTimer < 0)
                 {
-                    delayedTime = 0;
+                    _delayedTime = 0;
                 }
             }
 
             //连发判断
-            if (continuousCount > 0 && delayedTime <= 0 && attackTimer <= 0)
+            if (!_looseShootFlag && _continuousCount > 0 && _delayedTime <= 0 && _attackTimer <= 0)
             {
-                //开火
+                //连发开火
                 TriggerFire();
             }
 
-            if (!attackFlag && attackTimer <= 0)
+            if (!_attackFlag && _attackTimer <= 0)
             {
                 CurrScatteringRange = Mathf.Max(CurrScatteringRange - Attribute.ScatteringRangeBackSpeed * delta,
                     Attribute.StartScatteringRange);
             }
 
-            triggerTimer = triggerTimer > 0 ? triggerTimer - delta : 0;
-            triggerFlag = false;
-            attackFlag = false;
+            _triggerTimer = _triggerTimer > 0 ? _triggerTimer - delta : 0;
+            _triggerFlag = false;
+            _attackFlag = false;
 
             //武器身回归
             Position = Position.MoveToward(Vector2.Zero, 35 * delta);
-            if (fireInterval == 0)
+            if (_fireInterval == 0)
             {
-                RotationDegrees = Attribute.DefaultAngle;
+                RotationDegrees = -Attribute.DefaultAngle;
             }
             else
             {
-                RotationDegrees = Mathf.Lerp(Attribute.DefaultAngle, fireAngle, attackTimer / fireInterval);
+                RotationDegrees = Mathf.Lerp(-Attribute.DefaultAngle, _fireAngle, _attackTimer / _fireInterval);
             }
         }
     }
 
     /// <summary>
-    /// 扳机函数, 调用即视为扣动扳机
+    /// 扳机函数, 调用即视为按下扳机
     /// </summary>
     public void Trigger()
     {
         //是否第一帧按下
-        var justDown = downTimer == 0;
+        var justDown = _downTimer == 0;
         //是否能发射
         var flag = false;
-        if (continuousCount <= 0) //不能处于连发状态下
+        if (_continuousCount <= 0) //不能处于连发状态下
         {
             if (Attribute.ContinuousShoot) //自动射击
             {
-                if (triggerTimer > 0)
+                if (_triggerTimer > 0)
                 {
-                    if (continuousShootFlag)
+                    if (_continuousShootFlag)
                     {
                         flag = true;
                     }
@@ -369,15 +397,15 @@
                 else
                 {
                     flag = true;
-                    if (delayedTime <= 0 && attackTimer <= 0)
+                    if (_delayedTime <= 0 && _attackTimer <= 0)
                     {
-                        continuousShootFlag = true;
+                        _continuousShootFlag = true;
                     }
                 }
             }
             else //半自动
             {
-                if (justDown && triggerTimer <= 0)
+                if (justDown && _triggerTimer <= 0)
                 {
                     flag = true;
                 }
@@ -411,31 +439,65 @@
                 if (justDown)
                 {
                     //开火前延时
-                    delayedTime = Attribute.DelayedTime;
+                    _delayedTime = Attribute.DelayedTime;
                     //扳机按下间隔
-                    triggerTimer = Attribute.TriggerInterval;
+                    _triggerTimer = Attribute.TriggerInterval;
                     //连发数量
                     if (!Attribute.ContinuousShoot)
                     {
-                        continuousCount =
+                        _continuousCount =
                             Utils.RandRangeInt(Attribute.MinContinuousCount, Attribute.MaxContinuousCount);
                     }
                 }
 
-                if (delayedTime <= 0 && attackTimer <= 0)
+                if (_delayedTime <= 0 && _attackTimer <= 0)
                 {
-                    TriggerFire();
+                    if (Attribute.LooseShoot) //松发开火
+                    {
+                        _looseShootFlag = true;
+                    }
+                    else
+                    {
+                        //开火
+                        TriggerFire();
+                    }
                 }
 
-                attackFlag = true;
+                _attackFlag = true;
             }
 
         }
 
-        triggerFlag = true;
+        _triggerFlag = true;
     }
 
     /// <summary>
+    /// 返回是否按下扳机
+    /// </summary>
+    public bool IsPressTrigger()
+    {
+        return _triggerFlag;
+    }
+    
+    /// <summary>
+    /// 获取本次扳机按下的时长, 单位: 秒
+    /// </summary>
+    public float GetTriggerDownTime()
+    {
+        return _downTimer;
+    }
+
+    /// <summary>
+    /// 获取扳机蓄力时长, 计算按下扳机后从可以开火到当前一共经过了多长时间, 可用于计算蓄力攻击
+    /// 注意, 该函数仅在 Attribute.LooseShoot == false 时有正确的返回值, 否则返回 0
+    /// </summary>
+    /// <returns></returns>
+    public float GetTriggerChargeTime()
+    {
+        return _chargeTime;
+    }
+    
+    /// <summary>
     /// 刚按下扳机
     /// </summary>
     private void DownTrigger()
@@ -448,10 +510,18 @@
     /// </summary>
     private void UpTrigger()
     {
-        continuousShootFlag = false;
-        if (delayedTime > 0)
+        _continuousShootFlag = false;
+        if (_delayedTime > 0)
         {
-            continuousCount = 0;
+            _continuousCount = 0;
+        }
+
+        //松发开火执行
+        if (_looseShootFlag)
+        {
+            _looseShootFlag = false;
+            TriggerFire();
+            _chargeTime = 0;
         }
 
         OnUpTrigger();
@@ -462,14 +532,14 @@
     /// </summary>
     private void TriggerFire()
     {
-        continuousCount = continuousCount > 0 ? continuousCount - 1 : 0;
+        _continuousCount = _continuousCount > 0 ? _continuousCount - 1 : 0;
 
         //减子弹数量
-        CurrAmmo--;
+        CurrAmmo -= UseAmmoCount();
         //开火间隙
-        fireInterval = 60 / Attribute.StartFiringSpeed;
+        _fireInterval = 60 / Attribute.StartFiringSpeed;
         //攻击冷却
-        attackTimer += fireInterval;
+        _attackTimer += _fireInterval;
 
         //触发开火函数
         OnFire();
@@ -498,7 +568,7 @@
         //武器的旋转角度
         tempAngle -= Attribute.UpliftAngle;
         RotationDegrees = tempAngle;
-        fireAngle = tempAngle;
+        _fireAngle = tempAngle;
         //武器身位置
         Position = new Vector2(
             Mathf.Max(-Attribute.MaxBacklash,
@@ -809,7 +879,10 @@
     /// </summary>
     public void Active()
     {
+        //调整阴影
         ShadowOffset = new Vector2(0, Master.GlobalPosition.y - GlobalPosition.y);
+        //枪口默认抬起角度
+        RotationDegrees = -Attribute.DefaultAngle;
         ShowShadowSprite();
         OnActive();
     }
diff --git a/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs b/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs
index e6584c7..0de7747 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/WeaponAttribute.cs
@@ -32,7 +32,11 @@
     /// <summary>
     /// 弹药容量上限
     /// </summary>
-    public int MaxAmmoCapacity = 90;
+    public int MaxAmmoCapacity = 120;
+    /// <summary>
+    /// 备用弹药数量
+    /// </summary>
+    public int StandbyAmmoCapacity = 90;
     /// <summary>
     /// 装弹时间, 单位: 秒
     /// </summary>
@@ -56,11 +60,11 @@
     /// <summary>
     /// 连续发射最小次数, 仅当 ContinuousShoot 为 false 时生效
     /// </summary>
-    public int MinContinuousCount = 3;
+    public int MinContinuousCount = 1;
     /// <summary>
     /// 连续发射最大次数, 仅当 ContinuousShoot 为 false 时生效
     /// </summary>
-    public int MaxContinuousCount = 3;
+    public int MaxContinuousCount = 1;
     /// <summary>
     /// 按下一次扳机后需要多长时间才能再次按下
     /// </summary>
@@ -146,7 +150,7 @@
     /// </summary>
     public float UpliftAngle = 30;
     /// <summary>
-    /// 武器默认角度
+    /// 武器默认上抬角度
     /// </summary>
     public float DefaultAngle = 0;
     /// <summary>
diff --git a/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs b/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs
index 66d57d0..c0eecc8 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/gun/Gun.cs
@@ -24,6 +24,7 @@
             //连发
             ContinuousShoot = true;
             AmmoCapacity = 30;
+            StandbyAmmoCapacity = 30 * 70;
             MaxAmmoCapacity = 30 * 70;
             //扳机检测间隔
             TriggerInterval = 0f;
@@ -63,6 +64,7 @@
             //连发
             ContinuousShoot = false;
             AmmoCapacity = 12;
+            StandbyAmmoCapacity = 72;
             MaxAmmoCapacity = 72;
             //扳机检测间隔
             TriggerInterval = 0.1f;
diff --git a/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs b/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs
index a8685d6..e571048 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/gun/Shotgun.cs
@@ -20,6 +20,7 @@
             //连发
             ContinuousShoot = false;
             AmmoCapacity = 7;
+            StandbyAmmoCapacity = 42;
             MaxAmmoCapacity = 42;
             AloneReload = true;
             AloneReloadCanShoot = true;
diff --git a/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs b/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs
index a3efd81..7388162 100644
--- a/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs
+++ b/DungeonShooting_Godot/src/game/item/weapon/knife/Knife.cs
@@ -11,30 +11,53 @@
         {
             Sprite = ResourcePath.resource_sprite_gun_knife1_png;
             WeaponPrefab = ResourcePath.prefab_weapon_Knife_tscn;
+            //连发关闭
+            ContinuousShoot = false;
+            //松发开火
+            LooseShoot = true;
+            //弹药量
+            AmmoCapacity = 180;
+            MaxAmmoCapacity = 180;
             //握把位置
             HoldPosition = new Vector2(10, 0);
             //关闭后坐力
             MaxBacklash = 0;
             MinBacklash = 0;
+            //我们需要自己来控制角度
             UpliftAngleRestore = 3;
             UpliftAngle = -80;
-            DefaultAngle = 0;
+            DefaultAngle = 20;
         }
     }
     
     public Knife(string id, WeaponAttribute attribute) : base(id, attribute)
     {
         
-        
     }
 
     protected override void OnFire()
     {
-        
+        GD.Print("蓄力时长: " + GetTriggerChargeTime() + ", 扳机按下时长: " + GetTriggerDownTime());
     }
 
     protected override void OnShoot(float fireRotation)
     {
         
     }
+
+    protected override void OnUpTrigger()
+    {
+        GD.Print("松开扳机");
+    }
+
+    protected override void OnDownTrigger()
+    {
+        GD.Print("开始按下扳机");
+    }
+
+    protected override int UseAmmoCount()
+    {
+        //这里要做判断, 如果没有碰到敌人, 则不消耗弹药 (耐久)
+        return 0;
+    }
 }