fx: readded merged function

This commit is contained in:
2026-03-01 15:59:49 +01:00
parent 241dfb3073
commit a11805ad30
3 changed files with 11 additions and 10 deletions

View File

@@ -30,12 +30,12 @@ animations = [{
"speed": 5.0
}]
[sub_resource type="CircleShape2D" id="CircleShape2D_5hxmy"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_4flbx"]
radius = 5.999982
height = 27.990019
[sub_resource type="CircleShape2D" id="CircleShape2D_5hxmy"]
[node name="player" type="CharacterBody2D" unique_id=2032508208]
collision_mask = 14
script = ExtResource("1_0ix7k")
@@ -45,6 +45,10 @@ visibility_layer = 2
sprite_frames = SubResource("SpriteFrames_onrkg")
animation = &"attacking"
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=2137063701 groups=["player"]]
rotation = -1.5732701
shape = SubResource("CapsuleShape2D_4flbx")
[node name="AttackArea" type="Area2D" parent="." unique_id=187975387]
position = Vector2(0, 56)
rotation = -1.5732701
@@ -55,10 +59,6 @@ position = Vector2(55.977566, 9.138502)
shape = SubResource("CircleShape2D_5hxmy")
debug_color = Color(0.80813414, 0.3957308, 0.3356335, 0.41960785)
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=2137063701 groups=["player"]]
rotation = -1.5732701
shape = SubResource("CapsuleShape2D_4flbx")
[node name="AttackTimer" type="Timer" parent="." unique_id=2057433652]
one_shot = true