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

Merge remote-tracking branch 'origin/main' into c_sharp_setup

Browse Source 
# Conflicts:
#	scripts/CSharp/Common/CharacterControls/VesnaBehaviour.cs.uid
#	scripts/CSharp/Common/Farming/FieldService.cs.uid
This commit is contained in:
Katharina Ziolkowski
2025-04-24 21:22:56 +02:00
parent 20b37de108 7d1187d218
commit 7e19268847
21 changed files with 317 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prefabs/UI/Inventory/Inventory.tscn
+1 -1
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=5 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://b7vlkecrn0t5c" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"]
[ext_resource type="Script" uid="uid://b2jhdxcrhtm2d" path="res://scripts/CSharp/Common/Inventory/InventoryTestScript.cs" id="3_exrk4"]
[ext_resource type="Resource" uid="uid://datee0flk1e84" path="res://resources/items/pickaxe.tres" id="4_5fdxq"]
[ext_resource type="Texture2D" uid="uid://c7wqla0mbu3np" path="res://graphics/ui/babushka_ui_tmp_inventory_select.png" id="4_tiss4"]
prefabs/UI/Inventory/Slot.tscn
+18
View File
@@ -41,4 +41,22 @@ label_settings = SubResource("LabelSettings_7emux")
horizontal_alignment = 1
vertical_alignment = 1
[node name="AmountLabel" type="Label" parent="."]
layout_mode = 1
anchors_preset = -1
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -409.0
offset_top = -329.0
offset_right = -10.0
offset_bottom = -10.0
grow_horizontal = 0
grow_vertical = 0
theme_override_colors/font_color = Color(0, 0, 0, 1)
text = "999"
horizontal_alignment = 2
vertical_alignment = 2
[connection signal="gui_input" from="." to="." method="_on_gui_input"]
prefabs/interactions/generic_item_on_ground.tscn
+26
View File
@@ -0,0 +1,26 @@
[gd_scene load_steps=5 format=3 uid="uid://5hltxpdxmqcq"]
[ext_resource type="Script" uid="uid://udhigottc8rg" path="res://scripts/CSharp/Common/Inventory/ItemOnGround.cs" id="1_mnomu"]
[ext_resource type="PackedScene" uid="uid://ob04y3syvo0e" path="res://prefabs/interaction_area.tscn" id="2_ue6ub"]
[ext_resource type="Script" uid="uid://c8suoi3i6kqai" path="res://scripts/CSharp/Common/Inventory/ItemOnGroundSpawnWith.cs" id="3_ue6ub"]
[ext_resource type="Resource" uid="uid://c7viddcd3kywp" path="res://resources/items/axe.tres" id="4_sfad0"]
[node name="GenericItemOnGround" type="Node3D"]
script = ExtResource("1_mnomu")
[node name="InteractionArea" parent="." instance=ExtResource("2_ue6ub")]
[node name="SpawnWithItem" type="Node" parent="."]
script = ExtResource("3_ue6ub")
_blueprint = ExtResource("4_sfad0")
[node name="ItemLabel" type="Label3D" parent="."]
offset = Vector2(0, 55.64)
billboard = 1
text = "test"
[node name="PickupErrorLabel" type="Label3D" parent="."]
offset = Vector2(0, 150)
billboard = 1
[connection signal="Interacted" from="InteractionArea" to="." method="TryPickUp"]