diff --git a/DungeonShooting_Godot/prefab/role/Player.tscn b/DungeonShooting_Godot/prefab/role/Player.tscn
index 9089f4d..0440d22 100644
--- a/DungeonShooting_Godot/prefab/role/Player.tscn
+++ b/DungeonShooting_Godot/prefab/role/Player.tscn
@@ -9,5 +9,5 @@
 script = ExtResource( 2 )
 GunPrefab = ExtResource( 4 )
 
-[node name="AnimatedSprite" parent="." index="0"]
+[node name="AnimatedSprite" parent="." index="1"]
 frame = 1
diff --git a/DungeonShooting_Godot/prefab/role/Role.tscn b/DungeonShooting_Godot/prefab/role/Role.tscn
index a3c93fe..246469e 100644
--- a/DungeonShooting_Godot/prefab/role/Role.tscn
+++ b/DungeonShooting_Godot/prefab/role/Role.tscn
@@ -88,6 +88,7 @@
 position = Vector2( 0, -12 )
 frames = SubResource( 6 )
 animation = "idle"
+frame = 3
 playing = true
 
 [node name="Collision" type="CollisionShape2D" parent="."]
diff --git a/DungeonShooting_Godot/src/role/Player.cs b/DungeonShooting_Godot/src/role/Player.cs
index 4ccf0e4..c57f4ea 100644
--- a/DungeonShooting_Godot/src/role/Player.cs
+++ b/DungeonShooting_Godot/src/role/Player.cs
@@ -101,8 +101,11 @@
         }
         else if (Input.IsActionJustPressed("interactive")) //互动物体
         {
-            TriggerTnteractive();
-            RefreshGunTexture();
+            var item = TriggerTnteractive();
+            if (item is Gun)
+            {
+                RefreshGunTexture();
+            }
         }
         else if (Input.IsActionJustPressed("reload")) //换弹
         {
diff --git a/DungeonShooting_Godot/src/role/Role.cs b/DungeonShooting_Godot/src/role/Role.cs
index 9674d66..1f37b51 100644
--- a/DungeonShooting_Godot/src/role/Role.cs
+++ b/DungeonShooting_Godot/src/role/Role.cs
@@ -92,6 +92,9 @@
     private Vector2 StartScele;
     //所有角色碰撞的道具
     private readonly List<IProp> InteractiveItemList = new List<IProp>();
+
+    private CheckInteractiveResult TempResultData;
+
     /// <summary>
     /// 可以互动的道具
     /// </summary>
@@ -147,13 +150,17 @@
                     if (result.CanInteractive) //可以互动
                     {
                         findFlag = true;
-                        if (InteractiveItem != item)
+                        if (InteractiveItem != item) //更改互动物体
                         {
                             InteractiveItem = item;
-                            //GD.Print("--------change");
+                            ChangeInteractiveItem(result);
+                        }
+                        else if (result.ShowIcon != TempResultData.ShowIcon) //切换状态
+                        {
                             ChangeInteractiveItem(result);
                         }
                     }
+                    TempResultData = result;
                 }
             }
         }
@@ -161,7 +168,6 @@
         if (!findFlag && InteractiveItem != null)
         {
             InteractiveItem = null;
-            //GD.Print("--------remove1");
             ChangeInteractiveItem(null);
         }
     }
@@ -218,14 +224,17 @@
     }
 
     /// <summary>
-    /// 触发与碰撞的物体互动
+    /// 触发与碰撞的物体互动, 并返回与其互动的物体
     /// </summary>
-    public void TriggerTnteractive()
+    public IProp TriggerTnteractive()
     {
         if (HasTnteractive())
         {
-            InteractiveItem.Interactive(this);
+            var item = InteractiveItem;
+            item.Interactive(this);
+            return item;
         }
+        return null;
     }
 
     /// <summary>
@@ -299,7 +308,6 @@
             if (!InteractiveItemList.Contains(prop))
             {
                 InteractiveItemList.Add(prop);
-                //GD.Print("--------add");
             }
         }
     }
@@ -315,7 +323,6 @@
             if (InteractiveItemList.Contains(prop))
             {
                 InteractiveItemList.Remove(prop);
-                //GD.Print("--------remove2");
             }
             if (InteractiveItem == prop)
             {
diff --git a/DungeonShooting_Godot/src/ui/InteractiveTipBar.cs b/DungeonShooting_Godot/src/ui/InteractiveTipBar.cs
index 287ebcb..09f1f1b 100644
--- a/DungeonShooting_Godot/src/ui/InteractiveTipBar.cs
+++ b/DungeonShooting_Godot/src/ui/InteractiveTipBar.cs
@@ -1,5 +1,8 @@
 using Godot;
 
+/// <summary>
+/// 互动提示文本
+/// </summary>
 public class InteractiveTipBar : Node2D
 {
 
@@ -7,6 +10,8 @@
     private Sprite Icon;
     private Sprite Bg;
 
+    private string currImage;
+
     public override void _Ready()
     {
         Message = GetNode<Label>("Message");
@@ -32,7 +37,11 @@
     {
         GlobalPosition = pos;
         Message.Text = message;
-        Icon.Texture = ResourceManager.Load<Texture>(icon);
+        if (currImage != icon)
+        {
+            currImage = icon;
+            Icon.Texture = ResourceManager.Load<Texture>(icon);
+        }
         Visible = true;
     }
 }
\ 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 cbedc9a..6b09d86 100644
--- a/DungeonShooting_Godot/src/weapon/gun/Gun.cs
+++ b/DungeonShooting_Godot/src/weapon/gun/Gun.cs
@@ -496,41 +496,44 @@
     public CheckInteractiveResult CheckInteractive(Role master)
     {
         var result = new CheckInteractiveResult(this);
-        var masterGun = master.Holster.ActiveGun;
-        //查找是否有同类型武器
-        var index = master.Holster.FindGun(Attribute.Id);
-        if (index != -1) //如果有这个武器
+        if (Master == null)
         {
-            if (CurrAmmo + ResidueAmmo != 0) //子弹不为空
+            var masterGun = master.Holster.ActiveGun;
+            //查找是否有同类型武器
+            var index = master.Holster.FindGun(Attribute.Id);
+            if (index != -1) //如果有这个武器
             {
-                var targetGun = master.Holster.GetGun(index);
-                if (!targetGun.IsFullAmmo()) //背包里面的武器子弹未满
+                if (CurrAmmo + ResidueAmmo != 0) //子弹不为空
                 {
-                    //可以互动拾起弹药
-                    result.CanInteractive = true;
-                    result.Message = Attribute.Name;
-                    result.ShowIcon = "res://resource/sprite/ui/icon/icon_bullet.png";
-                    return result;
+                    var targetGun = master.Holster.GetGun(index);
+                    if (!targetGun.IsFullAmmo()) //背包里面的武器子弹未满
+                    {
+                        //可以互动拾起弹药
+                        result.CanInteractive = true;
+                        result.Message = Attribute.Name;
+                        result.ShowIcon = "res://resource/sprite/ui/icon/icon_bullet.png";
+                        return result;
+                    }
                 }
             }
-        }
-        else //没有武器
-        {
-            if (master.Holster.CanPickupGun(this)) //能拾起武器
+            else //没有武器
             {
-                //可以互动, 拾起武器
-                result.CanInteractive = true;
-                result.Message = Attribute.Name;
-                result.ShowIcon = "res://resource/sprite/ui/icon/icon_pickup.png";
-                return result;
-            }
-            else if (masterGun != null && masterGun.Attribute.WeightType == Attribute.WeightType) //替换武器
-            {
-                //可以互动, 切换武器
-                result.CanInteractive = true;
-                result.Message = Attribute.Name;
-                result.ShowIcon = "res://resource/sprite/ui/icon/icon_replace.png";
-                return result;
+                if (master.Holster.CanPickupGun(this)) //能拾起武器
+                {
+                    //可以互动, 拾起武器
+                    result.CanInteractive = true;
+                    result.Message = Attribute.Name;
+                    result.ShowIcon = "res://resource/sprite/ui/icon/icon_pickup.png";
+                    return result;
+                }
+                else if (masterGun != null && masterGun.Attribute.WeightType == Attribute.WeightType) //替换武器
+                {
+                    //可以互动, 切换武器
+                    result.CanInteractive = true;
+                    result.Message = Attribute.Name;
+                    result.ShowIcon = "res://resource/sprite/ui/icon/icon_replace.png";
+                    return result;
+                }
             }
         }
         return result;
@@ -577,7 +580,7 @@
                     MathUtils.RandRangeInt(-180, 180), GunSprite);
             }
         }
-        else//没有武器
+        else //没有武器
         {
             if (master.Holster.PickupGun(this) == -1)
             {
@@ -586,7 +589,7 @@
                 {
                     var gun = master.Holster.RmoveGun(master.Holster.ActiveIndex);
                     gun.StartThrowGun(master);
-                    master.Holster.PickupGun(this);
+                    master.PickUpGun(this);
                 }
             }
         }