izzy/Darklings-FightingGame
0
0
Fork 0
mirror of https://github.com/izzy2lost/Darklings-FightingGame.git synced 2026-03-10 11:35:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
unknown
2022-11-16 19:40:59 +02:00
parent 6b595db04e
commit f04b23db88
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/_Project/Scenes/GameScenes/4. GameScene.unity
View File

@@ -11721,7 +11721,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_stage: 0
_characterOne: 3
_characterOne: 4
_characterTwo: 4
_assistOne: 0
_assistTwo: 2

10
Assets/_Project/SciptableObjects/CharacterScriptableObjects/AttackScriptableObjects/AbaddonAttacks/ArcanaAttacks/5A.asset
View File

@@ -16,10 +16,10 @@ MonoBehaviour:
attackTypeEnum: 5
hitStun: 30
blockStun: 0
travelDistance: {x: 0.08, y: 0}
knockbackForce: {x: 0, y: 0}
knockbackDuration: 0
knockbackArc: 0
travelDistance: {x: 0.09, y: 0}
knockbackForce: {x: 5, y: 0}
knockbackDuration: 25
knockbackArc: 6
hasSuperArmor: 0
isAirAttack: 0
isProjectile: 0
@@ -33,7 +33,7 @@ MonoBehaviour:
hitEffectPosition: {x: 1, y: 0.1}
hitEffectRotation: 0
hurtEffect: {fileID: 6697712921357175186, guid: 92f68937417bb0e40a74f3489b97fded, type: 3}
hurtEffectPosition: {x: -0.5205078, y: -2.4848633}
hurtEffectPosition: {x: -6.421875, y: -2.4848633}
hurtEffectRotation: 0
cameraShaker: {fileID: 11400000, guid: 84aadf3764a04334eae5102f731ca6e0, type: 2}
startUpFrames: 5

6
Assets/_Project/Scripts/PlayerScripts/Player.cs
View File

@@ -523,10 +523,10 @@ public class Player : MonoBehaviour, IHurtboxResponder, IHitboxResponder, IHitst
return false;
}
private bool BlockingLeftOrRight()
public bool BlockingLeftOrRight()
{
if (transform.localScale.x == 1.0f && _playerMovement.MovementInput.x < 0.0f
|| transform.localScale.x == -1.0f && _playerMovement.MovementInput.x > 0.0f)
if (transform.localScale.x == 1 && _controller.ActiveController.InputDirection.x < 0
|| transform.localScale.x == -1 && _controller.ActiveController.InputDirection.x > 0)
{
return true;
}

2
Assets/_Project/Scripts/StateScripts/StatesScripts/BlockStateScripts/BlockParentState.cs
View File

@@ -51,7 +51,7 @@ public class BlockParentState : State
{
effect = ObjectPoolingManager.Instance.Spawn(_blockEffectPrefab);
}
effect.transform.localPosition = _blockAttack.hurtEffectPosition;
effect.transform.localPosition = new Vector2(_player.transform.position.x + (_player.transform.localScale.x * 0.25f), _blockAttack.hurtEffectPosition.y);
GameManager.Instance.HitStop(_blockAttack.hitstop);
}
if (_blockAttack.isArcana)

4
Assets/_Project/Scripts/StateScripts/StatesScripts/GroundStateScripts/GroundParentState.cs
View File

@@ -117,9 +117,9 @@ public class GroundParentState : State
public override bool ToKnockbackState()
{
if (transform.localScale.x == 1 && _playerMovement.MovementInput.x < 0
|| transform.localScale.x == -1 && _playerMovement.MovementInput.x > 0)
if (_player.BlockingLeftOrRight())
{
_blockState.Initialize(new AttackSO() { blockStun = 10, knockbackForce = new Vector2(0.1f, 0), knockbackDuration = 5 });
_stateMachine.ChangeState(_blockState);
return false;
}