diff --git a/xiaofang/Assets/Script/Character/Skills/UseSkill.cs b/xiaofang/Assets/Script/Character/Skills/UseSkill.cs index 416c0f49..5a3fdc3d 100644 --- a/xiaofang/Assets/Script/Character/Skills/UseSkill.cs +++ b/xiaofang/Assets/Script/Character/Skills/UseSkill.cs @@ -50,9 +50,15 @@ public class UseSkill : MonoBehaviour if (Input.GetKeyDown(KeyCode.F)) { Debug.LogError("F"); + //Debug.LogError(skill_Pick.Pick()); + if (currentItem != null) + { + currentItem = _skill_Pick.Drop(currentItem); + currentItem=null; + } currentItem = _skill_Pick.Pick(); - if(currentItem==null) return; + if(currentItem.transform.name == "NoFire") { currentItem.transform.Rotate(180f, -80f, -30f); diff --git a/xiaofang/Assets/Script/XFS.cs b/xiaofang/Assets/Script/XFS.cs index 7c55677c..605d8079 100644 --- a/xiaofang/Assets/Script/XFS.cs +++ b/xiaofang/Assets/Script/XFS.cs @@ -37,7 +37,7 @@ public class XFS : MonoBehaviour public void connectGun() { - UseSkill.Initgun(Gun); + CharacterControl.enabled = true; }