From a9cb20c8bca1f40db2cbc80a3c02b595898e7699 Mon Sep 17 00:00:00 2001 From: cblech Date: Mon, 7 Jul 2025 04:51:35 +0200 Subject: [PATCH] Fixed journal references --- prefabs/UI/Inventory/Inventory.tscn | 49 ++++++++++++++++++++++++----- project.godot | 2 +- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/prefabs/UI/Inventory/Inventory.tscn b/prefabs/UI/Inventory/Inventory.tscn index b2fc451..339c98e 100644 --- a/prefabs/UI/Inventory/Inventory.tscn +++ b/prefabs/UI/Inventory/Inventory.tscn @@ -1,12 +1,13 @@ -[gd_scene load_steps=9 format=3 uid="uid://cgjc4wurbgimy"] +[gd_scene load_steps=10 format=3 uid="uid://cgjc4wurbgimy"] [ext_resource type="Script" uid="uid://hg7jay2kt441" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"] [ext_resource type="Texture2D" uid="uid://3ln8aleyxgp1" path="res://art/ui/UI/UI_bag_export_01.png" id="3_vvo7l"] [ext_resource type="Texture2D" uid="uid://u0dku75l17re" path="res://art/ui/UI/UI_bag_export_highlight_01.png" id="5_df8i8"] [ext_resource type="PackedScene" uid="uid://c0kmdjeqkqrwv" path="res://prefabs/UI/Inventory/Slot.tscn" id="5_u7kje"] -[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="6_n5apg"] +[ext_resource type="Script" uid="uid://7wwid23tc8as" path="res://scripts/CSharp/Common/Quest/QuestMessagePopup.cs" id="6_n5apg"] [ext_resource type="Texture2D" uid="uid://bag1xalfh731d" path="res://art/ui/UI/UI_bag_export_highlight_02.png" id="6_u7kje"] [ext_resource type="Texture2D" uid="uid://cxptule8n38ph" path="res://art/ui/UI/UI_bag_export_highlight_03.png" id="7_l3npx"] +[ext_resource type="PackedScene" uid="uid://2q1n6g2kj5er" path="res://prefabs/UI/Quest/QuestLog.tscn" id="7_vvo7l"] [ext_resource type="Texture2D" uid="uid://qwia360i1ir1" path="res://art/ui/UI/inventory_active.png" id="8_df8i8"] [node name="CanvasLayer" type="CanvasLayer"] @@ -15,7 +16,7 @@ layer = 90 [node name="DialogicToggle" type="Node2D" parent="."] scale = Vector2(0.7, 0.7) -[node name="Inventory" type="Control" parent="." node_paths=PackedStringArray("_slotsParent", "_slotsMover", "_headerSlots", "_slotSelect")] +[node name="Inventory" type="Control" parent="." node_paths=PackedStringArray("_headerSlots")] layout_mode = 3 anchors_preset = 8 anchor_left = 0.5 @@ -27,10 +28,7 @@ grow_vertical = 2 scale = Vector2(0.7, 0.7) size_flags_vertical = 8 script = ExtResource("1_6wusm") -_slotsParent = NodePath("SlotsContainer/SlotsMover/Slots") -_slotsMover = NodePath("SlotsContainer/SlotsMover") -_headerSlots = [NodePath("SlotsContainer/SlotsMover/Slots/Slot"), NodePath("SlotsContainer/SlotsMover/Slots/Slot2"), NodePath("SlotsContainer/SlotsMover/Slots/Slot3"), NodePath("SlotsContainer/SlotsMover/Slots/Slot4"), NodePath("SlotsContainer/SlotsMover/Slots/Slot5"), NodePath("SlotsContainer/SlotsMover/Slots/Slot6"), NodePath("SlotsContainer/SlotsMover/Slots/Slot7"), NodePath("SlotsContainer/SlotsMover/Slots/Slot8"), NodePath("SlotsContainer/SlotsMover/Slots/Slot9")] -_slotSelect = NodePath("SlotsContainer/SlotsMover/SlotSelectContainer/Selector") +_headerSlots = [] [node name="SlotsContainer" type="Control" parent="Inventory"] layout_mode = 1 @@ -447,3 +445,40 @@ offset_right = 100.0 offset_bottom = 100.0 texture = ExtResource("8_df8i8") expand_mode = 1 + +[node name="QuestLogRoot" parent="." instance=ExtResource("7_vvo7l")] + +[node name="Control" type="Control" parent="."] +layout_mode = 3 +anchors_preset = 2 +anchor_top = 1.0 +anchor_bottom = 1.0 +grow_vertical = 0 + +[node name="ColorRect" type="ColorRect" parent="Control"] +custom_minimum_size = Vector2(200, 200) +layout_mode = 0 +offset_left = 150.0 +offset_top = -250.0 +offset_right = 350.0 +offset_bottom = -50.0 +color = Color(1, 1, 0.584314, 1) +script = ExtResource("6_n5apg") +_showPosition = Vector2(150, -250) +_hidePosition = Vector2(150, 50) + +[node name="Text" type="Label" parent="Control/ColorRect"] +layout_mode = 1 +anchors_preset = -1 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 20.0 +offset_top = 20.0 +offset_right = -20.0 +offset_bottom = -20.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_colors/font_color = Color(0, 0, 0, 1) +text = "Switch to Unity" +horizontal_alignment = 1 +vertical_alignment = 1 diff --git a/project.godot b/project.godot index c50fba0..66020d1 100644 --- a/project.godot +++ b/project.godot @@ -26,8 +26,8 @@ buses/default_bus_layout="uid://b6dwkmkyb0axk" Dialogic="*res://addons/dialogic/Core/DialogicGameHandler.gd" InventoryManager="*res://scripts/CSharp/Common/Inventory/InventoryManager.cs" -Signal_Debugger="*res://addons/SignalVisualizer/Debugger/SignalDebugger.gd" QuestManager="*res://scripts/CSharp/Common/Quest/QuestManager.cs" +Signal_Debugger="*res://addons/SignalVisualizer/Debugger/SignalDebugger.gd" [dialogic]