lift fix
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 16s
Create tag and build when new code gets to main / Export (push) Successful in 4m48s

This commit is contained in:
2025-10-31 11:04:42 +01:00
parent 1c7abeb0d9
commit 2d3a1b0d4c
7 changed files with 915 additions and 947 deletions

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@@ -1,7 +1,9 @@
[gd_scene load_steps=6 format=3 uid="uid://gir68sk3762e"] [gd_scene load_steps=8 format=3 uid="uid://gir68sk3762e"]
[ext_resource type="PackedScene" uid="uid://cc2vcuaulfks3" path="res://assets/lift/lift.glb" id="1_2dxq0"] [ext_resource type="PackedScene" uid="uid://cc2vcuaulfks3" path="res://assets/lift/lift.glb" id="1_2dxq0"]
[ext_resource type="Script" uid="uid://c1w84vh3bqijr" path="res://assets/lift/lift.gd" id="2_5i7wx"] [ext_resource type="Script" uid="uid://c1w84vh3bqijr" path="res://assets/lift/lift.gd" id="2_5i7wx"]
[ext_resource type="Material" uid="uid://crqalmyy5wynf" path="res://assets/materials/walls/walls_and_ground.tres" id="3_u2uhe"]
[ext_resource type="Material" uid="uid://cy7yon430rfy3" path="res://assets/materials/walls/wood_platform.tres" id="4_jmnc2"]
[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_5i7wx"] [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_5i7wx"]
data = PackedVector3Array(-1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1, 1, 1, -1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, 1, -1, 1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1, -1, 1, 1, 1, -1, -1, 1, 1, -1, 1, -1, 1, 1, -1, 1, 1, 1, -1, 1, 1) data = PackedVector3Array(-1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1, 1, 1, -1, 1, -1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, 1, -1, 1, 1, 1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1, -1, 1, 1, 1, -1, -1, 1, 1, -1, 1, -1, 1, 1, -1, 1, 1, 1, -1, 1, 1)
@@ -14,11 +16,17 @@ data = PackedVector3Array(-0.1951, -1, -0.9808, 0.1951, -1, -0.9808, 0, -1, -1,
[node name="Lift" instance=ExtResource("1_2dxq0")] [node name="Lift" instance=ExtResource("1_2dxq0")]
script = ExtResource("2_5i7wx") script = ExtResource("2_5i7wx")
[node name="Cube_279" parent="." index="0"]
material_override = ExtResource("3_u2uhe")
[node name="StaticBody3D" type="StaticBody3D" parent="Cube_279" index="0"] [node name="StaticBody3D" type="StaticBody3D" parent="Cube_279" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Cube_279/StaticBody3D" index="0"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Cube_279/StaticBody3D" index="0"]
shape = SubResource("ConcavePolygonShape3D_5i7wx") shape = SubResource("ConcavePolygonShape3D_5i7wx")
[node name="Cylinder_001" parent="." index="1"]
material_override = ExtResource("4_jmnc2")
[node name="StaticBody3D" type="StaticBody3D" parent="Cylinder_001" index="0"] [node name="StaticBody3D" type="StaticBody3D" parent="Cylinder_001" index="0"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Cylinder_001/StaticBody3D" index="0"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Cylinder_001/StaticBody3D" index="0"]

Binary file not shown.

Binary file not shown.

View File

@@ -5,7 +5,7 @@ bus/1/name = &"Music"
bus/1/solo = false bus/1/solo = false
bus/1/mute = false bus/1/mute = false
bus/1/bypass_fx = false bus/1/bypass_fx = false
bus/1/volume_db = -15.794972 bus/1/volume_db = -26.595549
bus/1/send = &"Master" bus/1/send = &"Master"
bus/2/name = &"SFX" bus/2/name = &"SFX"
bus/2/solo = false bus/2/solo = false

View File

@@ -41,7 +41,7 @@ volumetric_fog_anisotropy = 0.6
[node name="Main" type="Node3D"] [node name="Main" type="Node3D"]
[node name="Player" parent="." instance=ExtResource("1_2vsi6")] [node name="Player" parent="." instance=ExtResource("1_2vsi6")]
transform = Transform3D(0.9481796, 0, -0.31773496, 0, 1, 0, 0.31773496, 0, 0.9481796, -4.1827703, -33.37261, 18.473116) transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, 1.1344104, -132.74933, 135.37988)
[node name="WorldEnvironment" type="WorldEnvironment" parent="."] [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_1bvp3") environment = SubResource("Environment_1bvp3")
@@ -81,6 +81,6 @@ pause = ExtResource("10_0ari0")
stream = ExtResource("10_eca4n") stream = ExtResource("10_eca4n")
[node name="Lift" parent="." instance=ExtResource("13_eca4n")] [node name="Lift" parent="." instance=ExtResource("13_eca4n")]
transform = Transform3D(0.9961947, 0, -0.08715574, 0, 1, 0, 0.08715574, 0, 0.9961947, -4.393, 1.693, 0.583) transform = Transform3D(0.9961947, 0, -0.08715573, 0, 1, 0, 0.08715573, 0, 0.9961947, -4.593, 1.618, 0.583)
end_location = Vector3(-4.393, 115, 0.583) end_location = Vector3(-4.593, 116.11, 0.583)
lift_time = 10.0 lift_time = 15.0