MERG
This commit is contained in:
commit
fda7019b8f
4 changed files with 52 additions and 19 deletions
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=7 format=3 uid="uid://n05pnykd3tff"]
|
||||
[gd_scene load_steps=9 format=3 uid="uid://n05pnykd3tff"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://dgm3241ceqpim" path="res://scenes/body.tscn" id="1_eeca8"]
|
||||
|
||||
|
@ -21,6 +21,12 @@ size = Vector3(50, 1, 50)
|
|||
[sub_resource type="BoxShape3D" id="BoxShape3D_0lkv2"]
|
||||
size = Vector3(50, 1.03235, 50)
|
||||
|
||||
[sub_resource type="BoxMesh" id="BoxMesh_6hnpm"]
|
||||
size = Vector3(25, 1, 100)
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_qcnmp"]
|
||||
size = Vector3(25, 1, 100)
|
||||
|
||||
[node name="Main" type="Node3D"]
|
||||
|
||||
[node name="CanvasLayer" type="CanvasLayer" parent="."]
|
||||
|
@ -59,5 +65,19 @@ skeleton = NodePath("../..")
|
|||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0161743, 0)
|
||||
shape = SubResource("BoxShape3D_0lkv2")
|
||||
|
||||
[node name="StaticBody3D2" type="StaticBody3D" parent="World"]
|
||||
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 50, -18)
|
||||
|
||||
[node name="MeshInstance3D" type="MeshInstance3D" parent="World/StaticBody3D2"]
|
||||
mesh = SubResource("BoxMesh_6hnpm")
|
||||
skeleton = NodePath("../..")
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="World/StaticBody3D2"]
|
||||
shape = SubResource("BoxShape3D_qcnmp")
|
||||
|
||||
[node name="Body" parent="World" instance=ExtResource("1_eeca8")]
|
||||
<<<<<<< HEAD
|
||||
transform = Transform3D(-0.405636, -0.914035, 0, 0.914035, -0.405636, 0, 0, 0, 1, 0, 11.4413, 0)
|
||||
=======
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 7, 0)
|
||||
>>>>>>> f16e42a8d005f3a2f44f20fa5979b49bc40d0d8b
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue