From d8e7c87365e3bb25d850c1286d61e6dddf73f751 Mon Sep 17 00:00:00 2001
From: HungDK <>
Date: Mon, 6 Apr 2026 11:25:28 +0700
Subject: [PATCH] Add tabs button to show task and item inventory

---
 .../Scripts/Managers/EC_InventoryUI.cs        | 74 +++++++++++++++----
 Assets/Prefabs/UI/InventoryUI.prefab          | 37 +++++-----
 2 files changed, 79 insertions(+), 32 deletions(-)

diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
index cba791e16e..d3d90979a5 100644
--- a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
@@ -22,10 +22,15 @@ namespace BrewMonster.Scripts.Managers
     {
        
         [Header("Pack Buttons (assign in Inspector)")]
-        [SerializeField] private List<Button> inventoryPackButtons = new List<Button>(); // byPackage: 0
+        [Tooltip("Main slot grid: shows IVTRTYPE_PACK (0) on Item tab and IVTRTYPE_TASKPACK (2) on Task tab.")]
+        [SerializeField] private List<Button> inventoryPackButtons = new List<Button>();
         [SerializeField] private List<Button> equipmentPackButtons = new List<Button>(); // byPackage: 1
         [SerializeField] private List<Button> fashionPackButtons = new List<Button>();   // byPackage: 3
 
+        [Header("Inventory tabs — Item vs Task (original PW)")]
+        [SerializeField] private Button tabItemButton;
+        [SerializeField] private Button tabTaskButton;
+
         [Header("Detail Panel (assign in Inspector)")]
         [SerializeField] private ItemInfo detailPanelRoot;
         [SerializeField] private Vector2 detailPanelOffset = new Vector2(20f, 0f);
@@ -89,14 +94,24 @@ namespace BrewMonster.Scripts.Managers
         private EC_IvtrItem currentSelectedItem;
         private EC_IvtrItem currentSelectedEquipment;
 
-        private const byte PKG_INVENTORY = 0;
-        private const byte PKG_EQUIPMENT = 1;
-        private const byte PKG_FASHION = 3; // Note: byPackage 3 used for Fashion
+        private const byte PKG_INVENTORY = InventoryConst.IVTRTYPE_PACK;
+        private const byte PKG_EQUIPMENT = InventoryConst.IVTRTYPE_EQUIPPACK;
+        private const byte PKG_TASK = InventoryConst.IVTRTYPE_TASKPACK;
+        private const byte PKG_FASHION = 3; // Trash / fashion box slot in legacy client (GetInventory may not resolve; see host)
+
+        public enum InventoryBagTab
+        {
+            Item,
+            Task,
+        }
+
+        private InventoryBagTab _bagTab = InventoryBagTab.Item;
 
         private void Awake()
         {
             model = new InventoryModel();
             view = new InventoryView();
+            WireBagTabButtons();
 
             //if (currentDragImage == null)
             //{
@@ -115,7 +130,7 @@ namespace BrewMonster.Scripts.Managers
 
         private void Start()
         {
-            RefreshAll();
+            SetBagTab(InventoryBagTab.Item);
             if (hideDetailOnStart)
             {
                 ShowDetailPanel(false);
@@ -130,6 +145,29 @@ namespace BrewMonster.Scripts.Managers
             ApplyPendingCurrency();
             UpdateCharacterInfo();
             ShowDetailPanel(false);
+            RefreshAll();
+        }
+
+        private void WireBagTabButtons()
+        {
+            if (tabItemButton != null)
+            {
+                tabItemButton.onClick.RemoveAllListeners();
+                tabItemButton.onClick.AddListener(() => SetBagTab(InventoryBagTab.Item));
+            }
+            if (tabTaskButton != null)
+            {
+                tabTaskButton.onClick.RemoveAllListeners();
+                tabTaskButton.onClick.AddListener(() => SetBagTab(InventoryBagTab.Task));
+            }
+        }
+
+        /// <summary>Switches main bag view between normal items (tab 1) and task / quest bag (tab 2), like legacy PW.</summary>
+        public void SetBagTab(InventoryBagTab tab)
+        {
+            _bagTab = tab;
+            ShowDetailPanel(false);
+            RefreshAll();
         }
 
         private void Update()
@@ -149,9 +187,10 @@ namespace BrewMonster.Scripts.Managers
         /// </summary>
         public void UpdateCooldownOverlays()
         {
-            // Update inventory pack cooldowns
+            // Main grid shows either normal pack or task pack depending on tab
             // 更新背包冷却
-            UpdatePackageCooldowns(inventoryPackButtons, PKG_INVENTORY);
+            byte mainPack = _bagTab == InventoryBagTab.Item ? PKG_INVENTORY : PKG_TASK;
+            UpdatePackageCooldowns(inventoryPackButtons, mainPack);
         }
 
         /// <summary>
@@ -204,8 +243,16 @@ namespace BrewMonster.Scripts.Managers
             var invItems = model.GetInventoryData(PKG_INVENTORY);
             var eqpItems = model.GetInventoryData(PKG_EQUIPMENT);
             var fshItems = model.GetInventoryData(PKG_FASHION);
+            var taskItems = model.GetInventoryData(PKG_TASK);
 
-            view.RenderPackage(inventoryPackButtons, invItems, PKG_INVENTORY, OnInventoryButtonClicked, GetDisplayTextForItem);
+            if (_bagTab == InventoryBagTab.Item)
+            {
+                view.RenderPackage(inventoryPackButtons, invItems, PKG_INVENTORY, OnInventoryButtonClicked, GetDisplayTextForItem);
+            }
+            else
+            {
+                view.RenderPackage(inventoryPackButtons, taskItems, PKG_TASK, OnInventoryButtonClicked, GetDisplayTextForItem);
+            }
             view.RenderPackage(equipmentPackButtons, eqpItems, PKG_EQUIPMENT, OnInventoryButtonClicked, GetDisplayTextForItem);
             view.RenderPackage(fashionPackButtons, fshItems, PKG_FASHION, OnInventoryButtonClicked, GetDisplayTextForItem);
             UpdateCharacterInfo();
@@ -378,7 +425,7 @@ namespace BrewMonster.Scripts.Managers
                 return;
             }
 
-            if (currentSelectedPackage == PKG_INVENTORY)
+            if (currentSelectedPackage == PKG_INVENTORY || currentSelectedPackage == PKG_TASK)
             {
                 // Check if item is equipment
                 if (currentSelectedItem.IsEquipment())
@@ -415,9 +462,9 @@ namespace BrewMonster.Scripts.Managers
                 return;
             }
 
-            if (currentSelectedPackage != PKG_INVENTORY)
+            if (currentSelectedPackage != PKG_INVENTORY && currentSelectedPackage != PKG_TASK)
             {
-                Debug.LogWarning("[InventoryUI] Can only use items from inventory package");
+                Debug.LogWarning("[InventoryUI] Can only use items from inventory or task package");
                 return;
             }
 
@@ -964,6 +1011,7 @@ namespace BrewMonster.Scripts.Managers
             switch (package)
             {
                 case PKG_INVENTORY:
+                case PKG_TASK:
                     list = inventoryPackButtons;
                     break;
                 case PKG_EQUIPMENT:
@@ -1075,7 +1123,7 @@ namespace BrewMonster.Scripts.Managers
                 var tmpText = equipButton.GetComponentInChildren<TMPro.TextMeshProUGUI>();
                 if (tmpText != null)
                 {
-                    if (package == PKG_INVENTORY)
+                    if (package == PKG_INVENTORY || package == PKG_TASK)
                     {
                         //if item is @EC_IvtrEquip and is not equipped, show equip button
                         if(item is EC_IvtrEquip)
@@ -1102,7 +1150,7 @@ namespace BrewMonster.Scripts.Managers
             }
             else
             {
-                if (package == PKG_INVENTORY)
+                if (package == PKG_INVENTORY || package == PKG_TASK)
                 {
                     if(item is EC_IvtrEquip)
                     {
diff --git a/Assets/Prefabs/UI/InventoryUI.prefab b/Assets/Prefabs/UI/InventoryUI.prefab
index d82c56298b..07f8932d4d 100644
--- a/Assets/Prefabs/UI/InventoryUI.prefab
+++ b/Assets/Prefabs/UI/InventoryUI.prefab
@@ -1961,7 +1961,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &64585481268713917
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1977,9 +1977,9 @@ RectTransform:
   - {fileID: 7063925482172052076}
   m_Father: {fileID: 4359352035478671586}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 92.65, y: -36.303}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 185.3, y: 72.606}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6580926924470282336
@@ -10280,7 +10280,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7214549036987193986
 RectTransform:
   m_ObjectHideFlags: 0
@@ -10296,9 +10296,9 @@ RectTransform:
   - {fileID: 8707107604074202174}
   m_Father: {fileID: 4359352035478671586}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 463.25, y: -36.30285}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 185.3, y: 72.6057}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6248269220837765992
@@ -10322,7 +10322,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.33333334}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -10378,7 +10378,7 @@ MonoBehaviour:
     m_PressedTrigger: Pressed
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
-  m_Interactable: 1
+  m_Interactable: 0
   m_TargetGraphic: {fileID: 8383648154857910679}
   m_OnClick:
     m_PersistentCalls:
@@ -12562,6 +12562,8 @@ MonoBehaviour:
   - {fileID: 6415804096478650164}
   - {fileID: 486249631205428665}
   fashionPackButtons: []
+  tabItemButton: {fileID: 1025193074652694500}
+  tabTaskButton: {fileID: 8447324723389536767}
   detailPanelRoot: {fileID: 759109931263093524}
   detailPanelOffset: {x: 20, y: 0}
   hideDetailOnStart: 1
@@ -12576,9 +12578,6 @@ MonoBehaviour:
   moneyTextsLegacy: []
   moneyTextsTMP:
   - {fileID: 776624419558043962}
-  cashTextsLegacy: []
-  cashTextsTMP:
-  - {fileID: 0}
   characterNameTextLegacy: {fileID: 0}
   characterNameTextTMP: {fileID: 6101848964131719891}
   characterLevelTextLegacy: {fileID: 0}
@@ -14589,7 +14588,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6872360865646447011
 RectTransform:
   m_ObjectHideFlags: 0
@@ -14605,9 +14604,9 @@ RectTransform:
   - {fileID: 3208901167605625288}
   m_Father: {fileID: 4359352035478671586}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 277.95, y: -36.30285}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 185.3, y: 72.6057}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8787094950878048123
@@ -15483,8 +15482,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+    rgba: 1677721599
+  m_fontColor: {r: 1, g: 1, b: 1, a: 0.3882353}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient: