This commit is contained in:
rendo 2026-04-24 12:07:46 +05:00
commit 21a4adf229
16 changed files with 136 additions and 24 deletions

View file

@ -51,6 +51,7 @@ shadow_mesh = SubResource("ArrayMesh_1ouf4")
resource_local_to_scene = true
render_priority = 0
shader = ExtResource("4_ailwx")
shader_parameter/albedo_color = Color(0, 0, 0, 1)
shader_parameter/fill = 0.8999999798832
shader_parameter/wave_intensity = 0.0

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=10 format=3 uid="uid://emm545mj0kba"]
[gd_scene format=3 uid="uid://emm545mj0kba"]
[ext_resource type="ArrayMesh" uid="uid://cdvben7q8oxgf" path="res://assets/meshes/spoon.res" id="1_l12hh"]
[ext_resource type="Script" uid="uid://bjnv2g1ni0525" path="res://src/drag/draggable_object.gd" id="1_r8mox"]
@ -14,17 +14,17 @@ albedo_texture = ExtResource("3_ckduo")
[sub_resource type="BoxShape3D" id="BoxShape3D_r8mox"]
size = Vector3(0.26538086, 0.1484375, 1.6950684)
[node name="Spoon" type="Area3D" node_paths=PackedStringArray("interactible")]
[node name="Spoon" type="Area3D" unique_id=926622416 node_paths=PackedStringArray("interactible")]
collision_layer = 6
script = ExtResource("1_r8mox")
interactible = NodePath("Interactible")
mask = PackedStringArray("flask", "solid_source")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
[node name="MeshInstance3D" type="MeshInstance3D" parent="." unique_id=608330635]
transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0.07224345, 0)
mesh = ExtResource("1_l12hh")
[node name="SpoonFill" type="MeshInstance3D" parent="."]
[node name="SpoonFill" type="MeshInstance3D" parent="." unique_id=209337706]
transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0.07224345, -0.66295564)
visible = false
material_override = SubResource("StandardMaterial3D_1r65c")
@ -32,11 +32,11 @@ mesh = ExtResource("4_5mau7")
script = ExtResource("5_33jiv")
display_type = 1
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
[node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=537844857]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.07224345, 0)
shape = SubResource("BoxShape3D_r8mox")
[node name="Interactible" type="ConfirmationDialog" parent="."]
[node name="Interactible" type="ConfirmationDialog" parent="." unique_id=706618502]
title = ""
ok_button_text = "Подтвердить"
cancel_button_text = "Отменить"
@ -44,7 +44,7 @@ script = ExtResource("3_r8ydw")
instant = true
metadata/_custom_type_script = "uid://bl0ojhc0thk1p"
[node name="Interaction" type="Node" parent="Interactible"]
[node name="Interaction" type="Node" parent="Interactible" unique_id=463123349]
script = ExtResource("4_fyayl")
[connection signal="interacted" from="Interactible" to="Interactible/Interaction" method="_on_interactible_interacted"]

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=3 uid="uid://cw6v8kbi76qak"]
[gd_scene format=3 uid="uid://cw6v8kbi76qak"]
[ext_resource type="Script" uid="uid://bjnv2g1ni0525" path="res://src/drag/draggable_object.gd" id="1_o7vug"]
[ext_resource type="ArrayMesh" uid="uid://dddqboph2ygmw" path="res://assets/meshes/jar.res" id="2_o7vug"]
@ -15,49 +15,49 @@ transparency = 1
height = 0.5024414
radius = 0.22460938
[node name="SubstanceJar" type="Area3D" node_paths=PackedStringArray("interactible")]
[node name="SubstanceJar" type="Area3D" unique_id=904812958 node_paths=PackedStringArray("interactible")]
collision_layer = 5
script = ExtResource("1_o7vug")
interactible = NodePath("Interaction")
mask = PackedStringArray("flask")
[node name="Jar" type="MeshInstance3D" parent="."]
[node name="Jar" type="MeshInstance3D" parent="." unique_id=985146813]
transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0)
mesh = ExtResource("2_o7vug")
[node name="JarFill" type="MeshInstance3D" parent="."]
[node name="JarFill" type="MeshInstance3D" parent="." unique_id=1364277535]
transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0)
material_override = SubResource("StandardMaterial3D_pcpcb")
mesh = ExtResource("6_kfk5m")
[node name="DragArea" type="CollisionShape3D" parent="."]
[node name="DragArea" type="CollisionShape3D" parent="." unique_id=960002167]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, 0)
shape = SubResource("CylinderShape3D_kfk5m")
[node name="SubstanceData" type="Node" parent="."]
[node name="SubstanceData" type="Node" parent="." unique_id=1379108671]
script = ExtResource("7_ymvgp")
[node name="Interaction" type="ConfirmationDialog" parent="."]
[node name="Interaction" type="ConfirmationDialog" parent="." unique_id=1225848265]
title = "Добавить вещество?"
ok_button_text = "Добавить"
cancel_button_text = "Не добавлять"
script = ExtResource("5_o7vug")
[node name="HBoxContainer" type="HBoxContainer" parent="Interaction"]
[node name="HBoxContainer" type="HBoxContainer" parent="Interaction" unique_id=1504866588]
offset_right = 40.0
offset_bottom = 40.0
[node name="ProgressBar" type="HSlider" parent="Interaction/HBoxContainer"]
[node name="ProgressBar" type="HSlider" parent="Interaction/HBoxContainer" unique_id=1037338095]
layout_mode = 2
size_flags_horizontal = 3
allow_greater = true
[node name="SpinBox" type="SpinBox" parent="Interaction/HBoxContainer"]
[node name="SpinBox" type="SpinBox" parent="Interaction/HBoxContainer" unique_id=194740698]
layout_mode = 2
allow_greater = true
suffix = "мг."
[node name="Interaction" type="Node" parent="Interaction"]
[node name="Interaction" type="Node" parent="Interaction" unique_id=729724369]
script = ExtResource("6_00jpx")
[connection signal="interacted" from="Interaction" to="Interaction/Interaction" method="_on_interaction_interacted"]