From 85518c4f3f9f72a9893996f35a2852565161fd23 Mon Sep 17 00:00:00 2001 From: liskiran Date: Fri, 13 May 2022 13:29:03 +0700 Subject: [PATCH] latest change --- Assets/ML-Agents/Timers.meta | 8 -------- .../Animators/Leonid Animator/CharacterLocomotion.cs | 7 +++++++ Assets/Scripts/Character/NPC.cs | 2 ++ ProjectSettings/ProjectVersion.txt | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) delete mode 100755 Assets/ML-Agents/Timers.meta diff --git a/Assets/ML-Agents/Timers.meta b/Assets/ML-Agents/Timers.meta deleted file mode 100755 index 68443d5..0000000 --- a/Assets/ML-Agents/Timers.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 37213a83bd954b64c910ca7c65cf881f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Animators/Leonid Animator/CharacterLocomotion.cs b/Assets/Scripts/Animators/Leonid Animator/CharacterLocomotion.cs index af2c968..77a1e75 100644 --- a/Assets/Scripts/Animators/Leonid Animator/CharacterLocomotion.cs +++ b/Assets/Scripts/Animators/Leonid Animator/CharacterLocomotion.cs @@ -23,6 +23,7 @@ namespace Animators.Leonid_Animator [SerializeField] private float movementSpeed = 5; [SerializeField] private float rotationSpeed = 10; + public float health = 100f; private void Start() { myRigidbody = GetComponent(); @@ -36,6 +37,12 @@ namespace Animators.Leonid_Animator private void Update() { + + if (Input.GetButtonDown("Fire1") && health > 0) + { + health -= 5; + } + var deltaTime = Time.deltaTime; _inputHandler.TickInput(deltaTime); _moveDirection = _cameraObject.forward * _inputHandler.vertical diff --git a/Assets/Scripts/Character/NPC.cs b/Assets/Scripts/Character/NPC.cs index 9c62f45..9b70257 100644 --- a/Assets/Scripts/Character/NPC.cs +++ b/Assets/Scripts/Character/NPC.cs @@ -204,6 +204,8 @@ public class NPC : Agent, ICharacter CharacterFactory.Instance.ReSpawn(this, ref pos, ref id); } } + + //public event OnDeathEvent< public void ResetCharacter() { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index bf8f7eb..89a11d7 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.36f1 -m_EditorVersionWithRevision: 2019.4.36f1 (660c164b2fc5) +m_EditorVersion: 2019.4.35f1 +m_EditorVersionWithRevision: 2019.4.35f1 (0462406dff2e)