diff --git a/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryWindow.cs b/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryWindow.cs index 61c533012..2bac2ed2c 100644 --- a/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryWindow.cs +++ b/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryWindow.cs @@ -189,6 +189,8 @@ private void OnExpandButtonPressed(MouseDownEvent evt) { UpdateItemList(_playerItems); } + + evt.PreventDefault(); } private void CreateMinimizedWindow() { @@ -196,7 +198,7 @@ private void CreateMinimizedWindow() { // Header button Button minimizeWindowButton = (Button) GetElementByClass("minimize-btn"); minimizeWindowButton.AddManipulator(new ButtonClickSoundManipulator(minimizeWindowButton)); - minimizeWindowButton.RegisterCallback(OnMinimizeInventoryClick, TrickleDown.TrickleDown); + minimizeWindowButton.RegisterCallback(OnMinimizeInventoryClick, TrickleDown.TrickleDown); // Minized inventory button _minimizedInventoryBtn = _minimizedTemplate.Instantiate()[0]; @@ -214,10 +216,10 @@ private void CreateMinimizedWindow() { _root.Add(_minimizedInventoryBtn); } - private void OnMinimizeInventoryClick(MouseDownEvent evt) { + private void OnMinimizeInventoryClick(MouseUpEvent evt) { if(!_minimizedInventoryBtn.ClassListContains("minimized")) { _minimizedInventoryBtn.AddToClassList("minimized"); - _minimizedInventoryMouseOverManipulator.Disable(); + _minimizedInventoryMouseOverManipulator.Enable(); HideWindow(); _minimized = true; } @@ -328,7 +330,6 @@ public void UpdateItemList(List items) { public override void ShowWindow() { base.ShowWindow(); - Debug.Log("Show window"); AudioManager.Instance.PlayUISound("inventory_open_01"); } diff --git a/l2-unity/Assets/Scripts/UI/Game/SkillLearn/SkillLearnWindow.cs b/l2-unity/Assets/Scripts/UI/Game/SkillLearn/SkillLearnWindow.cs index 2a5247d2d..ec01121a0 100644 --- a/l2-unity/Assets/Scripts/UI/Game/SkillLearn/SkillLearnWindow.cs +++ b/l2-unity/Assets/Scripts/UI/Game/SkillLearn/SkillLearnWindow.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UIElements; -using static UnityEditor.ShaderGraph.Internal.KeywordDependentCollection; public class SkillLearn : L2Window { diff --git a/l2-unity/Assets/StreamingAssets/InterfaceSound.bank b/l2-unity/Assets/StreamingAssets/InterfaceSound.bank index 8ab6310ff..29e855888 100644 Binary files a/l2-unity/Assets/StreamingAssets/InterfaceSound.bank and b/l2-unity/Assets/StreamingAssets/InterfaceSound.bank differ diff --git a/l2-unity/Assets/StreamingAssets/Master.strings.bank b/l2-unity/Assets/StreamingAssets/Master.strings.bank index 8a3966261..c724bf1a9 100644 Binary files a/l2-unity/Assets/StreamingAssets/Master.strings.bank and b/l2-unity/Assets/StreamingAssets/Master.strings.bank differ