diff --git a/main.tscn b/main.tscn index 138b45b..014aeb3 100644 --- a/main.tscn +++ b/main.tscn @@ -37,6 +37,7 @@ visible = false [node name="Greybox" type="CSGCombiner3D" parent="."] use_collision = true collision_layer = 3 +collision_mask = 5 [node name="CSGBox3D" type="CSGBox3D" parent="Greybox"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.09619, -0.472656, -0.958893) diff --git a/player_controller/Scripts/PlayerController.cs b/player_controller/Scripts/PlayerController.cs index cfabad5..824aa1c 100644 --- a/player_controller/Scripts/PlayerController.cs +++ b/player_controller/Scripts/PlayerController.cs @@ -160,7 +160,6 @@ public partial class PlayerController : CharacterBody3D DashSystem.DashResolve = new DashResolveRecord(false, WeaponSystem.PlayerDashLocation, Vector3.Zero); } _dashDirection = (DashSystem.DashResolve.DashLocation - GlobalPosition).Normalized(); - GD.Print(_dashDirection); DashSystem.Dash(); } diff --git a/systems/weapon/weapon.tscn b/systems/weapon/weapon.tscn index aa70ec3..cbb2b88 100644 --- a/systems/weapon/weapon.tscn +++ b/systems/weapon/weapon.tscn @@ -17,6 +17,7 @@ bottom_radius = 0.05 height = 1.0 [node name="Weapon" type="RigidBody3D"] +collision_layer = 4 collision_mask = 2 continuous_cd = true contact_monitor = true