sharedacc520k/WhiteMan_Unity2D
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2026-05-20 적 경직추가

Browse Source
This commit is contained in:
DESKTOP-VVOCIJO\PC
2026-05-20 14:56:11 +09:00
parent e7c1330754
commit 08cdab421d
10 changed files with 113 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/02_Scripts/Player/PlayerController.cs
View File

@@ -733,7 +733,7 @@ private async Awaitable GrabRoutine(ActionData data, CancellationToken token)
}
target.EndGrab();
target.TakeDamage(data.Damage, GetHitVelocity(data.HitVelocity), data.HitReactionAnimationState);
target.TakeDamage(data.Damage, GetHitVelocity(data.HitVelocity), data.HitReactionAnimationState, hitStunDuration: data.HitStunDuration);
}
catch (System.OperationCanceledException)
{
@@ -1578,7 +1578,7 @@ private void DrawTimelineBar(ActionData data, float elapsed)
GUI.color = Color.white;
}
public void TakeDamage(int amount, Vector2 hitVelocity = default, string hitReactionAnimationState = null, Vector2? hitTargetPosition = null, bool correctHitTargetY = false, int hitPositionSolidMask = 0, float hitPositionCorrectionDuration = 0)
public void TakeDamage(int amount, Vector2 hitVelocity = default, string hitReactionAnimationState = null, Vector2? hitTargetPosition = null, bool correctHitTargetY = false, int hitPositionSolidMask = 0, float hitPositionCorrectionDuration = 0, float hitStunDuration = -1f)
{
if (_health == null || _health.IsDead) return;