Re-enable collisions

This commit is contained in:
Steven Long
2023-09-07 23:28:00 -07:00
parent 8e363587b9
commit 5362240120
9 changed files with 36 additions and 78 deletions

View File

@@ -1,12 +1,8 @@
[gd_scene load_steps=28 format=3 uid="uid://bgkqfamdiwrrw"]
[gd_scene load_steps=27 format=3 uid="uid://bgkqfamdiwrrw"]
[ext_resource type="Script" path="res://Player/Base/Character.cs" id="1_s1hsr"]
[ext_resource type="PackedScene" uid="uid://criqb4bokctlr" path="res://Player/Sagittarius/Attacks/MegamiBeam.tscn" id="2_c3ma7"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_b4i03"]
radius = 0.507139
height = 4.172
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ru85r"]
resource_name = "Material.006"
cull_mode = 2
@@ -607,8 +603,7 @@ radius = 0.25
[node name="Sagittarius" type="CharacterBody3D" groups=["Player"]]
transform = Transform3D(0.9, 0, 0, 0, 0.9, 0, 0, 0, 0.9, 0, 0.559088, 0)
collision_layer = 0
collision_mask = 0
collision_layer = 2
motion_mode = 1
wall_min_slide_angle = 3.14159
script = ExtResource("1_s1hsr")
@@ -617,15 +612,6 @@ _altFireProjectile = ExtResource("2_c3ma7")
[node name="Pivot" type="Node3D" parent="."]
[node name="Area3D" type="Area3D" parent="Pivot"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75657e-15, 0, 0)
collision_layer = 0
collision_mask = 0
[node name="CollisionShape3D" type="CollisionShape3D" parent="Pivot/Area3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.125003, 0.637504, 0.112771)
shape = SubResource("CapsuleShape3D_b4i03")
[node name="Plane" type="MeshInstance3D" parent="Pivot"]
transform = Transform3D(0.00858108, 0.00109693, 0.00129912, 0, 0.00668392, -0.00564368, -0.00170029, 0.00553605, 0.00655646, -0.0019175, 1.25172, -0.0537346)
mesh = SubResource("ArrayMesh_28v15")
@@ -634,5 +620,3 @@ skeleton = NodePath("")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.125003, 0.637504, 0.112771)
shape = SubResource("CylinderShape3D_wx62l")
[connection signal="body_entered" from="Pivot/Area3D" to="." method="OnHit"]