hemp/ProjectZ
2
0
Fork 0
Code Issues 18 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

traxat

Browse Source
This commit is contained in:
Nadar 2024-03-17 01:02:25 +03:00
parent 7dc77be602
commit a6dc5ba179
4 changed files with 5167 additions and 10313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Characters/AlienCharacter/Animations/EnemyController.controller
View File

@ -17,9 +17,9 @@ AnimatorStateTransition:
m_Mute: 0 m_Mute: 0
m_IsExit: 0 m_IsExit: 0
serializedVersion: 3 serializedVersion: 3
m_TransitionDuration: 0.38631588 m_TransitionDuration: 0.105819285
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.000000018719188 m_ExitTime: 0.000000016145702
m_HasExitTime: 1 m_HasExitTime: 1
m_HasFixedDuration: 1 m_HasFixedDuration: 1
m_InterruptionSource: 0 m_InterruptionSource: 0

15464
Assets/Scenes/Space.unity
View File

File diff suppressed because it is too large Load Diff

10
Assets/Scripts/Characters/Enemy/EnemyController.cs
View File

@ -179,8 +179,9 @@ public partial class EnemyController : Pawn
{ {
isKilling = true; isKilling = true;
_target = null; _target = null;
_runSpeed = 0; _speedMul = 0;
yield return new WaitForSeconds(7); yield return new WaitForSeconds(7);
_speedMul = 1;
isKilling = false; isKilling = false;
aimTarget.position = transform.position; aimTarget.position = transform.position;
@ -262,9 +263,8 @@ public partial class EnemyController : Pawn
void TakeDamageAnimation(Pawn self) void TakeDamageAnimation(Pawn self)
{ {
canAttack = false; canAttack = false;
_runSpeed = 0; _speedMul = 0;
animator.SetTrigger("damage"); animator.SetTrigger("damage");
// animator.SetTrigger("stun"); тут!!!
hitVFX.Stop(); hitVFX.Stop();
hitVFX.Play(); hitVFX.Play();
StartCoroutine(AfterTakeDamage()); StartCoroutine(AfterTakeDamage());
@ -272,8 +272,8 @@ public partial class EnemyController : Pawn
IEnumerator AfterTakeDamage() IEnumerator AfterTakeDamage()
{ {
yield return new WaitForSeconds(4); yield return new WaitForSeconds(6);
_runSpeed = 4.974f; _speedMul = 1;
canAttack = true; canAttack = true;
} }
} }

2
Assets/Scripts/Network/NetworkGameManager.cs
View File

@ -19,7 +19,7 @@ public class NetworkGameManager : NetworkBehaviour
// public List<Pawn> alive; // public List<Pawn> alive;
// public List<Pawn> dead; // public List<Pawn> dead;
public event Action RestartCallback; public event Action RestartCallback;
void Awake() void Awake()
{ {