From 1f4e7a63f3aeabe5ada9872101b04b32c510da80 Mon Sep 17 00:00:00 2001 From: "adnan.mujkic" Date: Sat, 5 Sep 2026 19:17:09 +0200 Subject: [PATCH] Droppable items fix --- .../Scripts/InventorySystem/BP_TreasureChest.uasset | 4 ++-- Content/Scripts/InventorySystem/ItemManagerBP.uasset | 4 ++-- .../InventorySystem/Seed/BP_ItemDroppable.uasset | 4 ++-- .../InventorySystem/Seed/BP_SeedCarousel.uasset | 4 ++-- .../InventorySystem/Seed/PM_DroppableItem.uasset | 4 ++-- .../1/VB/3IHR8O42TH07HLII6L8LIL.uasset | 4 ++-- .../C/F2/1ZA13MX9Z1WVH7H9ZVGOD4.uasset | 4 ++-- Source/ProjectEleri/Private/UI/MainGameWidget.cpp | 10 ++++++++++ 8 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Content/Scripts/InventorySystem/BP_TreasureChest.uasset b/Content/Scripts/InventorySystem/BP_TreasureChest.uasset index aa1067e4..a6481cc2 100644 --- a/Content/Scripts/InventorySystem/BP_TreasureChest.uasset +++ b/Content/Scripts/InventorySystem/BP_TreasureChest.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b552815091dc9b26d3602c153fb8b9109f9136ccab3a395c4fdc39e89a9d66a2 -size 218240 +oid sha256:c03ce3146a2f8455b3a1528e74cf177cc4db916b9d0c79a71514f1b0eda8b6cf +size 216772 diff --git a/Content/Scripts/InventorySystem/ItemManagerBP.uasset b/Content/Scripts/InventorySystem/ItemManagerBP.uasset index f99946db..3c2c247e 100644 --- a/Content/Scripts/InventorySystem/ItemManagerBP.uasset +++ b/Content/Scripts/InventorySystem/ItemManagerBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31988e5b3da55f01be8ebacbfc2bec3440b31790b62a4173e2fdbe4d638cd489 -size 605450 +oid sha256:c8555183e58c18c8f02e6f121ef75332e74943a68f4c05355c2583fd22ce4da6 +size 618066 diff --git a/Content/Scripts/InventorySystem/Seed/BP_ItemDroppable.uasset b/Content/Scripts/InventorySystem/Seed/BP_ItemDroppable.uasset index 8743ea48..22cc2f5e 100644 --- a/Content/Scripts/InventorySystem/Seed/BP_ItemDroppable.uasset +++ b/Content/Scripts/InventorySystem/Seed/BP_ItemDroppable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69c0072fe79ce2a7d271529bba4d90abb198c2a4da9ce788e50415195ea7ea9b -size 258791 +oid sha256:447cc57cfc83921f13ac475c204a3cb59157e95c8b56ccd527e1c426d1f04268 +size 283192 diff --git a/Content/Scripts/InventorySystem/Seed/BP_SeedCarousel.uasset b/Content/Scripts/InventorySystem/Seed/BP_SeedCarousel.uasset index 39885491..ec8efba3 100644 --- a/Content/Scripts/InventorySystem/Seed/BP_SeedCarousel.uasset +++ b/Content/Scripts/InventorySystem/Seed/BP_SeedCarousel.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adf2e2f9853a47c9d62d0f1be5e12e55c9c8dcd4ff158c37d831bd3efb36dc36 -size 1043396 +oid sha256:885e189627dee635013dd9f071e231e3bf8fed2049e829c3d31258630682fc92 +size 1043997 diff --git a/Content/Scripts/InventorySystem/Seed/PM_DroppableItem.uasset b/Content/Scripts/InventorySystem/Seed/PM_DroppableItem.uasset index b7d4e1f4..b8109090 100644 --- a/Content/Scripts/InventorySystem/Seed/PM_DroppableItem.uasset +++ b/Content/Scripts/InventorySystem/Seed/PM_DroppableItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13b557517e2baa23793afe0b3f8afe310407a4e5b63c2846f098ace08db325d4 -size 1482 +oid sha256:bba4399a7faf6b79f701549e904c8fcbb9480d9ee25e33bc860aafa702075e29 +size 1449 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/VB/3IHR8O42TH07HLII6L8LIL.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/VB/3IHR8O42TH07HLII6L8LIL.uasset index 63afe2b0..da61d005 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/VB/3IHR8O42TH07HLII6L8LIL.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/1/VB/3IHR8O42TH07HLII6L8LIL.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3135f6bf00637e7d880c0c433638c5e716472da482020340f2ac3a2cfb52b669 -size 10939 +oid sha256:7eea270e1e4413f157fa48baaefcfa86a7fcf22175f16591f491bb9049930648 +size 11150 diff --git a/Content/__ExternalActors__/Maps/Persistent_GameWorld/C/F2/1ZA13MX9Z1WVH7H9ZVGOD4.uasset b/Content/__ExternalActors__/Maps/Persistent_GameWorld/C/F2/1ZA13MX9Z1WVH7H9ZVGOD4.uasset index 9efce2b1..237d1fb5 100644 --- a/Content/__ExternalActors__/Maps/Persistent_GameWorld/C/F2/1ZA13MX9Z1WVH7H9ZVGOD4.uasset +++ b/Content/__ExternalActors__/Maps/Persistent_GameWorld/C/F2/1ZA13MX9Z1WVH7H9ZVGOD4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff720d7550f63b7d1bb0593a593ea04a722bc1e1e848773b1ebe94a48058a830 -size 10941 +oid sha256:bb3ee0eca648717f1e15fc62dede2cf40b63ff803f0ce881a700308b561f512b +size 11156 diff --git a/Source/ProjectEleri/Private/UI/MainGameWidget.cpp b/Source/ProjectEleri/Private/UI/MainGameWidget.cpp index 61bb8944..11ba1897 100644 --- a/Source/ProjectEleri/Private/UI/MainGameWidget.cpp +++ b/Source/ProjectEleri/Private/UI/MainGameWidget.cpp @@ -40,6 +40,11 @@ void UMainGameWidget::OpenWidget(UEleriBaseWidget* Widget) { Widget->DisplayInputPrompts(); } + + if (!WidgetStack.IsEmpty()) + { + WidgetStack[WidgetStack.Num() - 1]->SetFocus(); + } } void UMainGameWidget::CloseWidget(UEleriBaseWidget* Widget) @@ -63,6 +68,11 @@ void UMainGameWidget::CloseWidget(UEleriBaseWidget* Widget) { GetScreenActionInputDisplayWidget()->SetVisibility(ESlateVisibility::Hidden); } + + if (!WidgetStack.IsEmpty()) + { + WidgetStack[WidgetStack.Num() - 1]->SetFocus(); + } } bool UMainGameWidget::IsBookOpen() const