poprawki materialy unity 6, pajaki, podmiana katalogu FSM w AIControlerze, zmiana w Spider 2.0 Behaviours , skopane zycie bylo, ladowalo pajaka z zyciem 2.
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
|
||||
using Invector.vEventSystems;
|
||||
using Invector.vEventSystems;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
namespace Invector.vCharacterController.AI
|
||||
@@ -9,10 +8,10 @@ namespace Invector.vCharacterController.AI
|
||||
{
|
||||
public vMelee.vMeleeManager MeleeManager { get; set; }
|
||||
public bool isEquipping { get; protected set; }
|
||||
private int _moveSetID;
|
||||
private int _attackID;
|
||||
private int _defenceID;
|
||||
private int _recoilID;
|
||||
protected int _moveSetID;
|
||||
protected int _attackID;
|
||||
protected int _defenseID;
|
||||
protected int _recoilID;
|
||||
|
||||
protected override void Start()
|
||||
{
|
||||
@@ -58,18 +57,18 @@ namespace Invector.vCharacterController.AI
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual int defenceID
|
||||
protected virtual int defenseID
|
||||
{
|
||||
get
|
||||
{
|
||||
return _defenceID;
|
||||
return _defenseID;
|
||||
}
|
||||
set
|
||||
{
|
||||
if (value != _defenceID)
|
||||
if (value != _defenseID)
|
||||
{
|
||||
_defenceID = value;
|
||||
animator.SetInteger("DefenseID", _defenceID);
|
||||
_defenseID = value;
|
||||
animator.SetInteger("DefenseID", _defenseID);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -83,7 +82,7 @@ namespace Invector.vCharacterController.AI
|
||||
if (MeleeManager) MeleeManager.hitProperties.hitDamageTags = tags;
|
||||
}
|
||||
|
||||
public override void Attack(bool strongAttack = false, int _newAttackID = -1,bool forceCanAttack = false)
|
||||
public override void Attack(bool strongAttack = false, int _newAttackID = -1, bool forceCanAttack = false)
|
||||
{
|
||||
if (MeleeManager && _newAttackID != -1)
|
||||
{
|
||||
@@ -94,7 +93,7 @@ namespace Invector.vCharacterController.AI
|
||||
attackID = MeleeManager.GetAttackID();
|
||||
}
|
||||
|
||||
base.Attack(strongAttack, _newAttackID,forceCanAttack);
|
||||
base.Attack(strongAttack, _newAttackID, forceCanAttack);
|
||||
}
|
||||
|
||||
protected override void UpdateCombatAnimator()
|
||||
@@ -102,9 +101,9 @@ namespace Invector.vCharacterController.AI
|
||||
base.UpdateCombatAnimator();
|
||||
isEquipping = IsAnimatorTag("IsEquipping");
|
||||
if (MeleeManager)
|
||||
{
|
||||
{
|
||||
moveSetID = MeleeManager.GetMoveSetID();
|
||||
defenceID = MeleeManager.GetDefenseID();
|
||||
defenseID = MeleeManager.GetDefenseID();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -119,23 +118,23 @@ namespace Invector.vCharacterController.AI
|
||||
var damageReduction = MeleeManager.GetDefenseRate();
|
||||
if (damageReduction > 0)
|
||||
damage.ReduceDamage(damageReduction);
|
||||
if (fighter != null && MeleeManager.CanBreakAttack())
|
||||
if (fighter != null && MeleeManager.CanBreakAttack())
|
||||
fighter.OnRecoil(MeleeManager.GetDefenseRecoilID());
|
||||
MeleeManager.OnDefense();
|
||||
}
|
||||
else damage.hitReaction = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void TryApplyRecoil(vIMeleeFighter fighter)
|
||||
{
|
||||
{
|
||||
if (MeleeManager && fighter != null)
|
||||
{
|
||||
if (isBlocking && MeleeManager.CanBlockAttack(fighter.transform.position))
|
||||
{
|
||||
{
|
||||
if (MeleeManager.CanBreakAttack())
|
||||
fighter.OnRecoil(MeleeManager.GetDefenseRecoilID());
|
||||
}
|
||||
fighter.OnRecoil(MeleeManager.GetDefenseRecoilID());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user