Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge branch 'feature/dialogic_style_rework' into feature/detection_cross

Browse Source
This commit is contained in:
Katharina Ziolkowski
2025-10-28 10:56:22 +01:00
parent ecff43d5c3 109573fb1b
commit 90b8dda16a
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prefabs/UI/Inventory/Inventory.tscn
+11 -10
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=12 format=3 uid="uid://cgjc4wurbgimy"]
[gd_scene load_steps=13 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="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="1_l3npx"]
@@ -10,6 +10,7 @@
[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"]
[ext_resource type="Texture2D" uid="uid://b2q3xgw8xj880" path="res://art/ui/UI/quest_note.png" id="10_nw1un"]
[sub_resource type="LabelSettings" id="LabelSettings_l3npx"]
font_size = 50
@@ -476,37 +477,37 @@ label_settings = SubResource("LabelSettings_l3npx")
[node name="QuestLogRoot" parent="." instance=ExtResource("7_vvo7l")]
[node name="Control" type="Control" parent="."]
[node name="QuestPostIt" 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)
[node name="TextureRect" type="TextureRect" parent="QuestPostIt"]
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)
offset_right = 392.0
offset_bottom = -37.0
texture = ExtResource("10_nw1un")
script = ExtResource("6_n5apg")
_showPosition = Vector2(150, -250)
_hidePosition = Vector2(150, 50)
[node name="Text" type="Label" parent="Control/ColorRect"]
[node name="Text" type="Label" parent="QuestPostIt/TextureRect"]
layout_mode = 1
anchors_preset = -1
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 20.0
offset_top = 20.0
offset_top = 15.0
offset_right = -20.0
offset_bottom = -20.0
offset_bottom = -25.0
grow_horizontal = 2
grow_vertical = 2
theme_override_colors/font_color = Color(0, 0, 0, 1)
theme_override_font_sizes/font_size = 23
text = "[Hier könnte Ihre Werbung stehen]"
horizontal_alignment = 1
vertical_alignment = 1