From 6859486b32b5728a624ac5737c49bce16324acec Mon Sep 17 00:00:00 2001
From: NguyenVanDat <drimdar.game@gmail.com>
Date: Mon, 20 Apr 2026 11:41:15 +0700
Subject: [PATCH 1/2] update edit combo

---
 Assets/PerfectWorld/Scripts/UI/SkillUI/CDlgSkillSubPool.cs      | 1 +
 Assets/PerfectWorld/Scripts/UI/SkillUI/SkillSetUpComboWidget.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Assets/PerfectWorld/Scripts/UI/SkillUI/CDlgSkillSubPool.cs b/Assets/PerfectWorld/Scripts/UI/SkillUI/CDlgSkillSubPool.cs
index a6140ff294..420c0d55a1 100644
--- a/Assets/PerfectWorld/Scripts/UI/SkillUI/CDlgSkillSubPool.cs
+++ b/Assets/PerfectWorld/Scripts/UI/SkillUI/CDlgSkillSubPool.cs
@@ -144,6 +144,7 @@ namespace BrewMonster
 
         private void OnClickedConfirmCombo()
         {
+            _skillSetUpComboWidget.ShowCurrentCombos();
             if (_currentSelectComboSlot != null &&
                 _skillSetUpComboWidget.CurrentComboSetting.comboSkill[_currentSelectComboSlot.GetSlotIndex].idSkill == null)
             {
diff --git a/Assets/PerfectWorld/Scripts/UI/SkillUI/SkillSetUpComboWidget.cs b/Assets/PerfectWorld/Scripts/UI/SkillUI/SkillSetUpComboWidget.cs
index eb9370f160..3bd01534b9 100644
--- a/Assets/PerfectWorld/Scripts/UI/SkillUI/SkillSetUpComboWidget.cs
+++ b/Assets/PerfectWorld/Scripts/UI/SkillUI/SkillSetUpComboWidget.cs
@@ -104,7 +104,7 @@ namespace BrewMonster
             _btnLoopAttack.OnClickedSkillSlot -= OnSelectedSkillToAsign;
         }
 
-        private void ShowCurrentCombos()
+        public void ShowCurrentCombos()
         {
             // setting.comboSkill[GetData() - 1].nIcon = (byte)m_nIcon;
             if (Setting.comboSkill == null || _combosList.Count != Setting.comboSkill.Length)

From 48548d23cc9e919d1152da034a606aa11fcc8203 Mon Sep 17 00:00:00 2001
From: CuongNV <>
Date: Mon, 20 Apr 2026 14:12:28 +0700
Subject: [PATCH 2/2] fix bug dont show icon skill

---
 .../Scripts/UI/GamePlay/AUIImagePicture.cs    | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs
index 8f9fc9a7d2..25babd77e4 100644
--- a/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs
+++ b/Assets/PerfectWorld/Scripts/UI/GamePlay/AUIImagePicture.cs
@@ -16,6 +16,7 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
     public class AUIImagePicture : AUIImagePictureBase
     {
         public const string DefaultComboIcon = "爱你";
+        [SerializeField] Button skillbutton;
         [SerializeField] GameObject borderImage;
         [SerializeField] int cooldownTime;
         [SerializeField] AUIClockIcon m_ClockCounter;
@@ -36,6 +37,12 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
 
         public override void Awake()
         {
+            if (skillbutton == null)
+            {
+                return;
+            }
+            skillbutton.onClick.RemoveAllListeners();
+            skillbutton.onClick.AddListener(Execute);
             m_pParent = GetComponentInParent<AUIDialog>();
             // _skillID = int.Parse(this.name.Split('_')[1]);
         }
@@ -44,11 +51,14 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
         {
             if (isInteract)
             {
+                skillbutton.interactable = true;
                 disPlayImage.color = Color.white;
             }
             else
             {
                 disPlayImage.color = Color.gray;
+
+                skillbutton.interactable = false;
             }
         }
 
@@ -87,6 +97,12 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
                 Debug.LogError("Skill Image is not assigned in AUIImagePicture");
                 return;
             }
+
+            if (skillbutton != null)
+            {
+                skillbutton.interactable = true;
+            }
+
             disPlayImage.color = Color.white;
             disPlayImage.sprite = sprite;
             disPlayImage.gameObject.SetActive(true);
@@ -95,9 +111,11 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
         }
         private IEnumerator CooldownRoutine()
         {
+            skillbutton.interactable = false;
             disPlayImage.color = Color.gray;
             yield return new WaitForSeconds(cooldownTime);
             disPlayImage.color = Color.white;
+            skillbutton.interactable = true;
         }
         public AUIClockIcon GetClockIcon() => m_ClockCounter;
 
@@ -116,6 +134,7 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
         {
             // BMLogger.Log("Clear AUIImagePicture with name: " + name) ;
             base.Clear();
+            skillbutton.interactable = true;
             if (disPlayImage != null)
             {
                 disPlayImage.color = Color.white;
@@ -214,7 +233,6 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
             }
 
             _skillGroupIndex = resolvedGroup;
-
             Clear();
             return false;
         }
@@ -227,6 +245,7 @@ namespace BrewMonster.Assets.PerfectWorld.Scripts.UI.GamePlay
                 return false;
             }
 
+            skillbutton.interactable = true;
             var uiMan = EC_Game.GetGameRun()?.GetUIManager()?.GetInGameUIMan();
             if (uiMan == null)
             {