Fix bug with Boss A (hit box didn't get scaled correctly)
Fix reset of death animation
This commit is contained in:
@@ -131,6 +131,7 @@ public partial class BossTypeA : Enemy, IHaveEngagePlayerBehavior, IHaveFollowBe
|
|||||||
|
|
||||||
public override void Die()
|
public override void Die()
|
||||||
{
|
{
|
||||||
|
SetProcess(false);
|
||||||
SetPhysicsProcess(false);
|
SetPhysicsProcess(false);
|
||||||
_enemyLogic.Input(new EnemyLogic.Input.Defeated());
|
_enemyLogic.Input(new EnemyLogic.Input.Defeated());
|
||||||
_collisionShape.SetDeferred(CollisionShape3D.PropertyName.Disabled, true);
|
_collisionShape.SetDeferred(CollisionShape3D.PropertyName.Disabled, true);
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
radius = 1.0
|
radius = 1.0
|
||||||
height = 4.0
|
height = 4.0
|
||||||
|
|
||||||
[sub_resource type="SphereShape3D" id="SphereShape3D_jl3qa"]
|
[sub_resource type="SphereShape3D" id="SphereShape3D_nt5fo"]
|
||||||
radius = 2.70035
|
radius = 2.70035
|
||||||
|
|
||||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wp4vi"]
|
[sub_resource type="CylinderShape3D" id="CylinderShape3D_wp4vi"]
|
||||||
@@ -41,7 +41,7 @@ collision_mask = 0
|
|||||||
|
|
||||||
[node name="EnemyHitbox" type="CollisionShape3D" parent="Collision"]
|
[node name="EnemyHitbox" type="CollisionShape3D" parent="Collision"]
|
||||||
unique_name_in_owner = true
|
unique_name_in_owner = true
|
||||||
shape = SubResource("SphereShape3D_jl3qa")
|
shape = SubResource("SphereShape3D_nt5fo")
|
||||||
disabled = true
|
disabled = true
|
||||||
|
|
||||||
[node name="Rotation" type="Node3D" parent="."]
|
[node name="Rotation" type="Node3D" parent="."]
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -1221,7 +1221,7 @@ tracks/40/keys = {
|
|||||||
"start_offset": 0.0,
|
"start_offset": 0.0,
|
||||||
"stream": ExtResource("1_5mwcl")
|
"stream": ExtResource("1_5mwcl")
|
||||||
}],
|
}],
|
||||||
"times": PackedFloat32Array(0.133333, 0.733333)
|
"times": PackedFloat32Array(0, 0.666667)
|
||||||
}
|
}
|
||||||
tracks/40/use_blend = true
|
tracks/40/use_blend = true
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@@ -12,8 +12,8 @@
|
|||||||
radius = 1.0
|
radius = 1.0
|
||||||
height = 4.0
|
height = 4.0
|
||||||
|
|
||||||
[sub_resource type="SphereShape3D" id="SphereShape3D_j7u30"]
|
[sub_resource type="SphereShape3D" id="SphereShape3D_i0akf"]
|
||||||
radius = 15.426
|
radius = 3.31305
|
||||||
|
|
||||||
[sub_resource type="CylinderShape3D" id="CylinderShape3D_ow3fn"]
|
[sub_resource type="CylinderShape3D" id="CylinderShape3D_ow3fn"]
|
||||||
height = 7.0
|
height = 7.0
|
||||||
@@ -40,8 +40,8 @@ collision_mask = 0
|
|||||||
|
|
||||||
[node name="EnemyHitbox" type="CollisionShape3D" parent="Collision"]
|
[node name="EnemyHitbox" type="CollisionShape3D" parent="Collision"]
|
||||||
unique_name_in_owner = true
|
unique_name_in_owner = true
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 14.3724, 0)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.87204, 0)
|
||||||
shape = SubResource("SphereShape3D_j7u30")
|
shape = SubResource("SphereShape3D_i0akf")
|
||||||
disabled = true
|
disabled = true
|
||||||
|
|
||||||
[node name="Rotation" type="Node3D" parent="."]
|
[node name="Rotation" type="Node3D" parent="."]
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -1477,6 +1477,18 @@ tracks/10/keys = {
|
|||||||
"update": 1,
|
"update": 1,
|
||||||
"values": [SubResource("SpriteFrames_xbcdg")]
|
"values": [SubResource("SpriteFrames_xbcdg")]
|
||||||
}
|
}
|
||||||
|
tracks/11/type = "value"
|
||||||
|
tracks/11/imported = false
|
||||||
|
tracks/11/enabled = true
|
||||||
|
tracks/11/path = NodePath("%Camera3D:position")
|
||||||
|
tracks/11/interp = 1
|
||||||
|
tracks/11/loop_wrap = true
|
||||||
|
tracks/11/keys = {
|
||||||
|
"times": PackedFloat32Array(0),
|
||||||
|
"transitions": PackedFloat32Array(1),
|
||||||
|
"update": 0,
|
||||||
|
"values": [Vector3(0.003, 2.1, -0.01)]
|
||||||
|
}
|
||||||
|
|
||||||
[sub_resource type="Animation" id="Animation_es4xk"]
|
[sub_resource type="Animation" id="Animation_es4xk"]
|
||||||
resource_name = "death"
|
resource_name = "death"
|
||||||
|
|||||||
Reference in New Issue
Block a user