From 5376b6ad8c36871c7dcef155ed4c6ab0e46d8737 Mon Sep 17 00:00:00 2001
From: HungDK <>
Date: Tue, 19 May 2026 11:11:01 +0700
Subject: [PATCH 1/3] Add item auto slot operation and update ui

---
 .../Scripts/Inventory/EC_IvtrType.cs          |   6 +
 .../Scripts/Managers/EC_InventoryUI.cs        |  88 +-
 Assets/Prefabs/UI/InventoryUI.prefab          | 887 +++++++++++++-----
 Assets/Scripts/CECHostPlayer.Inventory.cs     |   5 +-
 4 files changed, 748 insertions(+), 238 deletions(-)

diff --git a/Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs b/Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
index 5e4f43354d..9064fcc8d0 100644
--- a/Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
+++ b/Assets/PerfectWorld/Scripts/Inventory/EC_IvtrType.cs
@@ -59,6 +59,12 @@ namespace BrewMonster.Scripts
         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
 
diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
index 8743a04f9c..817318d79f 100644
--- a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
@@ -26,6 +26,10 @@ namespace BrewMonster.Scripts.Managers
         [Header("Pack Buttons (assign in Inspector)")]
         [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>();
+        [Tooltip("Parent of pack slot buttons (auto: first slot's parent). Cloned when server expands bag.")]
+        [SerializeField] private RectTransform inventorySlotContainer;
+        [Tooltip("Template for new slots (auto: first pack button).")]
+        [SerializeField] private Button inventorySlotTemplate;
         [SerializeField] private List<Button> equipmentPackButtons = new List<Button>(); // byPackage: 1
         [SerializeField] private List<Button> fashionPackButtons = new List<Button>();   // byPackage: 3
 
@@ -124,6 +128,7 @@ namespace BrewMonster.Scripts.Managers
         }
 
         private InventoryBagTab _bagTab = InventoryBagTab.Item;
+        private bool _inventorySlotTemplateResolved;
 
         private void Awake()
         {
@@ -362,7 +367,7 @@ namespace BrewMonster.Scripts.Managers
             for (int slot = 0; slot < buttons.Count; slot++)
             {
                 var button = buttons[slot];
-                if (button == null)
+                if (button == null || !button.gameObject.activeInHierarchy)
                     continue;
 
                 // Get item at this slot
@@ -389,6 +394,9 @@ namespace BrewMonster.Scripts.Managers
         {
             lastRefreshTime = Time.time;
 
+            int requiredPackSlots = GetRequiredMainPackSlotCount();
+            EnsureInventoryPackSlotButtons(requiredPackSlots);
+
             var invItems = model.GetInventoryData(PKG_INVENTORY);
             var eqpItems = model.GetInventoryData(PKG_EQUIPMENT);
             var fshItems = model.GetInventoryData(PKG_FASHION);
@@ -407,6 +415,82 @@ namespace BrewMonster.Scripts.Managers
             UpdateCharacterInfo();
         }
 
+        /// <summary>
+        /// Match server pack size for the active bag tab (C++ CDlgInventory uses GetPack/GetTaskPack size).
+        /// </summary>
+        private int GetRequiredMainPackSlotCount()
+        {
+            var host = CECGameRun.Instance?.GetHostPlayer();
+            if (host == null)
+                return inventoryPackButtons != null ? inventoryPackButtons.Count : 0;
+
+            byte pack = _bagTab == InventoryBagTab.Item ? PKG_INVENTORY : PKG_TASK;
+            var inv = host.GetInventory(pack);
+            return inv != null ? Math.Max(0, inv.GetSize()) : 0;
+        }
+
+        /// <summary>
+        /// Grow/shrink visible slot buttons to match <see cref="EC_Inventory.GetSize"/> (PW: CHANGE_IVTR_SIZE, OWN_IVTR_DATA).
+        /// </summary>
+        private void EnsureInventoryPackSlotButtons(int requiredCount)
+        {
+            if (requiredCount < 0)
+                requiredCount = 0;
+            if (requiredCount > InventoryConst.IVTRSIZE_PACK_MAX)
+                requiredCount = InventoryConst.IVTRSIZE_PACK_MAX;
+
+            ResolveInventorySlotTemplate();
+            if (inventorySlotTemplate == null || inventorySlotContainer == null)
+                return;
+
+            if (inventoryPackButtons == null)
+                inventoryPackButtons = new List<Button>();
+
+            int prevCount = inventoryPackButtons.Count;
+            while (inventoryPackButtons.Count < requiredCount)
+            {
+                var clone = Instantiate(inventorySlotTemplate, inventorySlotContainer);
+                clone.gameObject.SetActive(true);
+                clone.name = $"item ({inventoryPackButtons.Count})";
+                inventoryPackButtons.Add(clone);
+            }
+
+            if (requiredCount > prevCount && inventorySlotContainer != null)
+                LayoutRebuilder.ForceRebuildLayoutImmediate(inventorySlotContainer);
+
+            for (int i = 0; i < inventoryPackButtons.Count; i++)
+            {
+                var btn = inventoryPackButtons[i];
+                if (btn == null)
+                    continue;
+                bool show = i < requiredCount;
+                if (btn.gameObject.activeSelf != show)
+                    btn.gameObject.SetActive(show);
+            }
+        }
+
+        private void ResolveInventorySlotTemplate()
+        {
+            if (_inventorySlotTemplateResolved)
+                return;
+            _inventorySlotTemplateResolved = true;
+
+            if (inventorySlotTemplate == null && inventoryPackButtons != null)
+            {
+                for (int i = 0; i < inventoryPackButtons.Count; i++)
+                {
+                    if (inventoryPackButtons[i] != null)
+                    {
+                        inventorySlotTemplate = inventoryPackButtons[i];
+                        break;
+                    }
+                }
+            }
+
+            if (inventorySlotContainer == null && inventorySlotTemplate != null)
+                inventorySlotContainer = inventorySlotTemplate.transform.parent as RectTransform;
+        }
+
         /// <summary>
         /// Update all configured money text components with the current amount.
         /// Call this when GET_OWN_MONEY arrives.
@@ -1063,7 +1147,7 @@ namespace BrewMonster.Scripts.Managers
                 for (int slot = 0; slot < buttons.Count; slot++)
                 {
                     var button = buttons[slot];
-                    if (button == null)
+                    if (button == null || !button.gameObject.activeInHierarchy)
                     {
                         continue;
                     }
diff --git a/Assets/Prefabs/UI/InventoryUI.prefab b/Assets/Prefabs/UI/InventoryUI.prefab
index d2316b9ab4..dbea27ee03 100644
--- a/Assets/Prefabs/UI/InventoryUI.prefab
+++ b/Assets/Prefabs/UI/InventoryUI.prefab
@@ -371,14 +371,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 214142206554505557}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6166189769573925619}
   - {fileID: 5339703510568614887}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -500,10 +500,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7166820878650541780}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 588.35, y: -59.5}
-  m_SizeDelta: {x: 85, y: 85}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9112205963990496432
 CanvasRenderer:
@@ -907,10 +907,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7166820878650541780}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 479.18, y: -59.5}
-  m_SizeDelta: {x: 85, y: 85}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3997873020355048166
 CanvasRenderer:
@@ -1069,6 +1069,117 @@ MonoBehaviour:
   m_FillOrigin: 2
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &632292373688010034
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4724949190849885032}
+  - component: {fileID: 8802950423917731446}
+  - component: {fileID: 5046791776062830461}
+  m_Layer: 5
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4724949190849885032
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 632292373688010034}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4261240138442023299}
+  - {fileID: 3535620642624158867}
+  - {fileID: 5987808725754049169}
+  - {fileID: 1071945724819243010}
+  - {fileID: 9121465159741787717}
+  - {fileID: 1850344366240053903}
+  - {fileID: 6126237740184472723}
+  - {fileID: 7256009024837324866}
+  - {fileID: 3644069095848567170}
+  - {fileID: 4295337006145564865}
+  - {fileID: 2036555672062762004}
+  - {fileID: 5474825732791683892}
+  - {fileID: 8876591482150920094}
+  - {fileID: 5111751739868510782}
+  - {fileID: 2916596508479738095}
+  - {fileID: 5943420594802073242}
+  - {fileID: 771257080584119921}
+  - {fileID: 6352062974348763564}
+  - {fileID: 9043633215699858317}
+  - {fileID: 4717533464678218536}
+  - {fileID: 6843979871749855353}
+  - {fileID: 1612707098974701947}
+  - {fileID: 4163937078270970988}
+  - {fileID: 5672432610071155908}
+  - {fileID: 7015285115994947425}
+  - {fileID: 7277056474529794138}
+  - {fileID: 8695834461287735959}
+  - {fileID: 8882026242571572779}
+  - {fileID: 5059733703017325890}
+  - {fileID: 3170178859474804864}
+  - {fileID: 3082739296682824787}
+  - {fileID: 4085925473269463281}
+  - {fileID: 5203805015986892788}
+  - {fileID: 2444080556930073606}
+  - {fileID: 3508136016948108671}
+  - {fileID: 3853389125342454706}
+  m_Father: {fileID: 4013133560245627834}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &8802950423917731446
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 632292373688010034}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 100, y: 100}
+  m_Spacing: {x: 7.92, y: 4.19}
+  m_Constraint: 0
+  m_ConstraintCount: 2
+--- !u!114 &5046791776062830461
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 632292373688010034}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &644319246446733122
 GameObject:
   m_ObjectHideFlags: 0
@@ -1238,10 +1349,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7166820878650541780}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 370.01, y: -59.5}
-  m_SizeDelta: {x: 85, y: 85}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4479228720555407959
 CanvasRenderer:
@@ -1471,14 +1582,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 753423593413820192}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5933316605388433341}
   - {fileID: 5467391814402976186}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1593,14 +1704,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 821606379566615610}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3938740544566530339}
   - {fileID: 5039960753606821906}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1715,14 +1826,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 824585185790796074}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6432777407956856106}
   - {fileID: 3590268137441148373}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2289,14 +2400,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1088063294378998627}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3871274326400560434}
   - {fileID: 2812352013333756720}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2411,14 +2522,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1113329446275992209}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4265596084459293121}
   - {fileID: 3391715825446580607}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2868,14 +2979,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1234667034607844995}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7262106369296644494}
   - {fileID: 8470997879573536573}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -3700,14 +3811,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1750295303962435569}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1813586679646144514}
   - {fileID: 8650939900266747694}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -4514,14 +4625,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2079353548137703858}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7056165217868759190}
   - {fileID: 7844824535278897089}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -4760,6 +4871,114 @@ MonoBehaviour:
   m_FillOrigin: 2
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2125277777743367076
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8418962008668126955}
+  - component: {fileID: 665630657845924070}
+  - component: {fileID: 4998165664557934614}
+  - component: {fileID: 3100846762331163924}
+  m_Layer: 5
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8418962008668126955
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2125277777743367076}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4013133560245627834}
+  - {fileID: 3832497646636707938}
+  m_Father: {fileID: 9128617693675511206}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 551, y: 583}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &665630657845924070
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2125277777743367076}
+  m_CullTransparentMesh: 1
+--- !u!114 &4998165664557934614
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2125277777743367076}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3100846762331163924
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2125277777743367076}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 4724949190849885032}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 4013133560245627834}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 1823492158808355029}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2183853732053055189
 GameObject:
   m_ObjectHideFlags: 0
@@ -4929,10 +5148,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7166820878650541780}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 42.5, y: -59.5}
-  m_SizeDelta: {x: 85, y: 85}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7052320096474271168
 CanvasRenderer:
@@ -5253,14 +5472,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2326637724701517296}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2548512059107311196}
   - {fileID: 2800202454556478121}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -6234,14 +6453,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2741252180928514397}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8166782721749508718}
   - {fileID: 123130515289208095}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -6391,14 +6610,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2764657568475750449}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6945144819446984270}
   - {fileID: 1058569697018433971}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -6487,6 +6706,96 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &2788543853954346500
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4013133560245627834}
+  - component: {fileID: 6273002698410083932}
+  - component: {fileID: 5970467966966223713}
+  - component: {fileID: 1081756144935039713}
+  m_Layer: 5
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4013133560245627834
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2788543853954346500}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4724949190849885032}
+  m_Father: {fileID: 8418962008668126955}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &6273002698410083932
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2788543853954346500}
+  m_CullTransparentMesh: 1
+--- !u!114 &5970467966966223713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2788543853954346500}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1081756144935039713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2788543853954346500}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
 --- !u!1 &2805221609055900627
 GameObject:
   m_ObjectHideFlags: 0
@@ -6964,14 +7273,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3090741152473556388}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9129482602178337401}
   - {fileID: 962655390537553343}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -7629,14 +7938,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3383490081939010073}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1069100147588969167}
   - {fileID: 111155908004242079}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -9674,14 +9983,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4681958919279138041}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8011152364358706676}
   - {fileID: 5960615287012474061}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -10277,14 +10586,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4932514100521066045}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4518489336975991994}
   - {fileID: 5061812426525718556}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -10399,14 +10708,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4985314278362084858}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4308468413033880414}
   - {fileID: 3097659414988699699}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -11106,6 +11415,10 @@ MonoBehaviour:
   previewCameraOffset: {x: 0.06, y: 1.07, z: 0}
   overrideFieldOfView: 1
   previewFieldOfView: 44
+  autoFrameByBounds: 1
+  autoFramePadding: 1.15
+  minAutoCameraDistance: 1.25
+  maxAutoCameraDistance: 8
 --- !u!1 &5473020210238587200
 GameObject:
   m_ObjectHideFlags: 0
@@ -11204,14 +11517,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5492842310561605224}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2142298326512753147}
   - {fileID: 2255400758318841397}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -12366,6 +12679,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   skillNameText: {fileID: 0}
   imageProgress: {fileID: 0}
+  btnCancel: {fileID: 0}
   inventoryPackButtons:
   - {fileID: 8631960679953241981}
   - {fileID: 7087549554151292240}
@@ -12403,6 +12717,8 @@ MonoBehaviour:
   - {fileID: 7149893595675355278}
   - {fileID: 4790456768164964333}
   - {fileID: 5314207367656224755}
+  inventorySlotContainer: {fileID: 4724949190849885032}
+  inventorySlotTemplate: {fileID: 0}
   equipmentPackButtons:
   - {fileID: 6900895260848180558}
   - {fileID: 3633686659372951813}
@@ -12953,14 +13269,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6102690194021457630}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8762445899395391748}
   - {fileID: 1333538615705781744}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -13075,14 +13391,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6170696405360611913}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3585278184871552682}
   - {fileID: 2266220782692410291}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -13493,6 +13809,132 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &6246008076377736070
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3832497646636707938}
+  - component: {fileID: 8826484264227581718}
+  - component: {fileID: 4258858148940708301}
+  - component: {fileID: 1823492158808355029}
+  m_Layer: 5
+  m_Name: Scrollbar Vertical
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3832497646636707938
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6246008076377736070}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2005596587102533903}
+  m_Father: {fileID: 8418962008668126955}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 20, y: 0}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &8826484264227581718
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6246008076377736070}
+  m_CullTransparentMesh: 1
+--- !u!114 &4258858148940708301
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6246008076377736070}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.40000004, g: 0.3647059, b: 0.3137255, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1823492158808355029
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6246008076377736070}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 0.41176474, g: 0.38823533, b: 0.34117648, a: 1}
+    m_HighlightedColor: {r: 0.42352945, g: 0.40000004, b: 0.35686275, a: 1}
+    m_PressedColor: {r: 0.4431373, g: 0.4431373, b: 0.42352945, a: 1}
+    m_SelectedColor: {r: 0.4431373, g: 0.454902, b: 0.43529415, a: 1}
+    m_DisabledColor: {r: 0.45098042, g: 0.4666667, b: 0.45098042, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8851224415254279021}
+  m_HandleRect: {fileID: 4295642074691996360}
+  m_Direction: 2
+  m_Value: 1
+  m_Size: 0.70297706
+  m_NumberOfSteps: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6248272586339167867
 GameObject:
   m_ObjectHideFlags: 0
@@ -13730,14 +14172,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6277085571977903451}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5296138581734880736}
   - {fileID: 1826831538831179271}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -14070,10 +14512,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7166820878650541780}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 151.67, y: -59.5}
-  m_SizeDelta: {x: 85, y: 85}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4452551064742165538
 CanvasRenderer:
@@ -14595,14 +15037,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6799385661542259087}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7451835479821262243}
   - {fileID: 1165074062561102066}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -14792,14 +15234,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6873613940388935223}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6474105010533337178}
   - {fileID: 2268867741094373899}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -14914,14 +15356,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6901784665839400237}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7333768603120767729}
   - {fileID: 9223261964111286427}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -15286,6 +15728,81 @@ MonoBehaviour:
   m_FillOrigin: 2
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7187503089270791938
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4295642074691996360}
+  - component: {fileID: 3604952032884539275}
+  - component: {fileID: 8851224415254279021}
+  m_Layer: 5
+  m_Name: Handle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4295642074691996360
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7187503089270791938}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2005596587102533903}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3604952032884539275
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7187503089270791938}
+  m_CullTransparentMesh: 1
+--- !u!114 &8851224415254279021
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7187503089270791938}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7279443163137723823
 GameObject:
   m_ObjectHideFlags: 0
@@ -15448,14 +15965,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7286840725325698178}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3060554228335281389}
   - {fileID: 7262323553458023166}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -15680,6 +16197,42 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &7424620313338658027
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2005596587102533903}
+  m_Layer: 5
+  m_Name: Sliding Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2005596587102533903
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7424620313338658027}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4295642074691996360}
+  m_Father: {fileID: 3832497646636707938}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -20, y: -20}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7477750196058420506
 GameObject:
   m_ObjectHideFlags: 0
@@ -16651,14 +17204,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7730936328049335931}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9062726242536733145}
   - {fileID: 6388101426121408786}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -16837,14 +17390,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7813825455001692784}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8310254122615014771}
   - {fileID: 5236499663944002225}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -17109,14 +17662,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7922958039934358531}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3992123013871906516}
   - {fileID: 2115284234304803867}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -17306,14 +17859,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8063036289747584484}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 453980049681991358}
   - {fileID: 159759099810687069}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -17623,14 +18176,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8094087016474699342}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7953300451450923144}
   - {fileID: 2666735059685287409}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -17749,7 +18302,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4359352035478671586}
-  - {fileID: 8745528644688140194}
+  - {fileID: 8418962008668126955}
   - {fileID: 2071040022082336143}
   - {fileID: 2067482245361998833}
   - {fileID: 5684109056429624943}
@@ -17813,14 +18366,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8183427786109081281}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7989175658712005399}
   - {fileID: 8178145617753155427}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -17935,14 +18488,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8275718873605923461}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 38455262077025313}
   - {fileID: 1486087634369840479}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -18057,14 +18610,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8388271149263772430}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 335542205684939338}
   - {fileID: 251085622858940212}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -18470,14 +19023,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8654772407644160490}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6386891551265892886}
   - {fileID: 7527804659608124323}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -18592,14 +19145,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8705454116501790813}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6089338634261002359}
   - {fileID: 1168930030057287760}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -18688,142 +19241,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &8781463557087241905
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8745528644688140194}
-  - component: {fileID: 7404083144027875491}
-  - component: {fileID: 2033173269197652659}
-  - component: {fileID: 1137540208566145952}
-  m_Layer: 5
-  m_Name: center
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8745528644688140194
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8781463557087241905}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4261240138442023299}
-  - {fileID: 3535620642624158867}
-  - {fileID: 5987808725754049169}
-  - {fileID: 1071945724819243010}
-  - {fileID: 9121465159741787717}
-  - {fileID: 1850344366240053903}
-  - {fileID: 6126237740184472723}
-  - {fileID: 7256009024837324866}
-  - {fileID: 3644069095848567170}
-  - {fileID: 4295337006145564865}
-  - {fileID: 2036555672062762004}
-  - {fileID: 5474825732791683892}
-  - {fileID: 8876591482150920094}
-  - {fileID: 5111751739868510782}
-  - {fileID: 2916596508479738095}
-  - {fileID: 5943420594802073242}
-  - {fileID: 771257080584119921}
-  - {fileID: 6352062974348763564}
-  - {fileID: 9043633215699858317}
-  - {fileID: 4717533464678218536}
-  - {fileID: 6843979871749855353}
-  - {fileID: 1612707098974701947}
-  - {fileID: 4163937078270970988}
-  - {fileID: 5672432610071155908}
-  - {fileID: 7015285115994947425}
-  - {fileID: 7277056474529794138}
-  - {fileID: 8695834461287735959}
-  - {fileID: 8882026242571572779}
-  - {fileID: 5059733703017325890}
-  - {fileID: 3170178859474804864}
-  - {fileID: 3082739296682824787}
-  - {fileID: 4085925473269463281}
-  - {fileID: 5203805015986892788}
-  - {fileID: 2444080556930073606}
-  - {fileID: 3508136016948108671}
-  - {fileID: 3853389125342454706}
-  m_Father: {fileID: 9128617693675511206}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 550.93, y: 582.8301}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7404083144027875491
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8781463557087241905}
-  m_CullTransparentMesh: 1
---- !u!114 &2033173269197652659
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8781463557087241905}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &1137540208566145952
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8781463557087241905}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 0
-  m_StartCorner: 0
-  m_StartAxis: 0
-  m_CellSize: {x: 80, y: 80}
-  m_Spacing: {x: 14, y: 20}
-  m_Constraint: 1
-  m_ConstraintCount: 6
 --- !u!1 &8787503064864052193
 GameObject:
   m_ObjectHideFlags: 0
@@ -19388,14 +19805,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9149250215976481164}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 755161316818960694}
   - {fileID: 4358642763770331015}
-  m_Father: {fileID: 8745528644688140194}
+  m_Father: {fileID: 4724949190849885032}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -19517,10 +19934,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7166820878650541780}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 260.84, y: -59.5}
-  m_SizeDelta: {x: 85, y: 85}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5155025384962724770
 CanvasRenderer:
@@ -20107,7 +20524,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -836.15
+      value: -42
       objectReference: {fileID: 0}
     - target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
       propertyPath: m_AnchorMax.y
@@ -20127,7 +20544,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -418.075
+      value: -21
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
diff --git a/Assets/Scripts/CECHostPlayer.Inventory.cs b/Assets/Scripts/CECHostPlayer.Inventory.cs
index 678fdb5fb3..56636045b2 100644
--- a/Assets/Scripts/CECHostPlayer.Inventory.cs
+++ b/Assets/Scripts/CECHostPlayer.Inventory.cs
@@ -137,12 +137,15 @@ namespace BrewMonster
                 }
                 case CommandID.CHANGE_IVTR_SIZE:
                 {
-                    // C++: resize pack (normal inventory)
+                    // C++ EC_HostMsg.cpp: m_pPack->Resize + FIXMSG_NEW_INVENTORY_SIZE
                     if (data != null && data.Length >= 4)
                     {
                         int newSize = BitConverter.ToInt32(data, 0);
                         if (m_pPack != null)
                             m_pPack.Resize(newSize);
+
+                        EC_Game.GetGameRun()?.AddFixedMessage((int)FixedMsg.FIXMSG_NEW_INVENTORY_SIZE, newSize);
+
                         var ui = GameObject.FindFirstObjectByType<EC_InventoryUI>();
                         ui?.RefreshAll();
                     }

From 69575c94892eb9fb2b7221de584fef9585c8e38a Mon Sep 17 00:00:00 2001
From: HungDK <>
Date: Tue, 19 May 2026 11:26:11 +0700
Subject: [PATCH 2/3] Add quick sort item feature

---
 .../Scripts/Managers/EC_InventoryUI.cs        |  58 +++++
 .../CSNetwork/C2SCommand/C2SCommandFactory.cs |  19 ++
 .../Scripts/Network/CSNetwork/GameSession.cs  |  10 +
 .../Scripts/Network/UnityGameSession.cs       |   6 +
 Assets/Prefabs/UI/InventoryUI.prefab          |  62 +++++-
 Assets/Scripts/CECHostPlayer.SortPack.cs      | 208 ++++++++++++++++++
 Assets/Scripts/CECHostPlayer.SortPack.cs.meta |   2 +
 7 files changed, 357 insertions(+), 8 deletions(-)
 create mode 100644 Assets/Scripts/CECHostPlayer.SortPack.cs
 create mode 100644 Assets/Scripts/CECHostPlayer.SortPack.cs.meta

diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
index 817318d79f..83b2d9e1c9 100644
--- a/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs
@@ -58,6 +58,9 @@ namespace BrewMonster.Scripts.Managers
         [Header("Stack combine — merge into another stack (C++ inventory drag-merge, assign in Inspector)")]
         [SerializeField] private Button combineStackButton;
 
+        [Header("Sort / arrange pack (C++ DlgInventory arrange)")]
+        [SerializeField] private Button sortInventoryButton;
+
         private int _splitAmount = 1;
         private int _splitMaxAmount = 1;
 
@@ -137,6 +140,7 @@ namespace BrewMonster.Scripts.Managers
             WireBagTabButtons();
             WireSplitUI();
             WireCombineUI();
+            WireSortInventoryUI();
 
             //if (currentDragImage == null)
             //{
@@ -228,6 +232,60 @@ namespace BrewMonster.Scripts.Managers
             }
         }
 
+        private void WireSortInventoryUI()
+        {
+            ResolveSortInventoryButton();
+            if (sortInventoryButton != null)
+            {
+                sortInventoryButton.onClick.RemoveAllListeners();
+                sortInventoryButton.onClick.AddListener(OnSortInventoryClicked);
+            }
+        }
+
+        private void ResolveSortInventoryButton()
+        {
+            if (sortInventoryButton != null)
+                return;
+
+            var buttons = GetComponentsInChildren<Button>(true);
+            for (int i = 0; i < buttons.Length; i++)
+            {
+                var btn = buttons[i];
+                if (btn == null)
+                    continue;
+                string n = btn.name.ToLowerInvariant();
+                if (n.Contains("arrange") || n.Contains("sort") || n == "btn_arrange")
+                {
+                    sortInventoryButton = btn;
+                    break;
+                }
+            }
+        }
+
+        /// <summary>Arrange main inventory (IVTRTYPE_PACK). C++ CDlgInventory::OnCommand_arrange.</summary>
+        public void OnSortInventoryClicked()
+        {
+            if (_bagTab != InventoryBagTab.Item)
+            {
+                Debug.LogWarning("[InventoryUI] Sort pack: switch to Item tab first");
+                return;
+            }
+
+            var host = CECGameRun.Instance?.GetHostPlayer();
+            if (host == null)
+                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(InventoryConst.IVTRTYPE_PACK);
+            RefreshAll();
+        }
+
         private void ShowSplitPanel(bool show)
         {
             if (splitPanelRoot != null)
diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
index 0d3f910666..859bcb5515 100644
--- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
+++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
@@ -439,6 +439,25 @@ namespace CSNetwork.C2SCommand
             return SerializeCommand(CommandID.MOVE_IVTR_ITEM, cmd);
         }
 
+        /// <summary>C++ c2s_SendCmdMultiExchangeItem — pack arrange / sort (variable-length operation list).</summary>
+        public static Octets CreateMultiExchangeItem(byte location, int pairCount, int[] indexPairs)
+        {
+            if (pairCount < 1 || indexPairs == null || indexPairs.Length < pairCount * 2)
+                return null;
+
+            var octets = new Octets();
+            WriteBasicValue(octets, (ushort)CommandID.MULTI_EXCHANGE_ITEM);
+            WriteBasicValue(octets, location);
+            WriteBasicValue(octets, (byte)pairCount);
+            for (int i = 0; i < pairCount; i++)
+            {
+                WriteBasicValue(octets, (byte)indexPairs[i * 2]);
+                WriteBasicValue(octets, (byte)indexPairs[i * 2 + 1]);
+            }
+
+            return octets;
+        }
+
         public static Octets CreatePickupItem(int idItem, int tid)
         {
             var cmd = new CMD_Pickup
diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
index 8de0c8bf4f..907e6ed19d 100644
--- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
+++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
@@ -471,6 +471,16 @@ namespace CSNetwork
             SendProtocol(gamedatasendRequest);
         }
 
+        public void RequestMultiExchangeItem(byte location, int pairCount, int[] indexPairs)
+        {
+            var data = C2SCommandFactory.CreateMultiExchangeItem(location, pairCount, indexPairs);
+            if (data == null)
+                return;
+            var gamedatasendRequest = new gamedatasend();
+            gamedatasendRequest.Data = data;
+            SendProtocol(gamedatasendRequest);
+        }
+
         public void RequestPickupItem(int idItem, int tid)
         {
             gamedatasend gamedatasendRequest = new gamedatasend();
diff --git a/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs b/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
index 7703cb0417..2551c38c7b 100644
--- a/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
+++ b/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
@@ -497,6 +497,12 @@ namespace BrewMonster.Network
         {
             Instance._gameSession.RequestMoveIvtrItem(src, dest, count);
         }
+
+        public static void RequestMultiExchangeItem(byte location, int pairCount, int[] indexPairs)
+        {
+            Instance._gameSession.RequestMultiExchangeItem(location, pairCount, indexPairs);
+        }
+
         public static void LoadConfigData()
         {
             Instance._gameSession.LoadConfigData();
diff --git a/Assets/Prefabs/UI/InventoryUI.prefab b/Assets/Prefabs/UI/InventoryUI.prefab
index dbea27ee03..ab58aeb70a 100644
--- a/Assets/Prefabs/UI/InventoryUI.prefab
+++ b/Assets/Prefabs/UI/InventoryUI.prefab
@@ -6807,13 +6807,14 @@ GameObject:
   - component: {fileID: 7902430374187284626}
   - component: {fileID: 2646092870800509053}
   - component: {fileID: 8343020880054062986}
+  - component: {fileID: 4947710734819332199}
   m_Layer: 5
   m_Name: sap_xep
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7902430374187284626
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6828,9 +6829,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5322092470266254149}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 37.5748, y: -45.8533}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 75.1496, y: 91.7066}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2646092870800509053
@@ -6848,7 +6849,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2805221609055900627}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -6871,6 +6872,50 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4947710734819332199
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2805221609055900627}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8343020880054062986}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2956478068852740616
 GameObject:
   m_ObjectHideFlags: 0
@@ -12766,6 +12811,7 @@ MonoBehaviour:
   splitDecreaseButton: {fileID: 4996709440620641399}
   splitMaxButton: {fileID: 1013848439096781118}
   combineStackButton: {fileID: 4438583262695563174}
+  sortInventoryButton: {fileID: 4947710734819332199}
   autoRefresh: 1
   refreshInterval: 1
   showEquipmentDetails: 1
@@ -13665,7 +13711,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 37.12
+  m_Spacing: -204.8
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -20524,7 +20570,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7209086543831860202, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -42
+      value: -836.15
       objectReference: {fileID: 0}
     - target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
       propertyPath: m_AnchorMax.y
@@ -20544,7 +20590,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8894405194986632892, guid: c56ed80641ff74ce49f91401e3eb8367, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21
+      value: -418.075
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
diff --git a/Assets/Scripts/CECHostPlayer.SortPack.cs b/Assets/Scripts/CECHostPlayer.SortPack.cs
new file mode 100644
index 0000000000..ae3371fcb3
--- /dev/null
+++ b/Assets/Scripts/CECHostPlayer.SortPack.cs
@@ -0,0 +1,208 @@
+using BrewMonster.Network;
+using BrewMonster.Scripts;
+using CSNetwork.GPDataType;
+using System.Collections.Generic;
+using static BrewMonster.Scripts.EC_Inventory;
+
+namespace BrewMonster
+{
+    public partial class CECHostPlayer
+    {
+        /// <summary>
+        /// C++ CECHostPlayer::SortPack — reorder pack via MULTI_EXCHANGE_ITEM (DlgInventory OnCommand_arrange).
+        /// </summary>
+        public void SortPack(int iPack)
+        {
+            EC_Inventory pInventory = GetPack(iPack);
+            if (pInventory == null)
+                return;
+
+            int nIvtrSize = pInventory.GetSize();
+            if (nIvtrSize <= 0)
+                return;
+
+            if (pInventory.GetEmptySlotNum() == nIvtrSize)
+                return;
+
+            for (int i = 0; i < nIvtrSize; i++)
+            {
+                var pItem = pInventory.GetItem(i, false);
+                if (pItem != null && pItem.IsFrozen())
+                    return;
+            }
+
+            for (int i = 0; i < nIvtrSize; i++)
+            {
+                var pItem = pInventory.GetItem(i, false);
+                pItem?.Freeze(true);
+            }
+
+            try
+            {
+                var vecItem = new List<int>(nIvtrSize);
+                for (int i = 0; i < nIvtrSize; i++)
+                    vecItem.Add(i);
+
+                vecItem.Sort((a, b) => ComparePackSortIndices(pInventory, a, b));
+
+                var vecExchange = new List<int>();
+                int pos = 0;
+                while (pos < nIvtrSize)
+                {
+                    int j = vecItem[pos];
+                    if (j == pos)
+                    {
+                        pos++;
+                        continue;
+                    }
+
+                    int k = vecItem[j];
+                    if (pInventory.GetItem(j, false) != null || pInventory.GetItem(k, false) != null)
+                    {
+                        vecExchange.Add(pos);
+                        vecExchange.Add(j);
+                    }
+
+                    int tmp = vecItem[pos];
+                    vecItem[pos] = vecItem[j];
+                    vecItem[j] = tmp;
+                }
+
+                if (vecExchange.Count > 0)
+                {
+                    int pairCount = vecExchange.Count / 2;
+                    for (int i = 0, j = vecExchange.Count - 1; i < j; i++, j--)
+                    {
+                        int t = vecExchange[i];
+                        vecExchange[i] = vecExchange[j];
+                        vecExchange[j] = t;
+                    }
+
+                    UnityGameSession.RequestMultiExchangeItem((byte)iPack, pairCount, vecExchange.ToArray());
+                }
+                else
+                {
+                    var pGameRun = EC_Game.GetGameRun();
+                    pGameRun?.AddChatMessage("Không cần sắp xếp kho đồ.", (int)ChatChannel.GP_CHAT_SYSTEM);
+                }
+            }
+            finally
+            {
+                for (int i = 0; i < nIvtrSize; i++)
+                {
+                    var pItem = pInventory.GetItem(i, false);
+                    pItem?.Freeze(false);
+                }
+            }
+        }
+
+        private static int ComparePackSortIndices(EC_Inventory pInventory, int index1, int index2)
+        {
+            if (DefaultPackSortLess(pInventory, index1, index2))
+                return -1;
+            if (DefaultPackSortLess(pInventory, index2, index1))
+                return 1;
+            return 0;
+        }
+
+        /// <summary>Returns true when slot <paramref name="index1"/> should appear before <paramref name="index2"/>.</summary>
+        private static bool DefaultPackSortLess(EC_Inventory pInventory, int index1, int index2)
+        {
+            if (pInventory == null)
+                return false;
+
+            EC_IvtrItem pItem1 = pInventory.GetItem(index1, false);
+            EC_IvtrItem pItem2 = pInventory.GetItem(index2, false);
+
+            if (pItem1 == null)
+                return false;
+            if (pItem2 == null)
+                return true;
+
+            int cid1 = pItem1.GetClassID();
+            int tid1 = pItem1.GetTemplateID();
+            int cid2 = pItem2.GetClassID();
+            int tid2 = pItem2.GetTemplateID();
+
+            if (cid1 != cid2)
+            {
+                int cidOrder1 = GetPackSortClassOrder(cid1);
+                int cidOrder2 = GetPackSortClassOrder(cid2);
+                if (cidOrder1 != cidOrder2)
+                    return cidOrder1 > cidOrder2;
+                return cid1 < cid2;
+            }
+
+            if (cid1 == (int)EC_IvtrItem.InventoryClassId.ICID_WEAPON)
+            {
+                if (pItem1 is CECIvtrWeapon w1 && pItem2 is CECIvtrWeapon w2)
+                {
+                    var e1 = w1.GetDBEssence();
+                    var e2 = w2.GetDBEssence();
+                    if (e1.level != e2.level)
+                        return e1.level > e2.level;
+                }
+            }
+            else if (cid1 == (int)EC_IvtrItem.InventoryClassId.ICID_ARMOR)
+            {
+                if (pItem1 is EC_IvtrArmor a1 && pItem2 is EC_IvtrArmor a2)
+                {
+                    var e1 = a1.GetDBEssence();
+                    var e2 = a2.GetDBEssence();
+                    if (e1.level != e2.level)
+                        return e1.level > e2.level;
+                }
+            }
+            else if (cid1 == (int)EC_IvtrItem.InventoryClassId.ICID_GENERALCARD)
+            {
+                if (pItem1 is EC_IvtrGeneralCard c1 && pItem2 is EC_IvtrGeneralCard c2)
+                {
+                    int t1 = c1.GetEssence().type;
+                    int t2 = c2.GetEssence().type;
+                    if (t1 != t2)
+                        return t1 < t2;
+                }
+            }
+
+            return tid1 < tid2;
+        }
+
+        private static int GetPackSortClassOrder(int cid)
+        {
+            int[] s_CIDs =
+            {
+                (int)EC_IvtrItem.InventoryClassId.ICID_WEAPON,
+                (int)EC_IvtrItem.InventoryClassId.ICID_ARROW,
+                (int)EC_IvtrItem.InventoryClassId.ICID_TOSSMAT,
+                (int)EC_IvtrItem.InventoryClassId.ICID_ARMOR,
+                (int)EC_IvtrItem.InventoryClassId.ICID_DECORATION,
+                (int)EC_IvtrItem.InventoryClassId.ICID_BIBLE,
+                (int)EC_IvtrItem.InventoryClassId.ICID_FLYSWORD,
+                (int)EC_IvtrItem.InventoryClassId.ICID_WING,
+                (int)EC_IvtrItem.InventoryClassId.ICID_GOBLIN,
+                (int)EC_IvtrItem.InventoryClassId.ICID_GOBLIN_EQUIP,
+                (int)EC_IvtrItem.InventoryClassId.ICID_FASHION,
+                (int)EC_IvtrItem.InventoryClassId.ICID_AUTOHP,
+                (int)EC_IvtrItem.InventoryClassId.ICID_AUTOMP,
+                (int)EC_IvtrItem.InventoryClassId.ICID_MEDICINE,
+                (int)EC_IvtrItem.InventoryClassId.ICID_SKILLMATTER,
+                (int)EC_IvtrItem.InventoryClassId.ICID_TARGETITEM,
+                (int)EC_IvtrItem.InventoryClassId.ICID_STONE,
+                (int)EC_IvtrItem.InventoryClassId.ICID_PETEGG,
+                (int)EC_IvtrItem.InventoryClassId.ICID_REFINETICKET,
+                (int)EC_IvtrItem.InventoryClassId.ICID_DYETICKET,
+                (int)EC_IvtrItem.InventoryClassId.ICID_GOBLIN_EXPPILL,
+                (int)EC_IvtrItem.InventoryClassId.ICID_GENERALCARD,
+                (int)EC_IvtrItem.InventoryClassId.ICID_GENERALCARD_DICE,
+            };
+
+            for (int i = 0; i < s_CIDs.Length; i++)
+            {
+                if (cid == s_CIDs[i])
+                    return s_CIDs.Length - i;
+            }
+
+            return 0;
+        }
+    }
+}
diff --git a/Assets/Scripts/CECHostPlayer.SortPack.cs.meta b/Assets/Scripts/CECHostPlayer.SortPack.cs.meta
new file mode 100644
index 0000000000..ef96f78e3a
--- /dev/null
+++ b/Assets/Scripts/CECHostPlayer.SortPack.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 22d7c6cd009100d44956b805ed093795
\ No newline at end of file

From 8a7829e0380730ab875d69eac3dfcf67a75273ef Mon Sep 17 00:00:00 2001
From: HungDK <>
Date: Tue, 19 May 2026 13:47:54 +0700
Subject: [PATCH 3/3] Fix merge conflict

---
 Assets/Prefabs/UI/InventoryUI.prefab | 126 +++++++++++++++++++--------
 1 file changed, 91 insertions(+), 35 deletions(-)

diff --git a/Assets/Prefabs/UI/InventoryUI.prefab b/Assets/Prefabs/UI/InventoryUI.prefab
index ab58aeb70a..4e18605df5 100644
--- a/Assets/Prefabs/UI/InventoryUI.prefab
+++ b/Assets/Prefabs/UI/InventoryUI.prefab
@@ -11368,8 +11368,8 @@ GameObject:
   m_Component:
   - component: {fileID: 6778274724352405780}
   - component: {fileID: 5765354275366674162}
-  - component: {fileID: 6707240765686952970}
-  - component: {fileID: 2036361547023377128}
+  - component: {fileID: 7531521852624317281}
+  - component: {fileID: 7402631882746451531}
   m_Layer: 5
   m_Name: character_preview
   m_TagString: Untagged
@@ -11388,7 +11388,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 3052795108239739127}
   m_Father: {fileID: 3289674559629147232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -11404,7 +11405,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5468137454250289500}
   m_CullTransparentMesh: 1
---- !u!114 &6707240765686952970
+--- !u!114 &7531521852624317281
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -11413,7 +11414,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5468137454250289500}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -11424,14 +11425,17 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Texture: {fileID: 8400000, guid: 42c3c43cd0c3b704cb6cf0dd1051d9ff, type: 2}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
---- !u!114 &2036361547023377128
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7402631882746451531
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -11440,30 +11444,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 5468137454250289500}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 693e85b6242cc8f4ea4c161aa42dfb1f, type: 3}
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  hostPlayer: {fileID: 0}
-  autoBindHostPlayer: 1
-  sourceModelRoot: {fileID: 0}
-  cloneWholeHostHierarchy: 1
-  stripRuntimeComponents: 1
-  previewRoot: {fileID: 6778274724352405780}
-  previewLocalPosition: {x: 0, y: 0, z: 100}
-  previewLocalEuler: {x: 0, y: 0, z: 0}
-  previewLocalScale: {x: 1, y: 1, z: 1}
-  previewFrame: {fileID: 6707240765686952970}
-  previewRenderTexture: {fileID: 8400000, guid: 42c3c43cd0c3b704cb6cf0dd1051d9ff, type: 2}
-  autoFocusCamera: 1
-  cameraFocusOffset: {x: 0, y: 0, z: 0}
-  previewCameraDistance: 3.3
-  previewCameraOffset: {x: 0.06, y: 1.07, z: 0}
-  overrideFieldOfView: 1
-  previewFieldOfView: 44
-  autoFrameByBounds: 1
-  autoFramePadding: 1.15
-  minAutoCameraDistance: 1.25
-  maxAutoCameraDistance: 8
+  m_ShowMaskGraphic: 0
 --- !u!1 &5473020210238587200
 GameObject:
   m_ObjectHideFlags: 0
@@ -17607,6 +17591,78 @@ MonoBehaviour:
   m_FillOrigin: 2
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7898642711851878611
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3052795108239739127}
+  - component: {fileID: 9178171791072353269}
+  - component: {fileID: 7628333317866785984}
+  m_Layer: 5
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3052795108239739127
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7898642711851878611}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.65, y: 0.65, z: 0.65}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 6778274724352405780}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1024, y: 1024}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9178171791072353269
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7898642711851878611}
+  m_CullTransparentMesh: 1
+--- !u!114 &7628333317866785984
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7898642711851878611}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Texture: {fileID: 8400000, guid: 7b35d3c1ebbb32d47a5ed61606928730, type: 2}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
 --- !u!1 &7922220820718314155
 GameObject:
   m_ObjectHideFlags: 0