Passion & UI
This commit is contained in:
@@ -59,15 +59,8 @@ namespace Cielonos.MainGame
|
||||
|
||||
if (characterBlockSm.isBlocking)
|
||||
{
|
||||
/*if (canBeBlocked)
|
||||
{
|
||||
|
||||
}*/
|
||||
|
||||
BlockSource firstBlockSource;
|
||||
|
||||
if (hasPerfectBlock && (!hasPerfectWindowTime || owner.timeSm.enablingTimer <= 0.2f)
|
||||
&& characterBlockSm.isPerfectBlocking)
|
||||
if (hasPerfectBlock && (!hasPerfectWindowTime || owner.timeSm.enablingTimer <= 0.2f) && characterBlockSm.isPerfectBlocking)
|
||||
{
|
||||
firstBlockSource = characterBlockSm.blockSources.Find(source =>
|
||||
source.perfectBlockType >= attackArea.attackSm.attackValue.breakthroughType && source.isDuringPerfectBlock);
|
||||
@@ -79,12 +72,13 @@ namespace Cielonos.MainGame
|
||||
perfectBlockAction?.Invoke(blocker);
|
||||
blocker.eventSm.onBlockSuccess.Invoke(attackArea, firstBlockSource);
|
||||
blocker.eventSm.onPerfectBlockSuccess.Invoke(attackArea, firstBlockSource);
|
||||
Debug.Log($"[ReactionSubmodule] Perfect block successful! Blocker: {blocker.name}, Attack: {attackArea.name}");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
firstBlockSource = characterBlockSm.blockSources.Find(source =>
|
||||
firstBlockSource = characterBlockSm.blockSources.Find(source =>
|
||||
source.normalBlockType >= attackArea.attackSm.attackValue.breakthroughType);
|
||||
if (firstBlockSource != null)
|
||||
{
|
||||
@@ -93,6 +87,7 @@ namespace Cielonos.MainGame
|
||||
normalBlockAction?.Invoke(blocker);
|
||||
blocker.eventSm.onBlockSuccess.Invoke(attackArea, firstBlockSource);
|
||||
blocker.eventSm.onNormalBlockSuccess.Invoke(attackArea, firstBlockSource);
|
||||
Debug.Log($"[ReactionSubmodule] Normal block successful! Blocker: {blocker.name}, Attack: {attackArea.name}");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -143,7 +138,7 @@ namespace Cielonos.MainGame
|
||||
{
|
||||
DodgeSource firstDodgeSource;
|
||||
|
||||
if (hasPerfectDodge && owner.timeSm.enablingTimer <= 0.2f && characterDodgeSm.isPerfectDodging)
|
||||
if (hasPerfectDodge && owner.timeSm.enablingTimer <= 0.15f && characterDodgeSm.isPerfectDodging)
|
||||
{
|
||||
firstDodgeSource = characterDodgeSm.dodgeSources.Find(source => source.isDuringPerfectDodge);
|
||||
firstDodgeSource.PerfectDodge(owner);
|
||||
|
||||
Reference in New Issue
Block a user