|
@@ -25,6 +25,7 @@ public class Trans_Assassin : MonoBehaviour
|
|
|
public Vector3 targetDir;
|
|
public Vector3 targetDir;
|
|
|
[HideInInspector]
|
|
[HideInInspector]
|
|
|
public float time;
|
|
public float time;
|
|
|
|
|
+ public float nextRushTime;
|
|
|
|
|
|
|
|
// Start is called before the first frame update
|
|
// Start is called before the first frame update
|
|
|
void Start()
|
|
void Start()
|
|
@@ -42,6 +43,63 @@ public class Trans_Assassin : MonoBehaviour
|
|
|
if (isNextUltimate)
|
|
if (isNextUltimate)
|
|
|
{
|
|
{
|
|
|
|
|
|
|
|
|
|
+ if (isUltimate)
|
|
|
|
|
+ {
|
|
|
|
|
+
|
|
|
|
|
+ if (player.isUltimate)
|
|
|
|
|
+ {
|
|
|
|
|
+ ReadyToDash(player.moveVec);
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ dashEffect.canHit = true;
|
|
|
|
|
+ aimEffect.SetActive(false);
|
|
|
|
|
+ player.ani.Play("attack_summon", 0, 0);
|
|
|
|
|
+ Rush();
|
|
|
|
|
+ time += Time.deltaTime;
|
|
|
|
|
+ if (time >= rushTime)
|
|
|
|
|
+ {
|
|
|
|
|
+ //isNextUltimate = true;
|
|
|
|
|
+ //isUltimate = false;
|
|
|
|
|
+
|
|
|
|
|
+ player.canMove = true;
|
|
|
|
|
+ player.canfly = false;
|
|
|
|
|
+ dashEffect.canHit = false;
|
|
|
|
|
+ player.bodyTrans.rotation = Quaternion.Euler(Vector3.zero);
|
|
|
|
|
+ player.ChangeState(CharacterState.Fall);
|
|
|
|
|
+ time = 0;
|
|
|
|
|
+ player.EndTransfiguration(4);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ time += Time.deltaTime;
|
|
|
|
|
+ if (time >= nextRushTime)
|
|
|
|
|
+ {
|
|
|
|
|
+ player.EndTransfiguration(4);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (player.isUltimate)
|
|
|
|
|
+ {
|
|
|
|
|
+ time = 0;
|
|
|
|
|
+ player.moveVec = player.leftDir;
|
|
|
|
|
+ player.canMove = false;
|
|
|
|
|
+ player.ChangeState(CharacterState.None);
|
|
|
|
|
+ player.ani.Play("charge", 0, 0);
|
|
|
|
|
+ player.canfly = true;
|
|
|
|
|
+ if (!player.foot.TrigGround)
|
|
|
|
|
+ {
|
|
|
|
|
+
|
|
|
|
|
+ player.rb.velocity = Vector3.zero;
|
|
|
|
|
+ player.rb.useGravity = false;
|
|
|
|
|
+ }
|
|
|
|
|
+ aimEffect.SetActive(true);
|
|
|
|
|
+ aimEffect.transform.localScale =
|
|
|
|
|
+ new Vector3(distance, 3, 1);
|
|
|
|
|
+ isUltimate = true;
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
@@ -61,7 +119,7 @@ public class Trans_Assassin : MonoBehaviour
|
|
|
time += Time.deltaTime;
|
|
time += Time.deltaTime;
|
|
|
if (time >= rushTime)
|
|
if (time >= rushTime)
|
|
|
{
|
|
{
|
|
|
- //isNextUltimate = true;
|
|
|
|
|
|
|
+ isNextUltimate = true;
|
|
|
isUltimate = false;
|
|
isUltimate = false;
|
|
|
player.canMove = true;
|
|
player.canMove = true;
|
|
|
player.canfly = false;
|
|
player.canfly = false;
|