diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgInstall.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgInstall.cs index 79ccccb026..32890746ec 100644 --- a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgInstall.cs +++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgInstall.cs @@ -1,4 +1,4 @@ -using BrewMonster.Network; +using BrewMonster.Network; using BrewMonster.Scripts.Managers; using BrewMonster.UI; using PerfectWorld.Scripts.Managers; @@ -37,12 +37,13 @@ namespace BrewMonster [Header("Buttons and Money")] [SerializeField] private TextMeshProUGUI m_TxtMoney; + [SerializeField] private Button m_useItem; [SerializeField] private Button m_BtnMergeOrReset; [SerializeField] private Button m_BtnCancel; [SerializeField] private Button m_BtnClose; [SerializeField] private Sprite khung_item; - [SerializeField] private Transform itemInventoryRoot; + [SerializeField] private GameObject itemInventoryRoot; private EC_IvtrItem m_SelectedEquip; private EC_IvtrItem m_SelectedMaterial; @@ -58,31 +59,14 @@ namespace BrewMonster public override void Awake() { base.Awake(); - RegisterDrop(m_SlotFirstParent, OnDropEquip); RegisterClick(m_SlotFirstParent, OnClickEquipSlot); if (m_Mode == InstallMode.Enchase && m_SlotSecondParent != null) { - RegisterDrop(m_SlotSecondParent, OnDropMaterial); RegisterClick(m_SlotSecondParent, OnClickMaterialSlot); } } - public override void Update() - { -#if UNITY_EDITOR || UNITY_STANDALONE - if (Input.GetMouseButtonDown(0)) - { - CheckHidePanel(Input.mousePosition); - } -#else - if (Input.touchCount > 0 && Input.GetTouch(0).phase == TouchPhase.Began) - { - CheckHidePanel(Input.GetTouch(0).position); - } -#endif - } - public override void OnEnable() { base.OnEnable(); @@ -91,6 +75,7 @@ namespace BrewMonster m_BtnMergeOrReset.onClick.AddListener(OnClickedMergeOrReset); m_BtnCancel.onClick.AddListener(OnCommandCancel); m_BtnClose.onClick.AddListener(OnCommandCancel); + m_useItem.onClick.AddListener(OnUseItemClicked); m_install_price = -1; if (m_SlotSecondParent != null) m_SlotSecondParent.gameObject.SetActive(m_Mode == InstallMode.Enchase); @@ -104,6 +89,7 @@ namespace BrewMonster m_BtnMergeOrReset.onClick.RemoveListener(OnClickedMergeOrReset); m_BtnCancel.onClick.RemoveListener(OnCommandCancel); m_BtnClose.onClick.RemoveListener(OnCommandCancel); + m_useItem.onClick.RemoveListener(OnUseItemClicked); } private void RestoreInventoryColors() @@ -147,23 +133,6 @@ namespace BrewMonster return list[slot]; } - private void RegisterDrop(Transform target, Action callback) - { - var trigger = target.GetComponent(); - if (trigger == null) - trigger = target.gameObject.AddComponent(); - - trigger.triggers.Clear(); - - var entry = new EventTrigger.Entry - { - eventID = EventTriggerType.Drop - }; - entry.callback.AddListener((data) => { callback((PointerEventData)data); }); - - trigger.triggers.Add(entry); - } - private void RegisterClick(Transform target, Action callback) { if (target == null) return; @@ -199,117 +168,6 @@ namespace BrewMonster } } - private EC_IvtrItem GetItemFromDrag(PointerEventData eventData) - { - if (eventData.pointerDrag == null) - return null; - - var btn = eventData.pointerDrag.GetComponent