diff --git a/Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs b/Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
index 9064fcc8d0..a4bd58d806 100644
--- a/Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
+++ b/Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
@@ -1,95 +1,100 @@
-namespace BrewMonster.Scripts
-{
-    public class InventoryConst
-    {
-        // Index of item in equipment inventory
-        public const int EQUIPIVTR_WEAPON = 0;
-        public const int EQUIPIVTR_HEAD = 1;
-        public const int EQUIPIVTR_NECK = 2;
-        public const int EQUIPIVTR_SHOULDER = 3;
-        public const int EQUIPIVTR_BODY = 4;
-        public const int EQUIPIVTR_WAIST = 5;
-        public const int EQUIPIVTR_LEG = 6;
-        public const int EQUIPIVTR_FOOT = 7;
-        public const int EQUIPIVTR_WRIST = 8;
-        public const int EQUIPIVTR_FINGER1 = 9;
-        public const int EQUIPIVTR_FINGER2 = 10;
-        public const int EQUIPIVTR_PROJECTILE = 11;
-        public const int EQUIPIVTR_FLYSWORD = 12;
-        public const int EQUIPIVTR_FASHION_BODY = 13;
-        public const int EQUIPIVTR_FASHION_LEG = 14;
-        public const int EQUIPIVTR_FASHION_FOOT = 15;
-        public const int EQUIPIVTR_FASHION_WRIST = 16;
-        public const int EQUIPIVTR_RUNE = 17;
-        public const int EQUIPIVTR_BIBLE = 18;
-        public const int EQUIPIVTR_SPEAKER = 19;
-        public const int EQUIPIVTR_AUTOHP = 20;
-        public const int EQUIPIVTR_AUTOMP = 21;
-        public const int EQUIPIVTR_POCKET = 22;
-        public const int EQUIPIVTR_GOBLIN = 23;
-        public const int EQUIPIVTR_CERTIFICATE = 24;
-        public const int EQUIPIVTR_FASHION_HEAD = 25;
-        public const int EQUIPIVTR_FORCE_TOKEN = 26;
-        public const int EQUIPIVTR_DYNSKILLEQUIP1 = 27;
-        public const int EQUIPIVTR_DYNSKILLEQUIP2 = 28;
-        public const int EQUIPIVTR_FASHION_WEAPON = 29;
-        public const int SIZE_EQUIPIVTR = 30;
-        public const int EQUIPIVTR_UNUSED1 = 30;
-        public const int EQUIPIVTR_UNUSED2 = 31;
-        public const int EQUIPIVTR_GENERALCARD1 = 32;
-        public const int EQUIPIVTR_GENERALCARD2 = 33;
-        public const int EQUIPIVTR_GENERALCARD3 = 34;
-        public const int EQUIPIVTR_GENERALCARD4 = 35;
-        public const int EQUIPIVTR_GENERALCARD5 = 36;
-        public const int EQUIPIVTR_GENERALCARD6 = 37;
-        public const int SIZE_ALL_EQUIPIVTR = 38;
-        public const int SIZE_GENERALCARD_EQUIPIVTR = 6; // SIZE_ALL_EQUIPIVTR - EQUIPIVTR_GENERALCARD1
-        
-        // Inventory size constants
-        public const int IVTRSIZE_EQUIPPACK = 32;      // Equipment (SIZE_ALL_EQUIPIVTR)
-        public const int IVTRSIZE_TASKPACK = 32;       // Task pack
-        public const int IVTRSIZE_DEALPACK = 24;       // Deal pack
-        public const int IVTRSIZE_NPCPACK = 32;        // NPC pack
-        public const int IVTRSIZE_TRASHBOX = 16;       // Trash box
-        public const int IVTRSIZE_BUYPACK = 12;        // Buy pack
-        public const int IVTRSIZE_SELLPACK = 12;       // Sell pack
-        public const int IVTRSIZE_BOOTHSPACK = 12;     // Default booth pack for selling
-        public const int IVTRSIZE_BOOTHBPACK = 12;     // Default booth pack for buying
-        public const int IVTRSIZE_BOOTHSPACK_MAX = 20; // Max booth pack for selling (player may use certificate...)
-        public const int IVTRSIZE_BOOTHBPACK_MAX = 20; // Max booth pack for buying
-        
-        public const int IVTRSIZE_CLIENTCARDPACK = 32; // Client pack for general card collection
-
-        // Main bag UI (C++ DlgInventory.h: CECDLGSHOP_PACKMAX / PACKLINEMAX)
-        public const int IVTRSIZE_PACK_UI_PAGE = 32;
-        public const int IVTRSIZE_PACK_UI_LINE = 8;
-        /// <summary>Upper bound for client pack slots (server ivtr_size is byte).</summary>
-        public const int IVTRSIZE_PACK_MAX = 255;
-        
-        public const int NUM_NPCIVTR = 8;              // NPC inventory number
-
-        // Inventory package types (match legacy C++ IVTRTYPE_*)
-        public const byte IVTRTYPE_PACK = 0;
-        public const byte IVTRTYPE_EQUIPPACK = 1;
-        public const byte IVTRTYPE_TASKPACK = 2;
-    }
-    public enum Shortcut
-    {
-        NUM_HOSTSCSETS1 = 5,    // expanded from 3 to 5 (2009.05.27)
-        NUM_HOSTSCSETS2 = 3,
-        SIZE_HOSTSCSET1 = 9,    // expanded from 6 to 9 (2009.05.27)
-        SIZE_HOSTSCSET2 = 8,
-
-        SIZE_FASHIONSCSET = 240,
-    };
-    //	Pet food type
-    enum PetFoodType
-    {
-        PET_FOOD_GRASS = 0,
-        PET_FOOD_MEAT,
-        PET_FOOD_VEGETABLE,
-        PET_FOOD_FRUIT,
-        PET_FOOD_WATER,
-        MAX_PET_FOOD,
-    };
+namespace BrewMonster.Scripts
+{
+    public class InventoryConst
+    {
+        // Index of item in equipment inventory
+        public const int EQUIPIVTR_WEAPON = 0;
+        public const int EQUIPIVTR_HEAD = 1;
+        public const int EQUIPIVTR_NECK = 2;
+        public const int EQUIPIVTR_SHOULDER = 3;
+        public const int EQUIPIVTR_BODY = 4;
+        public const int EQUIPIVTR_WAIST = 5;
+        public const int EQUIPIVTR_LEG = 6;
+        public const int EQUIPIVTR_FOOT = 7;
+        public const int EQUIPIVTR_WRIST = 8;
+        public const int EQUIPIVTR_FINGER1 = 9;
+        public const int EQUIPIVTR_FINGER2 = 10;
+        public const int EQUIPIVTR_PROJECTILE = 11;
+        public const int EQUIPIVTR_FLYSWORD = 12;
+        public const int EQUIPIVTR_FASHION_BODY = 13;
+        public const int EQUIPIVTR_FASHION_LEG = 14;
+        public const int EQUIPIVTR_FASHION_FOOT = 15;
+        public const int EQUIPIVTR_FASHION_WRIST = 16;
+        public const int EQUIPIVTR_RUNE = 17;
+        public const int EQUIPIVTR_BIBLE = 18;
+        public const int EQUIPIVTR_SPEAKER = 19;
+        public const int EQUIPIVTR_AUTOHP = 20;
+        public const int EQUIPIVTR_AUTOMP = 21;
+        public const int EQUIPIVTR_POCKET = 22;
+        public const int EQUIPIVTR_GOBLIN = 23;
+        public const int EQUIPIVTR_CERTIFICATE = 24;
+        public const int EQUIPIVTR_FASHION_HEAD = 25;
+        public const int EQUIPIVTR_FORCE_TOKEN = 26;
+        public const int EQUIPIVTR_DYNSKILLEQUIP1 = 27;
+        public const int EQUIPIVTR_DYNSKILLEQUIP2 = 28;
+        public const int EQUIPIVTR_FASHION_WEAPON = 29;
+        public const int SIZE_EQUIPIVTR = 30;
+        public const int EQUIPIVTR_UNUSED1 = 30;
+        public const int EQUIPIVTR_UNUSED2 = 31;
+        public const int EQUIPIVTR_GENERALCARD1 = 32;
+        public const int EQUIPIVTR_GENERALCARD2 = 33;
+        public const int EQUIPIVTR_GENERALCARD3 = 34;
+        public const int EQUIPIVTR_GENERALCARD4 = 35;
+        public const int EQUIPIVTR_GENERALCARD5 = 36;
+        public const int EQUIPIVTR_GENERALCARD6 = 37;
+        public const int SIZE_ALL_EQUIPIVTR = 38;
+        public const int SIZE_GENERALCARD_EQUIPIVTR = 6; // SIZE_ALL_EQUIPIVTR - EQUIPIVTR_GENERALCARD1
+        
+        // Inventory size constants
+        public const int IVTRSIZE_EQUIPPACK = 32;      // Equipment (SIZE_ALL_EQUIPIVTR)
+        public const int IVTRSIZE_TASKPACK = 32;       // Task pack
+        public const int IVTRSIZE_DEALPACK = 24;       // Deal pack
+        public const int IVTRSIZE_NPCPACK = 32;        // NPC pack
+        public const int IVTRSIZE_TRASHBOX = 16;       // Trash box
+        public const int IVTRSIZE_BUYPACK = 12;        // Buy pack
+        public const int IVTRSIZE_SELLPACK = 12;       // Sell pack
+        public const int IVTRSIZE_BOOTHSPACK = 12;     // Default booth pack for selling
+        public const int IVTRSIZE_BOOTHBPACK = 12;     // Default booth pack for buying
+        public const int IVTRSIZE_BOOTHSPACK_MAX = 20; // Max booth pack for selling (player may use certificate...)
+        public const int IVTRSIZE_BOOTHBPACK_MAX = 20; // Max booth pack for buying
+        
+        public const int IVTRSIZE_CLIENTCARDPACK = 32; // Client pack for general card collection
+
+        // Main bag UI (C++ DlgInventory.h: CECDLGSHOP_PACKMAX / PACKLINEMAX)
+        public const int IVTRSIZE_PACK_UI_PAGE = 32;
+        public const int IVTRSIZE_PACK_UI_LINE = 8;
+        /// <summary>Upper bound for client pack slots (server ivtr_size is byte).</summary>
+        public const int IVTRSIZE_PACK_MAX = 255;
+        
+        public const int NUM_NPCIVTR = 8;              // NPC inventory number
+
+        // Inventory package types (match legacy C++ IVTRTYPE_*)
+        public const byte IVTRTYPE_PACK = 0;
+        public const byte IVTRTYPE_EQUIPPACK = 1;
+        public const byte IVTRTYPE_TASKPACK = 2;
+        public const byte IVTRTYPE_TRASHBOX = 3;
+        public const byte IVTRTYPE_TRASHBOX2 = 4;
+        public const byte IVTRTYPE_TRASHBOX3 = 5;
+        public const byte IVTRTYPE_ACCOUNT_BOX = 6;
+        public const byte IVTRTYPE_GENERALCARD_BOX = 7;
+    }
+    public enum Shortcut
+    {
+        NUM_HOSTSCSETS1 = 5,    // expanded from 3 to 5 (2009.05.27)
+        NUM_HOSTSCSETS2 = 3,
+        SIZE_HOSTSCSET1 = 9,    // expanded from 6 to 9 (2009.05.27)
+        SIZE_HOSTSCSET2 = 8,
+
+        SIZE_FASHIONSCSET = 240,
+    };
+    //	Pet food type
+    enum PetFoodType
+    {
+        PET_FOOD_GRASS = 0,
+        PET_FOOD_MEAT,
+        PET_FOOD_VEGETABLE,
+        PET_FOOD_FRUIT,
+        PET_FOOD_WATER,
+        MAX_PET_FOOD,
+    };
 }
\ No newline at end of file
diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
index e374f7d57e..a014dc3809 100644
--- a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
@@ -43,6 +43,8 @@ namespace BrewMonster.Scripts.Managers
         [SerializeField] private EC_UIUtility.TextOutlet descriptionText;
         [SerializeField] private Button equipButton;
         [SerializeField] private Button dropButton;
+        [Tooltip("Optional. When warehouse is open: Bỏ vào / Lấy ra. If unset, equipButton is reused.")]
+        [SerializeField] private Button storageTransferButton;
 
         [Header("Stack Split UI (assign in Inspector)")]
         [SerializeField] private GameObject splitPanelRoot;
@@ -113,15 +115,19 @@ namespace BrewMonster.Scripts.Managers
         }
 
         // Current selected item for equip/unequip operations
-        private byte currentSelectedPackage;
-        private int currentSelectedSlot;
+        internal byte currentSelectedPackage;
+        internal int currentSelectedSlot;
         private EC_IvtrItem currentSelectedItem;
         private EC_IvtrItem currentSelectedEquipment;
 
+        private Transform _detailPanelOriginalParent;
+        private int _detailPanelOriginalSiblingIndex = -1;
+
         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)
+        private const byte PKG_TRASHBOX = InventoryConst.IVTRTYPE_TRASHBOX;
 
         public enum InventoryBagTab
         {
@@ -132,6 +138,26 @@ namespace BrewMonster.Scripts.Managers
         private InventoryBagTab _bagTab = InventoryBagTab.Item;
         private bool _inventorySlotTemplateResolved;
 
+        public override void Show(bool value)
+        {
+            if (!value && GetHostPlayer() != null && GetHostPlayer().IsUsingTrashBox())
+            {
+                CECHostPlayer.PopupStorageDialog(true);
+                return;
+            }
+            base.Show(value);
+        }
+
+        public override void CloseDialogue()
+        {
+            if (GetHostPlayer() != null && GetHostPlayer().IsUsingTrashBox())
+            {
+                CECHostPlayer.PopupStorageDialog(true);
+                return;
+            }
+            base.CloseDialogue();
+        }
+
         private void Awake()
         {
             model = new InventoryModel();
@@ -646,31 +672,42 @@ namespace BrewMonster.Scripts.Managers
             }
         }
 
-        private void OnInventoryButtonClicked(byte package, int slot)
+        /// <summary>Show item detail for pack or warehouse slot (click only opens detail).</summary>
+        public void ShowItemDetailForPackage(byte package, int slot)
         {
-            UnityGameSession.RequestCheckSecurityPassWd("");
-            var data = model.GetInventoryData(package);
-            if (data != null && data.TryGetValue(slot, out var itemData))
+            EC_IvtrItem itemData = null;
+            if (package == PKG_TRASHBOX)
             {
-                // Store current selection for equip/unequip operations
-                currentSelectedPackage = package;
-                currentSelectedSlot = slot;
-                currentSelectedItem = itemData;
-
-                // Create equipment object if this is equipment
-                currentSelectedEquipment = CreateEquipmentFromItemData(itemData);
-
-                // Position detail panel near the clicked item button
-
-                FillDetailPanel(package, itemData);
-                PositionDetailPanelNearButton(package, slot);
+                var host = CECGameRun.Instance?.GetHostPlayer();
+                itemData = host?.GetTrashBox()?.GetItem(slot, false);
             }
             else
             {
-                ShowDetailPanel(false);
+                var data = model.GetInventoryData(package);
+                data?.TryGetValue(slot, out itemData);
+            }
+
+            if (itemData != null)
+            {
+                currentSelectedPackage = package;
+                currentSelectedSlot = slot;
+                currentSelectedItem = itemData;
+                currentSelectedEquipment = CreateEquipmentFromItemData(itemData);
+                FillDetailPanel(package, itemData);
+                PositionDetailPanelNearButton(package, slot);
+                EC_UIUtility.BringPanelToFront(detailPanelRoot.gameObject);
+            }
+            else
+            {
+                DismissItemDetail();
             }
         }
 
+        public void DismissItemDetail() => ShowDetailPanel(false);
+
+        private void OnInventoryButtonClicked(byte package, int slot) =>
+            ShowItemDetailForPackage(package, slot);
+
         /// <summary>
         /// Create EC_IvtrEquip object from InventoryItemData
         /// </summary>
@@ -1465,14 +1502,50 @@ namespace BrewMonster.Scripts.Managers
 
         private void ShowDetailPanel(bool show)
         {
-            EC_UIUtility.ShowPanel(detailPanelRoot.gameObject, show);
-            if (!show)
+            if (detailPanelRoot == null)
+                return;
+
+            if (show)
             {
+                AttachDetailPanelToDialogCanvas();
+                EC_UIUtility.ShowPanel(detailPanelRoot.gameObject, true);
+                EC_UIUtility.BringPanelToFront(detailPanelRoot.gameObject);
+            }
+            else
+            {
+                EC_UIUtility.ShowPanel(detailPanelRoot.gameObject, false);
+                RestoreDetailPanelParent();
                 RefreshSplitControlsVisibility(0, null);
                 RefreshCombineControlsVisibility(0, null);
             }
         }
 
+        void AttachDetailPanelToDialogCanvas()
+        {
+            var panelTransform = detailPanelRoot.transform;
+            var canvasRoot = CECUIManager.Instance?.DialogCanvasTransform;
+            if (canvasRoot == null || panelTransform.parent == canvasRoot)
+                return;
+
+            _detailPanelOriginalParent = panelTransform.parent;
+            _detailPanelOriginalSiblingIndex = panelTransform.GetSiblingIndex();
+            panelTransform.SetParent(canvasRoot, true);
+        }
+
+        void RestoreDetailPanelParent()
+        {
+            if (_detailPanelOriginalParent == null)
+                return;
+
+            var panelTransform = detailPanelRoot.transform;
+            panelTransform.SetParent(_detailPanelOriginalParent, true);
+            if (_detailPanelOriginalSiblingIndex >= 0)
+                panelTransform.SetSiblingIndex(_detailPanelOriginalSiblingIndex);
+
+            _detailPanelOriginalParent = null;
+            _detailPanelOriginalSiblingIndex = -1;
+        }
+
         /// <summary>
         /// Split affordance only for main bag stacks (same as <see cref="SeparateSelectedStack"/>).
         /// If <c>splitCloseButton</c> is parented under <c>splitPanelRoot</c>, its visibility follows the modal (not this rule).
@@ -1531,6 +1604,9 @@ namespace BrewMonster.Scripts.Managers
 
         private Button GetButtonForSlot(byte package, int slot)
         {
+            if (package == PKG_TRASHBOX)
+                return EC_StorageUI.GetSlotButtonStatic(slot);
+
             List<Button> list = null;
             switch (package)
             {
@@ -1621,9 +1697,9 @@ namespace BrewMonster.Scripts.Managers
             // 完全按照C++代码获取扩展描述：g_pGame->GetItemExtDesc(m_tid)
             // C++代码不检查IsInitialized() - 它直接调用GetWideString()
           
-            // Setup equip and drop buttons
             SetupEquipButton(package, item);
             SetupDropButton(package, item);
+            SetupStorageTransferButton(package, item);
 
             // Show panel first
             // 先显示面板
@@ -1640,7 +1716,14 @@ namespace BrewMonster.Scripts.Managers
         {
             if (equipButton == null) return;
 
-            // Clear previous listeners
+            var host = CECGameRun.Instance?.GetHostPlayer();
+            if (host != null && host.IsUsingTrashBox() &&
+                (package == PKG_INVENTORY || package == PKG_TRASHBOX))
+            {
+                equipButton.gameObject.SetActive(false);
+                return;
+            }
+
             equipButton.onClick.RemoveAllListeners();
             equipButton.onClick.AddListener(OnEquipButtonClicked);
 
@@ -1703,10 +1786,119 @@ namespace BrewMonster.Scripts.Managers
             }
         }
 
+        void SetupStorageTransferButton(byte package, EC_IvtrItem item)
+        {
+            var btn = storageTransferButton != null ? storageTransferButton : equipButton;
+            if (btn == null)
+                return;
+
+            var host = CECGameRun.Instance?.GetHostPlayer();
+            bool show = host != null && host.IsUsingTrashBox() &&
+                        (package == PKG_INVENTORY || package == PKG_TRASHBOX);
+            btn.gameObject.SetActive(show);
+            if (!show)
+                return;
+
+            btn.onClick.RemoveAllListeners();
+            btn.onClick.AddListener(OnStorageTransferButtonClicked);
+
+            string label = package == PKG_INVENTORY ? "Bỏ vào" : "Lấy ra";
+            SetButtonLabel(btn, label);
+        }
+
+        static void SetButtonLabel(Button btn, string label)
+        {
+            var buttonText = btn.GetComponentInChildren<UnityEngine.UI.Text>();
+            if (buttonText != null)
+                buttonText.text = label;
+            else
+            {
+                var tmpText = btn.GetComponentInChildren<TMPro.TextMeshProUGUI>();
+                if (tmpText != null)
+                    tmpText.text = label;
+            }
+        }
+
+        void OnStorageTransferButtonClicked()
+        {
+            var host = CECGameRun.Instance?.GetHostPlayer();
+            if (host == null || !host.IsUsingTrashBox() || currentSelectedItem == null)
+                return;
+
+            if (currentSelectedPackage == PKG_INVENTORY && currentSelectedSlot >= 0)
+            {
+                int trashSlot = FindTrashSlotForItem(host, currentSelectedItem);
+                if (trashSlot >= 0)
+                    host.TransferPackAndTrash(PKG_TRASHBOX, trashSlot, currentSelectedSlot);
+            }
+            else if (currentSelectedPackage == PKG_TRASHBOX && currentSelectedSlot >= 0)
+            {
+                int invSlot = FindPackSlotForItem(host, currentSelectedItem);
+                if (invSlot >= 0)
+                    host.TransferPackAndTrash(PKG_TRASHBOX, currentSelectedSlot, invSlot);
+            }
+
+            DismissItemDetail();
+        }
+
+        static int FindTrashSlotForItem(CECHostPlayer host, EC_IvtrItem item)
+        {
+            var trash = host?.GetTrashBox();
+            if (trash == null || item == null)
+                return -1;
+            int size = trash.GetSize();
+            int pile = item.GetPileLimitInstance();
+            if (pile > 1)
+            {
+                for (int i = 0; i < size; i++)
+                {
+                    var dst = trash.GetItem(i);
+                    if (dst != null && dst.m_tid == item.m_tid && dst.m_iCount < pile)
+                        return i;
+                }
+            }
+            for (int i = 0; i < size; i++)
+            {
+                if (trash.GetItem(i) == null)
+                    return i;
+            }
+            return -1;
+        }
+
+        static int FindPackSlotForItem(CECHostPlayer host, EC_IvtrItem item)
+        {
+            var pack = host?.GetPack();
+            if (pack == null || item == null)
+                return -1;
+            int size = pack.GetSize();
+            int pile = item.GetPileLimitInstance();
+            if (pile > 1)
+            {
+                for (int i = 0; i < size; i++)
+                {
+                    var dst = pack.GetItem(i);
+                    if (dst != null && dst.m_tid == item.m_tid && dst.m_iCount < pile)
+                        return i;
+                }
+            }
+            for (int i = 0; i < size; i++)
+            {
+                if (pack.GetItem(i) == null)
+                    return i;
+            }
+            return -1;
+        }
+
         private void SetupDropButton(byte package, EC_IvtrItem item)
         {
             if (dropButton == null) return;
 
+            if (package == PKG_TRASHBOX)
+            {
+                dropButton.gameObject.SetActive(false);
+                return;
+            }
+
             // Clear previous listeners
             dropButton.onClick.RemoveAllListeners();
             dropButton.onClick.AddListener(OnDropButtonClicked);
diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_SlotStackCountDisplay.cs b/Assets/PerfectWorld/Scripts/Managers/EC_SlotStackCountDisplay.cs
new file mode 100644
index 0000000000..613716c632
--- /dev/null
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_SlotStackCountDisplay.cs
@@ -0,0 +1,90 @@
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace BrewMonster.Scripts.Managers
+{
+    /// <summary>Shared stack count label lookup for inventory / storage slot buttons.</summary>
+    public static class EC_SlotStackCountDisplay
+    {
+        public static int ResolveStackCount(EC_IvtrItem item)
+        {
+            if (item == null)
+                return 0;
+            int n = item.GetCount();
+            if (n < 2 && item.m_iCount >= 2)
+                n = item.m_iCount;
+            return n;
+        }
+
+        public static void UpdateButton(Button button, EC_IvtrItem item)
+        {
+            UpdateButton(button, ResolveStackCount(item));
+        }
+
+        public static void UpdateButton(Button button, int count)
+        {
+            if (button == null)
+                return;
+
+            TMPro.TextMeshProUGUI tmpText = null;
+            Text legacyText = null;
+
+            var textTransform = FindStackCountTextTransform(button.transform);
+            if (textTransform != null)
+            {
+                tmpText = textTransform.GetComponent<TMPro.TextMeshProUGUI>();
+                legacyText = textTransform.GetComponent<Text>();
+            }
+
+            if (tmpText == null && legacyText == null)
+            {
+                tmpText = button.GetComponentInChildren<TMPro.TextMeshProUGUI>();
+                if (tmpText == null)
+                    legacyText = button.GetComponentInChildren<Text>();
+            }
+
+            if (count > 1)
+            {
+                string countText = count.ToString();
+                if (tmpText != null)
+                {
+                    tmpText.text = countText;
+                    tmpText.gameObject.SetActive(true);
+                }
+                else if (legacyText != null)
+                {
+                    legacyText.text = countText;
+                    legacyText.gameObject.SetActive(true);
+                }
+            }
+            else
+            {
+                if (tmpText != null)
+                {
+                    tmpText.text = "";
+                    tmpText.gameObject.SetActive(false);
+                }
+                else if (legacyText != null)
+                {
+                    legacyText.text = "";
+                    legacyText.gameObject.SetActive(false);
+                }
+            }
+        }
+
+        static Transform FindStackCountTextTransform(Transform root)
+        {
+            if (root == null)
+                return null;
+            string[] names = { "Txt_Count", "text_quality", "text_quatity", "text_quantity", "image_amount" };
+            for (int n = 0; n < names.Length; n++)
+            {
+                var t = root.Find(names[n]);
+                if (t != null)
+                    return t;
+            }
+            return null;
+        }
+    }
+}
diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_SlotStackCountDisplay.cs.meta b/Assets/PerfectWorld/Scripts/Managers/EC_SlotStackCountDisplay.cs.meta
new file mode 100644
index 0000000000..aa1ae1019e
--- /dev/null
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_SlotStackCountDisplay.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 25708cd8c6fa9b941babe1e2446f18ad
\ No newline at end of file
diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_StorageUI.cs b/Assets/PerfectWorld/Scripts/Managers/EC_StorageUI.cs
new file mode 100644
index 0000000000..05aa26a4d5
--- /dev/null
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_StorageUI.cs
@@ -0,0 +1,279 @@
+using BrewMonster;
+using BrewMonster.Network;
+using BrewMonster.Scripts;
+using BrewMonster.Scripts.Managers;
+using BrewMonster.UI;
+using CSNetwork.GPDataType;
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace BrewMonster.Scripts.Managers
+{
+    /// <summary>
+    /// Warehouse UI (C++ CDlgStorage / Win_Storage). Works with <see cref="EC_InventoryUI"/> for pack↔storage transfer.
+    /// Assign storage slot buttons in Inspector (e.g. clone from inventory grid); dialog name: EC_StorageUI.
+    /// </summary>
+    public class EC_StorageUI : AUIDialog
+    {
+        [SerializeField] private List<Button> storageSlotButtons = new List<Button>();
+        [SerializeField] private Button closeButton;
+        [SerializeField] private List<Text> trashMoneyTextsLegacy = new List<Text>();
+        [SerializeField] private List<TMPro.TextMeshProUGUI> trashMoneyTextsTMP = new List<TMPro.TextMeshProUGUI>();
+
+        [Header("Storage actions (C++ CDlgStorage)")]
+        [Tooltip("Gửi tiền vào kho — C++ INPUTNO_STORAGE_IVTR_MONEY (túi → kho).")]
+        [SerializeField] private Button depositMoneyButton;
+        [Tooltip("Rút tiền ra — C++ INPUTNO_STORAGE_TRASH_MONEY (kho → túi).")]
+        [SerializeField] private Button withdrawMoneyButton;
+        [Tooltip("Sắp xếp kho (IVTRTYPE_TRASHBOX) — C++ CDlgStorage::OnCommand_arrange.")]
+        [SerializeField] private Button sortPackButton;
+
+        private const byte TrashWhere = InventoryConst.IVTRTYPE_TRASHBOX;
+        private int _selectedTrashSlot = -1;
+        private static EC_StorageUI s_instance;
+        private readonly Dictionary<Image, Sprite> _defaultSlotSprites = new Dictionary<Image, Sprite>();
+
+        public override void Awake()
+        {
+            base.Awake();
+            s_instance = this;
+            if (closeButton != null)
+            {
+                closeButton.onClick.RemoveAllListeners();
+                closeButton.onClick.AddListener(() => CECHostPlayer.PopupStorageDialog(true));
+            }
+            ResolveStorageActionButtons();
+            WireStorageActionButtons();
+        }
+
+        private void OnDestroy()
+        {
+            if (s_instance == this)
+                s_instance = null;
+        }
+
+        public static void RefreshAllStatic()
+        {
+            s_instance?.RefreshAll();
+        }
+
+        public static void RefreshMoneyStatic()
+        {
+            s_instance?.RefreshMoney();
+        }
+
+        public static void ClearSelectionStatic()
+        {
+            if (s_instance != null)
+                s_instance._selectedTrashSlot = -1;
+        }
+
+        public static bool TryGetSelectedTrashSlot(out int slot)
+        {
+            slot = s_instance?._selectedTrashSlot ?? -1;
+            return s_instance != null && slot >= 0;
+        }
+
+        public static Button GetSlotButtonStatic(int slot)
+        {
+            if (s_instance == null || slot < 0 || slot >= s_instance.storageSlotButtons.Count)
+                return null;
+            return s_instance.storageSlotButtons[slot];
+        }
+
+        public void RefreshAll()
+        {
+            var host = CECGameRun.Instance?.GetHostPlayer();
+            var trash = host?.GetTrashBox();
+            if (trash == null)
+                return;
+
+            int size = trash.GetSize();
+            EnsureSlotButtons(size);
+
+            for (int i = 0; i < storageSlotButtons.Count; i++)
+            {
+                var btn = storageSlotButtons[i];
+                if (btn == null)
+                    continue;
+                bool active = i < size;
+                btn.gameObject.SetActive(active);
+                if (!active)
+                    continue;
+
+                btn.onClick.RemoveAllListeners();
+                int captured = i;
+                btn.onClick.AddListener(() => OnStorageSlotClicked(captured));
+
+                var item = trash.GetItem(i, false);
+                ApplySlotIcon(btn, item);
+                EC_SlotStackCountDisplay.UpdateButton(btn, item);
+            }
+
+            RefreshMoney();
+        }
+
+        void RefreshMoney()
+        {
+            var host = CECGameRun.Instance?.GetHostPlayer();
+            if (host == null)
+                return;
+            string text = host.GetTrashBoxMoneyCnt().ToString();
+            foreach (var t in trashMoneyTextsLegacy)
+                if (t != null) t.text = text;
+            foreach (var t in trashMoneyTextsTMP)
+                if (t != null) t.text = text;
+        }
+
+        void EnsureSlotButtons(int required)
+        {
+            if (required <= 0 || storageSlotButtons.Count == 0)
+                return;
+            var template = storageSlotButtons[0];
+            var parent = template.transform.parent;
+            while (storageSlotButtons.Count < required && template != null && parent != null)
+            {
+                var clone = Instantiate(template, parent);
+                storageSlotButtons.Add(clone);
+            }
+        }
+
+        void ApplySlotIcon(Button btn, EC_IvtrItem item)
+        {
+            var image = GetSlotIconImage(btn);
+            if (image == null)
+                return;
+
+            if (!_defaultSlotSprites.ContainsKey(image))
+                _defaultSlotSprites[image] = image.sprite;
+
+            bool hasItem = item != null && item.m_iCount > 0;
+            if (hasItem)
+            {
+                image.sprite = EC_IvtrItemUtils.Instance.ResolveItemIconSprite(item.m_tid);
+                image.enabled = true;
+                image.color = Color.white;
+            }
+            else
+            {
+                image.sprite = _defaultSlotSprites[image];
+                image.enabled = true;
+            }
+        }
+
+        static Image GetSlotIconImage(Button btn)
+        {
+            if (btn == null)
+                return null;
+
+            var icon = btn.transform.Find("Icon");
+            if (icon != null && icon.TryGetComponent<Image>(out var iconImg))
+                return iconImg;
+
+            icon = btn.transform.Find("Img_Icon");
+            if (icon != null && icon.TryGetComponent<Image>(out iconImg))
+                return iconImg;
+
+            return btn.GetComponent<Image>();
+        }
+
+        void OnStorageSlotClicked(int slot)
+        {
+            var host = CECGameRun.Instance?.GetHostPlayer();
+            if (host == null || !host.IsUsingTrashBox())
+                return;
+
+            _selectedTrashSlot = -1;
+            var invUi = UnityEngine.Object.FindFirstObjectByType<EC_InventoryUI>();
+            invUi?.ShowItemDetailForPackage(TrashWhere, slot);
+        }
+
+        void ResolveStorageActionButtons()
+        {
+            var buttons = GetComponentsInChildren<Button>(true);
+            for (int i = 0; i < buttons.Length; i++)
+            {
+                var btn = buttons[i];
+                if (btn == null || btn == closeButton)
+                    continue;
+                string n = btn.name.ToLowerInvariant();
+                if (depositMoneyButton == null && (n.Contains("deposit") || n.Contains("put_money") || n.Contains("gui_tien")
+                    || n.Contains("send_money") || n == "choosemoney" || n.Contains("btn_put")))
+                    depositMoneyButton = btn;
+                if (withdrawMoneyButton == null && (n.Contains("withdraw") || n.Contains("get_money") || n.Contains("rut")
+                    || n.Contains("take_money") || n.Contains("btn_get")))
+                    withdrawMoneyButton = btn;
+                if (sortPackButton == null && (n.Contains("arrange") || n.Contains("sort") || n.Contains("sap_xep")
+                    || n == "btn_arrange"))
+                    sortPackButton = btn;
+            }
+        }
+
+        void WireStorageActionButtons()
+        {
+            if (depositMoneyButton != null)
+            {
+                depositMoneyButton.onClick.RemoveAllListeners();
+                depositMoneyButton.onClick.AddListener(OnDepositMoneyClicked);
+            }
+            if (withdrawMoneyButton != null)
+            {
+                withdrawMoneyButton.onClick.RemoveAllListeners();
+                withdrawMoneyButton.onClick.AddListener(OnWithdrawMoneyClicked);
+            }
+            if (sortPackButton != null)
+            {
+                sortPackButton.onClick.RemoveAllListeners();
+                sortPackButton.onClick.AddListener(OnSortPackClicked);
+            }
+        }
+
+        /// <summary>Gửi tiền vào kho (túi → trash).</summary>
+        void OnDepositMoneyClicked()
+        {
+            var host = CECGameRun.Instance?.GetHostPlayer();
+            if (host == null || !host.IsUsingTrashBox())
+                return;
+
+            int max = (int)Mathf.Min(int.MaxValue, host.GetMoneyAmount());
+            if (max <= 0)
+                return;
+
+            DlgQuantity.Show(DlgQuantity.QuantityMode.StorageDepositMoney, max, Mathf.Min(1, max));
+        }
+
+        /// <summary>Rút tiền ra (trash → túi).</summary>
+        void OnWithdrawMoneyClicked()
+        {
+            var host = CECGameRun.Instance?.GetHostPlayer();
+            if (host == null || !host.IsUsingTrashBox())
+                return;
+
+            int max = host.GetTrashBoxMoneyCnt();
+            if (max <= 0)
+                return;
+
+            DlgQuantity.Show(DlgQuantity.QuantityMode.StorageWithdrawMoney, max, Mathf.Min(1, max));
+        }
+
+        /// <summary>Sắp xếp ô kho (IVTRTYPE_TRASHBOX). C++ CDlgStorage::OnCommand_arrange on Win_Storage.</summary>
+        void OnSortPackClicked()
+        {
+            var host = CECGameRun.Instance?.GetHostPlayer();
+            if (host == null || !host.IsUsingTrashBox())
+                return;
+
+            int cool = host.GetCoolTime((int)CoolTimeIndex.GP_CT_MULTI_EXCHANGE_ITEM, out _);
+            if (cool > 0)
+            {
+                EC_Game.GetGameRun()?.AddFixedMessage((int)FixedMsg.FIXMSG_CMD_INCOOLTIME);
+                return;
+            }
+
+            host.SortPack(TrashWhere);
+            RefreshAll();
+        }
+    }
+}
diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_StorageUI.cs.meta b/Assets/PerfectWorld/Scripts/Managers/EC_StorageUI.cs.meta
new file mode 100644
index 0000000000..ed02a07a1f
--- /dev/null
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_StorageUI.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 54080176355858245aee54b7ee47a66f
\ No newline at end of file
diff --git a/Assets/Scripts/CECHostPlayer.Inventory.cs b/Assets/Scripts/CECHostPlayer.Inventory.cs
index 7c1909a661..f460611bc2 100644
--- a/Assets/Scripts/CECHostPlayer.Inventory.cs
+++ b/Assets/Scripts/CECHostPlayer.Inventory.cs
@@ -8,7 +8,7 @@ using CSNetwork.GPDataType;
 using CSNetwork.S2CCommand;
 using System;
 using BrewMonster.UI;
-using PerfectWorld.Scripts.Managers;
+using BrewMonster.Scripts.Managers;
 using UnityEngine;
 using static BrewMonster.Scripts.CECHPWork;
 using static BrewMonster.Scripts.EC_Inventory;
@@ -88,9 +88,15 @@ namespace BrewMonster
                         {
                             UpdateEquipSkins();
                         }
+                        else if (byPackage == InventoryConst.IVTRTYPE_TRASHBOX && m_bUsingTrashBox)
+                        {
+                            PopupStorageDialog();
+                        }
 
                         var ui = GameObject.FindFirstObjectByType<EC_InventoryUI>();
                         ui?.RefreshAll();
+                        if (byPackage == InventoryConst.IVTRTYPE_TRASHBOX)
+                            EC_StorageUI.RefreshAllStatic();
                     }
                     break;
                 }
@@ -131,6 +137,15 @@ namespace BrewMonster
                         {
                             UpdateEquipSkins();
                         }
+                        else if (byPackage == InventoryConst.IVTRTYPE_TRASHBOX && m_bUsingTrashBox)
+                        {
+                            PopupStorageDialog();
+                        }
+
+                        var uiDetail = GameObject.FindFirstObjectByType<EC_InventoryUI>();
+                        uiDetail?.RefreshAll();
+                        if (byPackage == InventoryConst.IVTRTYPE_TRASHBOX)
+                            EC_StorageUI.RefreshAllStatic();
                     }
 
                     break;
@@ -1598,9 +1613,9 @@ namespace BrewMonster
                 case Inventory_type.IVTRTYPE_PACK: pInventory = m_pPack; break;
                 case Inventory_type.IVTRTYPE_EQUIPPACK: pInventory = m_pEquipPack; break;
                 case Inventory_type.IVTRTYPE_TASKPACK: pInventory = m_pTaskPack; break;
-                //case Inventory_type.IVTRTYPE_TRASHBOX: pInventory = m_pTrashBoxPack; break;
-                //case Inventory_type.IVTRTYPE_TRASHBOX2: pInventory = m_pTrashBoxPack2; break;
-                //case Inventory_type.IVTRTYPE_TRASHBOX3: pInventory = m_pTrashBoxPack3; break;
+                case Inventory_type.IVTRTYPE_TRASHBOX: pInventory = m_pTrashBoxPack; break;
+                case Inventory_type.IVTRTYPE_TRASHBOX2: pInventory = m_pTrashBoxPack2; break;
+                case Inventory_type.IVTRTYPE_TRASHBOX3: pInventory = m_pTrashBoxPack3; break;
                 //case Inventory_type.IVTRTYPE_ACCOUNT_BOX: pInventory = m_pAccountBoxPack; break;
                 //case Inventory_type.IVTRTYPE_GENERALCARD_BOX: pInventory = m_pGeneralCardPack; break;
                 //case IVTRTYPE_PACK_CLIENT_GENERALCAR.IVTRTYPE_CLIENT_GENERALCARD_PACK: pInventory = m_pClientGenCardPack; break;
diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs
index b0ddb19f6b..cbee620150 100644
--- a/Assets/Scripts/CECHostPlayer.cs
+++ b/Assets/Scripts/CECHostPlayer.cs
@@ -321,6 +321,12 @@ namespace BrewMonster
                     return m_pEquipPack;
                 case InventoryConst.IVTRTYPE_TASKPACK:
                     return m_pTaskPack;
+                case InventoryConst.IVTRTYPE_TRASHBOX:
+                    return m_pTrashBoxPack;
+                case InventoryConst.IVTRTYPE_TRASHBOX2:
+                    return m_pTrashBoxPack2;
+                case InventoryConst.IVTRTYPE_TRASHBOX3:
+                    return m_pTrashBoxPack3;
                 default:
                     return null;
             }
@@ -329,6 +335,7 @@ namespace BrewMonster
         private void Awake()
         {
             base.Awake();
+            InitTrashBoxPacks();
             m_MoveCtrl = new CECHostMove(this);
 
             // Cache: không bắt buộc, nhưng gọn tay và ít gọi property lặp.
@@ -513,6 +520,9 @@ namespace BrewMonster
                 case EC_MsgDef.MSG_HST_ITEMOPERATION:
                     OnMsgHstItemOperation(Msg);
                     break;
+                case EC_MsgDef.MSG_HST_TRASHBOXOP:
+                    OnMsgHstTrashBoxOperation(Msg);
+                    break;
                 case EC_MsgDef.MSG_HST_PICKUPITEM:
                     OnMsgHstPickupItem(Msg);
                     break;
@@ -565,7 +575,6 @@ namespace BrewMonster
                 case EC_MsgDef.MSG_HST_COOLTIMEDATA: OnMsgHstCoolTimeData(Msg); break;
                 case EC_MsgDef.MSG_HST_PRESSCANCEL: OnMsgHstPressCancel(Msg); break;
                 case EC_MsgDef.MSG_PM_PLAYERFLY: OnMsgPlayerFly(Msg); break;
-                case EC_MsgDef.MSG_PM_PLAYERSITDOWN: OnMsgPlayerSitDown(Msg); break;
                 case EC_MsgDef.MSG_HST_PETOPT: OnMsgHstPetOpt(Msg); break;
                 case EC_MsgDef.MSG_HST_SETPLAYERLIMIT: OnMsgHstSetPlayerLimit(Msg); break;
                 case EC_MsgDef.MSG_PM_PLAYERMOUNT: OnMsgPlayerMount(Msg); break;
@@ -1328,7 +1337,6 @@ namespace BrewMonster
             m_IncantCnt = new CECCounter();
             m_IncantCnt.SetPeriod(1000);
             m_IncantCnt.Reset(true);
-            InitBindCmdCoolCnt();
             m_bEnterGame = false;
         }
 
@@ -2386,10 +2394,7 @@ namespace BrewMonster
         public bool GetPushDir(ref Vector3 vPushDir, uint dwMask, float deltaTime)
         {
             vPushDir = Vector3.zero;
-            if (IsDead())
-                return false;
-
-            if (joystick == null || (joystick.Horizontal == 0 && joystick.Vertical == 0))
+            if (joystick.Horizontal == 0 && joystick.Vertical == 0)
             {
                 if (isPressMoveUp)
                 {
@@ -3093,7 +3098,7 @@ namespace BrewMonster
         }
 
         //	Is host player open trash box ?
-        bool IsUsingTrashBox()
+        public bool IsUsingTrashBox()
         {
             return m_bUsingTrashBox;
         }
@@ -3376,8 +3381,7 @@ namespace BrewMonster
 
             if (iPose == (int)RoleExpression.ROLEEXP_SITDOWN)
             {
-                BMLogger.LogError("HoangDev: c2s_CmdSessionEmote: "+iPose);
-                UnityGameSession.c2s_CmdSessionEmote(iPose);
+                // UnityGameSession.c2s_CmdSessionEmote(iPose);
             }
             else if (iPose == (int)RoleExpression.ROLEEXP_KISS)
             {
@@ -3658,10 +3662,9 @@ namespace BrewMonster
 
             m_PetOptCnt.IncCounter(iRealTime);
             // Bind command cool counter
-            if (m_BindCmdCoolCnt.IncCounter(iRealTime))
-                m_BindCmdCoolCnt.Reset(true);
+            /* if (m_BindCmdCoolCnt.IncCounter(dwDeltaTime))
+                 m_BindCmdCoolCnt.Reset(true);
 
-            /*
              // Auto fashion time counter
              if (m_bAutoFashion && GetBoothState() != 2 && !IsShapeChanged())
              {