salmon-engine-projects/space-game001
14
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix inventory

Browse Source
This commit is contained in:
Vlad 2026-04-15 14:50:46 +06:00
parent f7e6f063d1
commit 44dd09fcb5
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/config2/npcs.json
View File

@ -15,6 +15,7 @@
"modelCorrectionRotX": 0.0, "modelCorrectionRotX": 0.0,
"modelCorrectionRotY": 180.0, "modelCorrectionRotY": 180.0,
"modelCorrectionRotZ": 0.0, "modelCorrectionRotZ": 0.0,
"interactionRadius": 2.0,
"gift": { "gift": {
"id": "guard_token", "id": "guard_token",
"name": "Guard's Token", "name": "Guard's Token",

25
resources/config2/ui_inventory.json
View File

@ -26,18 +26,25 @@
{ {
"type": "FrameLayout", "type": "FrameLayout",
"name": "inventory_items_panel", "name": "inventory_items_panel",
"x": 100.0, "x": 50.0,
"y": 150.0, "y": 150.0,
"width": 500.0, "width": 250.0,
"height": 600.0, "height": 300.0,
"children": [ "children": [
{
"type": "StaticImage",
"name": "panel_background",
"width": 200,
"height": 400,
"texture": "resources/sand2.png"
},
{ {
"type": "TextView", "type": "TextView",
"name": "inventory_items_text", "name": "inventory_items_text",
"x": 100.0, "x": -100.0,
"y": 30.0, "y": -100.0,
"width": 460.0, "width": 250.0,
"height": 450.0, "height": 300.0,
"text": "Inventory (Empty)", "text": "Inventory (Empty)",
"fontSize": 18, "fontSize": 18,
"fontPath": "resources/fonts/DroidSans.ttf", "fontPath": "resources/fonts/DroidSans.ttf",
@ -47,8 +54,8 @@
{ {
"type": "TextButton", "type": "TextButton",
"name": "close_inventory_button", "name": "close_inventory_button",
"x": 200.0, "x": 165.0,
"y": 20.0, "y": 0.0,
"width": 40.0, "width": 40.0,
"height": 40.0, "height": 40.0,
"text": "X", "text": "X",

5
src/Game.cpp
View File

@ -613,6 +613,11 @@ namespace ZL
std::cout << "\n========== MOUSE DOWN EVENT ==========" << std::endl; std::cout << "\n========== MOUSE DOWN EVENT ==========" << std::endl;
handleDown(ZL::UiManager::MOUSE_FINGER_ID, mx, my); handleDown(ZL::UiManager::MOUSE_FINGER_ID, mx, my);
if (menuManager.uiManager.isUiInteractionForFinger(ZL::UiManager::MOUSE_FINGER_ID)) {
std::cout << "[CLICK] UI handled, skipping character movement" << std::endl;
continue;
}
// Calculate ray for picking // Calculate ray for picking
if (dialogueSystem.blocksGameplayInput()) { if (dialogueSystem.blocksGameplayInput()) {
dialogueSystem.handlePointerReleased(static_cast<float>(mx), Environment::projectionHeight - static_cast<float>(my)); dialogueSystem.handlePointerReleased(static_cast<float>(mx), Environment::projectionHeight - static_cast<float>(my));