fix hitboxes

This commit is contained in:
2022-12-10 15:37:20 +01:00
parent af78a923f8
commit 236a6f92a7
4 changed files with 9 additions and 12 deletions

View File

@@ -1,8 +1,7 @@
[gd_scene load_steps=9 format=3 uid="uid://vwjd5od63jgh"]
[gd_scene load_steps=8 format=3 uid="uid://vwjd5od63jgh"]
[ext_resource type="Script" path="res://scripts/Player.gd" id="1_dta8q"]
[ext_resource type="Texture2D" uid="uid://du7d6fk4dabd7" path="res://cVOQuID.png" id="2_pd1wl"]
[ext_resource type="Texture2D" uid="uid://cy6x8d3xe8lux" path="res://icon.svg" id="2_yjfj7"]
[ext_resource type="Texture2D" uid="uid://eg0k8esm2scp" path="res://p5lFkJY.png" id="3_hxw38"]
[ext_resource type="Texture2D" uid="uid://dsphpbpt27t1i" path="res://a3TCqhg.png" id="4_6puyx"]
@@ -25,26 +24,22 @@ radius = 0.494048
[sub_resource type="CylinderShape3D" id="CylinderShape3D_8lrgm"]
[node name="CharacterBody3D" type="CharacterBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0)
script = ExtResource("1_dta8q")
[node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="."]
transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, 1, 0)
transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, -2, 0)
frames = SubResource("SpriteFrames_liykb")
animation = &"idle"
speed_scale = 2.0
playing = true
[node name="Sprite3D" type="Sprite3D" parent="."]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 2, 0)
visible = false
texture = ExtResource("2_yjfj7")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1.57581, 0, 0, 0, 2.47805, 0, 0, 0, 1.5749, 0, 0, 0)
transform = Transform3D(1.57581, 0, 0, 0, 2.16936, 0, 0, 0, 1.5749, 0, 0, 0)
shape = SubResource("CylinderShape3D_h8ivv")
[node name="HitBox" type="Area3D" parent="."]
collision_mask = 5
collision_mask = 4
[node name="CollisionShape3D" type="CollisionShape3D" parent="HitBox"]
transform = Transform3D(2.74062, 0, 0, 0, 2.24144, 0, 0, 0, 2.70992, 0, 0, 0)

View File

@@ -15,6 +15,7 @@ transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 20,
current = true
[node name="Player1" parent="." instance=ExtResource("3_kknxo")]
transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, -12, -1, 0)
[node name="Player2" parent="." instance=ExtResource("3_kknxo")]
transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 12, 0, 0)

View File

@@ -15,6 +15,7 @@ transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, -12, 0,
script = ExtResource("1_0x664")
[node name="Cannon" parent="." instance=ExtResource("2_71mfj")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.52346, 1.58651, -1.96232e-14)
[node name="MeshInstance3D2" type="MeshInstance3D" parent="."]
mesh = SubResource("BoxMesh_ognqx")
@@ -25,6 +26,6 @@ mesh = SubResource("BoxMesh_ognqx")
shape = SubResource("ConcavePolygonShape3D_p3d4e")
[node name="CharacterBody3D" parent="." instance=ExtResource("3_in6up")]
transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 0, 2, 0)
transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 0, 3, 0)
[node name="Cannon2" parent="." instance=ExtResource("2_71mfj")]

View File

@@ -29,7 +29,7 @@ _global_script_classes=[{
"language": &"GDScript",
"path": "res://scripts/Logic/MapNode.gd"
}, {
"base": "StaticBody3D",
"base": "Node",
"class": &"Module",
"language": &"GDScript",
"path": "res://scripts/Modules/Module.gd"