Merge pull request 'DEG-56- VFX 추가' (!32) from DEG-56 into main

Reviewed-on: #32
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
This commit is contained in:
FioreFlower 2025-05-12 04:09:40 +00:00
commit ab99c57847
11 changed files with 40 additions and 38383 deletions

BIN
Assets/JYY/Materials/MagicMissaile.mat (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 396a4d0e1fb987e4e8f12e4480ecd48d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/JYY/Prefabs/Alien Big Blink.prefab (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
Assets/JYY/Prefabs/Bullets/Magic Missaile.prefab (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/JYY/Prefabs/[Enemy] PldDog.prefab (Stored with Git LFS)

Binary file not shown.

BIN
Assets/JYY/Scenes/MonsterTest.unity (Stored with Git LFS)

Binary file not shown.

View File

@ -12,7 +12,6 @@ public class CasterDemonController : EnemyController
public static readonly int Telepo = Animator.StringToHash("Telepo"); public static readonly int Telepo = Animator.StringToHash("Telepo");
public static readonly int Spin = Animator.StringToHash("Spin"); public static readonly int Spin = Animator.StringToHash("Spin");
[SerializeField] private Transform teleportTransform;
[SerializeField] private Transform bulletShotPosition; [SerializeField] private Transform bulletShotPosition;
[SerializeField] private GameObject magicMissilePrefab; [SerializeField] private GameObject magicMissilePrefab;
[SerializeField] private GameObject teleportEffectPrefab; [SerializeField] private GameObject teleportEffectPrefab;
@ -239,22 +238,30 @@ public class CasterDemonController : EnemyController
private void Teleport() private void Teleport()
{ {
Vector3 startPos = transform.position; Vector3 startPos = transform.position;
if (teleportEffectPrefab != null)
Instantiate(teleportEffectPrefab, startPos, Quaternion.identity); var startTelepoEffect = Instantiate(teleportEffectPrefab, startPos, Quaternion.identity);
// 텔레포트와 함께 시전하는 범위 공격 // 텔레포트와 함께 시전하는 범위 공격
var aoe = Instantiate(chariotWarning, startPos, Quaternion.identity).GetComponent<ChariotAoeController>(); var aoe = Instantiate(chariotWarning, startPos, Quaternion.identity).GetComponent<ChariotAoeController>();
aoe.SetEffect(TeleportEffectData, null, null); aoe.SetEffect(TeleportEffectData, null, null);
// 텔레포트 타겟 위치로 이동 // 텔레포트 타겟 위치로 이동
Agent.Warp(teleportTargetPosition); Agent.Warp(teleportTargetPosition);
SetAnimation(Telepo); SetAnimation(Telepo);
if (teleportEffectPrefab != null) var endTelepoEffect = Instantiate(teleportEffectPrefab, teleportTargetPosition, Quaternion.identity);
Instantiate(teleportEffectPrefab, teleportTargetPosition, Quaternion.identity);
StartCoroutine(DelayedEffectDestroyer(startTelepoEffect, endTelepoEffect));
}
private IEnumerator DelayedEffectDestroyer(GameObject effect, GameObject effect2)
{
yield return Wait.For(1f);
Destroy(effect);
yield return Wait.For(0.4f);
Destroy(effect2);
} }
private IEnumerator SlowFieldSpell() private IEnumerator SlowFieldSpell()