From 3694483a9c3af6f99048669fd0d885cee32e3c8f Mon Sep 17 00:00:00 2001 From: fiore Date: Mon, 21 Apr 2025 16:24:23 +0900 Subject: [PATCH] =?UTF-8?q?DEG-41=20=EC=A0=84=ED=88=AC=20=ED=8C=A8?= =?UTF-8?q?=ED=84=B4=20=EA=B5=AC=ED=98=84=20=EC=8B=9C=EC=9E=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/JYY/Prefabs/AOEIndicator.prefab | 3 --- Assets/JYY/Prefabs/AOEIndicator.prefab.meta | 7 ------- Assets/JYY/Prefabs/AOEIndicatorChariot.prefab | 4 ++-- .../Scripts/Character/Enemy/EnemyDemageField.cs | 7 +++++++ .../Character/Enemy/EnemyDemageField.cs.meta | 3 +++ .../Enemy/EnemyState/EnemyStateAttack.cs | 15 +++++++-------- 6 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 Assets/JYY/Prefabs/AOEIndicator.prefab delete mode 100644 Assets/JYY/Prefabs/AOEIndicator.prefab.meta create mode 100644 Assets/Scripts/Character/Enemy/EnemyDemageField.cs create mode 100644 Assets/Scripts/Character/Enemy/EnemyDemageField.cs.meta diff --git a/Assets/JYY/Prefabs/AOEIndicator.prefab b/Assets/JYY/Prefabs/AOEIndicator.prefab deleted file mode 100644 index 6ac5eda7..00000000 --- a/Assets/JYY/Prefabs/AOEIndicator.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b8cb01bd819acc4a85f049a7fa119e05a3587e1f3b9e88ce1f0f0729a09b326 -size 4274 diff --git a/Assets/JYY/Prefabs/AOEIndicator.prefab.meta b/Assets/JYY/Prefabs/AOEIndicator.prefab.meta deleted file mode 100644 index 0035b785..00000000 --- a/Assets/JYY/Prefabs/AOEIndicator.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 36d2fcfec062c074ba2dad3a0b0116be -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/JYY/Prefabs/AOEIndicatorChariot.prefab b/Assets/JYY/Prefabs/AOEIndicatorChariot.prefab index 5b73b6cb..6991ab32 100644 --- a/Assets/JYY/Prefabs/AOEIndicatorChariot.prefab +++ b/Assets/JYY/Prefabs/AOEIndicatorChariot.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db1f3ad7db0d99b20fdfe95c0ba7248476edee0875596606eb05ac19c33e84f2 -size 4283 +oid sha256:4487834d50c67ef719d45ea081a895bebc943de247d782072226e7c6b7dc6d5a +size 4703 diff --git a/Assets/Scripts/Character/Enemy/EnemyDemageField.cs b/Assets/Scripts/Character/Enemy/EnemyDemageField.cs new file mode 100644 index 00000000..4b22b760 --- /dev/null +++ b/Assets/Scripts/Character/Enemy/EnemyDemageField.cs @@ -0,0 +1,7 @@ +using UnityEngine; + +public class EnemyDemageField : MonoBehaviour +{ + private float damage; + +} \ No newline at end of file diff --git a/Assets/Scripts/Character/Enemy/EnemyDemageField.cs.meta b/Assets/Scripts/Character/Enemy/EnemyDemageField.cs.meta new file mode 100644 index 00000000..7afc07ba --- /dev/null +++ b/Assets/Scripts/Character/Enemy/EnemyDemageField.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8ac23a14eeef4226962782ab20ec78e0 +timeCreated: 1745219566 \ No newline at end of file diff --git a/Assets/Scripts/Character/Enemy/EnemyState/EnemyStateAttack.cs b/Assets/Scripts/Character/Enemy/EnemyState/EnemyStateAttack.cs index 6cc865a5..6a35e710 100644 --- a/Assets/Scripts/Character/Enemy/EnemyState/EnemyStateAttack.cs +++ b/Assets/Scripts/Character/Enemy/EnemyState/EnemyStateAttack.cs @@ -36,20 +36,19 @@ public class EnemyStateAttack : IEnemyState private IEnumerator VerticalAttackSequence() { - // 1. 전조 이펙트 생성 + yield return new WaitForSeconds(0.1f); + // 1. 전조 이펙트 생성, 검을 들어올림 _enemyAttackController.TriggerRandomWarning(_enemyController.transform.position, _enemyController.transform.rotation); - // 2. 검을 들어올림 - yield return new WaitForSeconds(3f); + // 2. 대기(전조와 검 들어올리는 애니메이션을 위함) + yield return new WaitForSeconds(2f); - // 3. 대기(전조와 검 들어올리는 애니메이션을 위함) - - // 4. 검 휘두르기 + // 3. 검 휘두르기 _animator.SetTrigger(VertiSlash); _enemyAttackController.DestroyWarningArea(); - // TODO : 5. 공격 판정 발생 + // TODO : 4. 공격 판정 발생 yield return new WaitForSeconds(1f); - // 6. 애니메이션 트리거 종료 -> 애니메이터 상태 머신으로 처리 + // 5. 애니메이션 트리거 종료 -> 애니메이터 상태 머신으로 처리 _enemyController.SetState(EnemyState.Trace); }