diff --git a/DungeonShooting_Godot/export_presets.cfg b/DungeonShooting_Godot/export_presets.cfg
new file mode 100644
index 0000000..540aecb
--- /dev/null
+++ b/DungeonShooting_Godot/export_presets.cfg
@@ -0,0 +1,66 @@
+[preset.0]
+
+name="UWP"
+platform="UWP"
+runnable=true
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path=""
+script_export_mode=1
+script_encryption_key=""
+
+[preset.0.options]
+
+custom_template/debug=""
+custom_template/release=""
+architecture/target=1
+command_line/extra_args=""
+package/display_name=""
+package/short_name=""
+package/unique_name=""
+package/description=""
+package/publisher=""
+package/publisher_display_name=""
+identity/product_guid=""
+identity/publisher_guid=""
+signing/certificate=""
+signing/password=""
+signing/algorithm=2
+version/major=1
+version/minor=0
+version/build=0
+version/revision=0
+orientation/landscape=true
+orientation/portrait=true
+orientation/landscape_flipped=true
+orientation/portrait_flipped=true
+images/background_color="transparent"
+tiles/show_name_on_square150x150=false
+tiles/show_name_on_wide310x150=false
+tiles/show_name_on_square310x310=false
+capabilities/allJoyn=false
+capabilities/codeGeneration=false
+capabilities/internetClient=false
+capabilities/internetClientServer=false
+capabilities/privateNetworkClientServer=false
+capabilities/appointments=false
+capabilities/blockedChatMessages=false
+capabilities/chat=false
+capabilities/contacts=false
+capabilities/enterpriseAuthentication=false
+capabilities/musicLibrary=false
+capabilities/objects3D=false
+capabilities/picturesLibrary=false
+capabilities/phoneCall=false
+capabilities/removableStorage=false
+capabilities/sharedUserCertificates=false
+capabilities/userAccountInformation=false
+capabilities/videosLibrary=false
+capabilities/voipCall=false
+capabilities/bluetooth=false
+capabilities/location=false
+capabilities/microphone=false
+capabilities/proximity=false
+capabilities/webcam=false
diff --git a/DungeonShooting_Godot/prefab/ui/RoomUI.tscn b/DungeonShooting_Godot/prefab/ui/RoomUI.tscn
index 682de6a..778ffae 100644
--- a/DungeonShooting_Godot/prefab/ui/RoomUI.tscn
+++ b/DungeonShooting_Godot/prefab/ui/RoomUI.tscn
@@ -36,7 +36,7 @@
 [node name="HpSlot" type="NinePatchRect" parent="Control/HealthBar"]
 margin_left = 13.0
 margin_top = 1.0
-margin_right = 81.0
+margin_right = 66.0
 margin_bottom = 9.0
 texture = ExtResource( 8 )
 patch_margin_left = 1
@@ -47,7 +47,7 @@
 [node name="HpBar" type="TextureRect" parent="Control/HealthBar/HpSlot"]
 margin_left = 1.0
 margin_top = 2.0
-margin_right = 66.0
+margin_right = 51.0
 margin_bottom = 6.0
 texture = ExtResource( 6 )
 expand = true
@@ -55,7 +55,7 @@
 [node name="ShieldSlot" type="NinePatchRect" parent="Control/HealthBar"]
 margin_left = 13.0
 margin_top = 8.0
-margin_right = 87.0
+margin_right = 65.0
 margin_bottom = 13.0
 texture = ExtResource( 9 )
 patch_margin_left = 1
@@ -66,7 +66,7 @@
 [node name="ShieldBar" type="TextureRect" parent="Control/HealthBar/ShieldSlot"]
 margin_left = 1.0
 margin_top = 1.0
-margin_right = 73.0
+margin_right = 51.0
 margin_bottom = 4.0
 texture = ExtResource( 7 )
 expand = true
@@ -78,13 +78,13 @@
 margin_bottom = 44.0
 texture = ExtResource( 2 )
 
-[node name="Control" type="Control" parent="Control"]
+[node name="GunBar" type="Control" parent="Control"]
 anchor_top = 1.0
 anchor_bottom = 1.0
 margin_top = -43.0
 margin_right = 40.0
 
-[node name="GunBar" type="TextureRect" parent="Control/Control"]
+[node name="GunSprite" type="TextureRect" parent="Control/GunBar"]
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
@@ -95,7 +95,7 @@
 margin_bottom = 33.0
 texture = ExtResource( 5 )
 
-[node name="BulletBar" type="Label" parent="Control/Control"]
+[node name="BulletText" type="Label" parent="Control/GunBar"]
 anchor_left = 0.5
 anchor_right = 0.5
 margin_left = -28.0
diff --git a/DungeonShooting_Godot/scene/Room.tscn b/DungeonShooting_Godot/scene/Room.tscn
index 439a225..6a49872 100644
--- a/DungeonShooting_Godot/scene/Room.tscn
+++ b/DungeonShooting_Godot/scene/Room.tscn
@@ -12,6 +12,10 @@
 MouseCursor = ExtResource( 4 )
 UIPath = NodePath("")
 
+[node name="CanvasLayer" type="CanvasLayer" parent="."]
+
+[node name="RoomUI" parent="CanvasLayer" instance=ExtResource( 6 )]
+
 [node name="MapRoot" type="Node2D" parent="."]
 z_index = -10
 
@@ -34,7 +38,3 @@
 
 [node name="RemoteTransform2D" type="RemoteTransform2D" parent="ItemRoot/Player"]
 remote_path = NodePath("../../../Camera2D")
-
-[node name="CanvasLayer" type="CanvasLayer" parent="."]
-
-[node name="RoomUI" parent="CanvasLayer" instance=ExtResource( 6 )]
diff --git a/DungeonShooting_Godot/src/manager/GameManager.cs b/DungeonShooting_Godot/src/manager/GameManager.cs
index 29d3962..5631110 100644
--- a/DungeonShooting_Godot/src/manager/GameManager.cs
+++ b/DungeonShooting_Godot/src/manager/GameManager.cs
@@ -5,9 +5,12 @@
 /// </summary>
 public class GameManager : Node2D
 {
+
     public static GameManager Instance { get; private set; }
+
     public GameManager()
     {
         GameManager.Instance = this;
     }
+
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/role/Player.cs b/DungeonShooting_Godot/src/role/Player.cs
index d6ed468..dd1a4c2 100644
--- a/DungeonShooting_Godot/src/role/Player.cs
+++ b/DungeonShooting_Godot/src/role/Player.cs
@@ -16,6 +16,37 @@
     /// </summary>
     public Vector2 Velocity = Vector2.Zero;
 
+    /// <summary>
+    /// 当前护盾值
+    /// </summary>
+    public int Shield
+    {
+        get => _shield;
+        protected set
+        {
+            int temp = _shield;
+            _shield = value;
+            if (temp != _shield) OnChangeShield(_shield);
+        }
+    }
+    private int _shield = 0;
+
+    /// <summary>
+    /// 最大护盾值
+    /// </summary>
+    public int MaxShield
+    {
+        get => _maxShield;
+        protected set
+        {
+            int temp = _maxShield;
+            _maxShield = value;
+            if (temp != _maxShield) OnChangeMaxShield(_maxShield);
+        }
+    }
+    private int _maxShield = 0;
+
+
     [Export] public PackedScene GunPrefab;
 
     public override void _EnterTree()
@@ -33,6 +64,12 @@
         PickUpGun(GunManager.GetGun2()); //1
         PickUpGun(GunManager.GetGun3()); //2
         PickUpGun(GunManager.GetGun4()); //3
+        RefreshGunTexture();
+
+        MaxHp = 50;
+        Hp = 40;
+        MaxShield = 30;
+        Shield = 10;
     }
 
     public override void _Process(float delta)
@@ -55,14 +92,17 @@
         if (Input.IsActionJustPressed("exchange")) //切换武器
         {
             TriggerExchangeNext();
+            RefreshGunTexture();
         }
         else if (Input.IsActionJustPressed("throw")) //扔掉武器
         {
             TriggerThrowGun();
+            RefreshGunTexture();
         }
         else if (Input.IsActionJustPressed("interactive")) //互动物体
         {
             TriggerTnteractive();
+            RefreshGunTexture();
         }
         else if (Input.IsActionJustPressed("reload")) //换弹
         {
@@ -72,6 +112,8 @@
         {
             TriggerAttack();
         }
+        //刷新显示的弹药剩余量
+        RefreshGunAmmunition();
     }
 
     public override void _PhysicsProcess(float delta)
@@ -82,6 +124,54 @@
         PlayAnim();
     }
 
+    protected override void OnChangeHp(int hp)
+    {
+        RoomUI.Current.SetHp(hp);
+    }
+
+    protected override void OnChangeMaxHp(int maxHp)
+    {
+        RoomUI.Current.SetMaxHp(maxHp);
+    }
+
+    protected void OnChangeShield(int shield)
+    {
+        RoomUI.Current.SetShield(shield);
+    }
+
+    protected void OnChangeMaxShield(int maxShield)
+    {
+        RoomUI.Current.SetMaxShield(maxShield);
+    }
+
+    /// <summary>
+    /// 刷新 ui 上手持的物体
+    /// </summary>
+    private void RefreshGunTexture()
+    {
+        var gun = Holster.ActiveGun;
+        if (gun != null)
+        {
+            RoomUI.Current.SetGunTexture(gun.Attribute.Sprite);
+        }
+        else
+        {
+            RoomUI.Current.SetGunTexture(null);
+        }
+    }
+
+    /// <summary>
+    /// 刷新 ui 上显示的弹药量
+    /// </summary>
+    private void RefreshGunAmmunition()
+    {
+        var gun = Holster.ActiveGun;
+        if (gun != null)
+        {
+            RoomUI.Current.SetAmmunition(gun.CurrAmmo, gun.ResidueAmmo);
+        }
+    }
+
     private void Move(float delta)
     {
         //角色移动
diff --git a/DungeonShooting_Godot/src/role/Role.cs b/DungeonShooting_Godot/src/role/Role.cs
index 335ba00..d132261 100644
--- a/DungeonShooting_Godot/src/role/Role.cs
+++ b/DungeonShooting_Godot/src/role/Role.cs
@@ -13,7 +13,7 @@
 /// <summary>
 /// 角色基类
 /// </summary>
-public class Role : KinematicBody2D
+public abstract class Role : KinematicBody2D
 {
     /// <summary>
     /// 重写的纹理
@@ -59,9 +59,48 @@
     public FaceDirection Face { get => _face; set => SetFace(value); }
     private FaceDirection _face;
 
+    /// <summary>
+    /// 血量
+    /// </summary>
+    public int Hp
+    {
+        get => _hp;
+        protected set
+        {
+            int temp = _hp;
+            _hp = value;
+            if (temp != _hp) OnChangeHp(_hp);
+        }
+    }
+    private int _hp = 0;
+
+    /// <summary>
+    /// 最大血量
+    /// </summary>
+    public int MaxHp
+    {
+        get => _maxHp;
+        protected set
+        {
+            int temp = _maxHp;
+            _maxHp = value;
+            if (temp != _maxHp) OnChangeMaxHp(_maxHp);
+        }
+    }
+    private int _maxHp = 0;
+
     private Vector2 StartScele;
     private readonly List<IProp> InteractiveItemList = new List<IProp>();
 
+    /// <summary>
+    /// 当血量改变时调用
+    /// </summary>
+    protected abstract void OnChangeHp(int hp);
+    /// <summary>
+    /// 当最大血量改变时调用
+    /// </summary>
+    protected abstract void OnChangeMaxHp(int maxHp);
+
     public override void _Ready()
     {
         StartScele = Scale;
@@ -211,28 +250,30 @@
 
     /// <summary>
     /// 连接信号: InteractiveArea.area_entered
+    /// 与道具碰撞
     /// </summary>
     private void _OnPropsEnter(Area2D other)
     {
-        if (other is Gun gun)
+        if (other is IProp prop)
         {
-            if (!InteractiveItemList.Contains(gun))
+            if (!InteractiveItemList.Contains(prop))
             {
-                InteractiveItemList.Add(gun);
+                InteractiveItemList.Add(prop);
             }
         }
     }
 
     /// <summary>
     /// 连接信号: InteractiveArea.area_exited
+    /// 道具离开碰撞区域
     /// </summary>
     private void _OnPropsExit(Area2D other)
     {
-        if (other is Gun gun)
+        if (other is IProp prop)
         {
-            if (InteractiveItemList.Contains(gun))
+            if (InteractiveItemList.Contains(prop))
             {
-                InteractiveItemList.Remove(gun);
+                InteractiveItemList.Remove(prop);
             }
         }
     }
diff --git a/DungeonShooting_Godot/src/ui/RoomUI.cs b/DungeonShooting_Godot/src/ui/RoomUI.cs
index 2b5a2bf..bab552b 100644
--- a/DungeonShooting_Godot/src/ui/RoomUI.cs
+++ b/DungeonShooting_Godot/src/ui/RoomUI.cs
@@ -1,9 +1,133 @@
+using System;
 using Godot;
 
+/// <summary>
+/// 房间中的ui
+/// </summary>
 public class RoomUI : Control
 {
+
+    public static RoomUI Current { get; private set; }
+
+    /// <summary>
+    /// 当前血量
+    /// </summary>
+    public int Hp { get; private set; }
+    /// <summary>
+    /// 最大血量
+    /// </summary>
+    public int MaxHp { get; private set; }
+    /// <summary>
+    /// 当前护盾值
+    /// </summary>
+    public int Shield { get; private set; }
+    /// <summary>
+    /// 最大护盾值
+    /// </summary>
+    public int MaxShield { get; private set; }
+
+
+    private NinePatchRect hpSlot;
+    private NinePatchRect shieldSlot;
+    private TextureRect hpBar;
+    private TextureRect shieldBar;
+    private Label bulletText;
+    private TextureRect gunSprite;
+
+    public override void _EnterTree()
+    {
+        Current = this;
+    }
+
     public override void _Ready()
     {
-        
+        hpSlot = GetNode<NinePatchRect>("Control/HealthBar/HpSlot");
+        shieldSlot = GetNode<NinePatchRect>("Control/HealthBar/ShieldSlot");
+        hpBar = GetNode<TextureRect>("Control/HealthBar/HpSlot/HpBar");
+        shieldBar = GetNode<TextureRect>("Control/HealthBar/ShieldSlot/ShieldBar");
+
+        bulletText = GetNode<Label>("Control/GunBar/BulletText");
+        gunSprite = GetNode<TextureRect>("Control/GunBar/GunSprite");
+    }
+
+    /// <summary>
+    /// 设置最大血量
+    /// </summary>
+    public void SetMaxHp(int maxHp)
+    {
+        MaxHp = Mathf.Max(maxHp, 0);
+        hpSlot.RectSize = new Vector2(maxHp + 3, hpSlot.RectSize.y);
+        if (Hp > maxHp)
+        {
+            SetHp(maxHp);
+        }
+    }
+
+    /// <summary>
+    /// 设置最大护盾值
+    /// </summary>
+    public void SetMaxShield(int maxShield)
+    {
+        MaxShield = Mathf.Max(maxShield, 0); ;
+        shieldSlot.RectSize = new Vector2(maxShield + 2, shieldSlot.RectSize.y);
+        if (Shield > MaxShield)
+        {
+            SetShield(maxShield);
+        }
+    }
+
+    /// <summary>
+    /// 设置当前血量
+    /// </summary>
+    public void SetHp(int hp)
+    {
+        Hp = Mathf.Clamp(hp, 0, MaxHp);
+        hpBar.RectSize = new Vector2(hp, hpBar.RectSize.y);
+    }
+
+    /// <summary>
+    /// 设置护盾值
+    /// </summary>
+    public void SetShield(int shield)
+    {
+        Shield = Mathf.Clamp(shield, 0, MaxShield);
+        shieldBar.RectSize = new Vector2(shield, shieldBar.RectSize.y);
+    }
+
+    /// <summary>
+    /// 玩家受到伤害
+    /// </summary>
+    public void Hit(int num)
+    {
+
+    }
+
+    /// <summary>
+    /// 设置显示在 ui 上的枪的纹理
+    /// </summary>
+    /// <param name="gun">纹理</param>
+    public void SetGunTexture(Texture gun)
+    {
+        if (gun != null)
+        {
+            gunSprite.Texture = gun;
+            gunSprite.Visible = true;
+            bulletText.Visible = true;
+        }
+        else
+        {
+            gunSprite.Visible = false;
+            bulletText.Visible = false;
+        }
+    }
+
+    /// <summary>
+    /// 设置弹药数据
+    /// </summary>
+    /// <param name="curr">当前弹夹弹药量</param>
+    /// <param name="total">剩余弹药总数</param>
+    public void SetAmmunition(int curr, int total)
+    {
+        bulletText.Text = curr + " / " + total;
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/weapon/gun/Gun.cs b/DungeonShooting_Godot/src/weapon/gun/Gun.cs
index 0e8464a..70c6304 100644
--- a/DungeonShooting_Godot/src/weapon/gun/Gun.cs
+++ b/DungeonShooting_Godot/src/weapon/gun/Gun.cs
@@ -455,7 +455,7 @@
             Reloading = false;
             if (ResidueAmmo >= Attribute.CartridgeCapacity)
             {
-                ResidueAmmo -= Attribute.CartridgeCapacity;
+                ResidueAmmo -= Attribute.CartridgeCapacity - CurrAmmo;
                 CurrAmmo = Attribute.CartridgeCapacity;
             }
             else
@@ -469,9 +469,10 @@
     public void Tnteractive(Role master)
     {
         var parent = GetParent();
-        parent.RemoveChild(this);
-        master.Holster.PickupGun(this);
-        parent.QueueFree();
+        if (master.Holster.PickupGun(this) != -1)
+        {
+            parent.QueueFree();
+        }
     }
 
     /// <summary>
@@ -491,7 +492,11 @@
         Master = master;
         //握把位置
         GunSprite.Position = Attribute.HoldPosition;
-        AnimationPlayer.Play("RESET");
+        //清除泛白效果
+        ShaderMaterial sm = GunSprite.Material as ShaderMaterial;
+        sm.SetShaderParam("schedule", 0);
+        //停止动画
+        AnimationPlayer.Stop();
         ZIndex = 0;
         //禁用碰撞
         CollisionShape2D.Disabled = true;