Merge pull request #25 from shnok/inventory

build fix, inventory button click detection
shnok · Aug 2, 2024 · 7792ed1 · 7792ed1
2 parents 4158638 + 3456c54
commit 7792ed1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryWindow.cs b/l2-unity/Assets/Scripts/UI/Game/Inventory/InventoryWindow.cs
@@ -189,14 +189,16 @@ private void OnExpandButtonPressed(MouseDownEvent evt) {
 
             UpdateItemList(_playerItems);
         }
+
+        evt.PreventDefault();
     }
 
     private void CreateMinimizedWindow() {
 
         // Header button
         Button minimizeWindowButton = (Button) GetElementByClass("minimize-btn");
         minimizeWindowButton.AddManipulator(new ButtonClickSoundManipulator(minimizeWindowButton));
-        minimizeWindowButton.RegisterCallback<MouseDownEvent>(OnMinimizeInventoryClick, TrickleDown.TrickleDown);
+        minimizeWindowButton.RegisterCallback<MouseUpEvent>(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<ItemInstance> 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
@@ -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
diff --git a/l2-unity/Assets/StreamingAssets/Master.strings.bank b/l2-unity/Assets/StreamingAssets/Master.strings.bank