Compare commits

..

No commits in common. "f2a18345899ab9cefc7a225ca480f967ae7c1512" and "456cc8dafbea06dd4a5e3203063056554e60a599" have entirely different histories.

6 changed files with 22 additions and 33 deletions

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

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

View File

@ -28,7 +28,7 @@ public class VerticalAoeController : AoeControllerBase
protected override void HitCheck()
{
// 박스 판정 (사각형 직선)
Vector3 halfExtents = new Vector3(_data.radius, 1f, _data.radius * 2f) * 0.5f;
Vector3 halfExtents = new Vector3(_data.radius, 1f, _data.radius * 2f);
Collider[] hits = Physics.OverlapBox(transform.position, halfExtents, transform.rotation, _data.targetLayer);
foreach (var hit in hits)
@ -47,7 +47,7 @@ public class VerticalAoeController : AoeControllerBase
private void OnDrawGizmosSelected()
{
Gizmos.color = Color.yellow;
Gizmos.color = Color.red;
Vector3 center = transform.position;
Vector3 size = new Vector3(_data.radius, 1f, _data.radius * 2f);
Gizmos.matrix = Matrix4x4.TRS(center, transform.rotation, Vector3.one);

View File

@ -26,9 +26,6 @@ public class BulletBase : MonoBehaviour
// 내부용
private Vector3 _direction = Vector3.forward;
private float _timer;
private Vector3 _prevPosition;
[SerializeField] private LayerMask _targetLayer;
public virtual void Initialize(BulletData bulletData)
{
@ -43,41 +40,31 @@ public class BulletBase : MonoBehaviour
transform.rotation = Quaternion.LookRotation(_direction);
_timer = 0f;
_prevPosition = transform.position;
}
private void Update()
{
float moveDist = _speed * Time.deltaTime;
// 1) 이동
transform.position += _direction * (_speed * Time.deltaTime);
// 1) Raycast 충돌 검사
if (Physics.Raycast(_prevPosition, _direction, out RaycastHit hit, moveDist, _targetLayer))
{
// 닿은 지점으로 이동
transform.position = hit.point;
OnBulletHit(hit);
return;
}
// 2) 실제 이동
transform.position += _direction * moveDist;
_prevPosition = transform.position;
// 3) 수명 검사
// 2) 수명 카운트
_timer += Time.deltaTime;
if (_timer >= _lifeTime)
{
DestroyBullet();
}
}
private void OnBulletHit(RaycastHit hit)
private void OnTriggerEnter(Collider other)
{
PlayerController playerController = hit.transform.GetComponent<PlayerController>();
Debug.Log(hit.transform.name);
if (playerController != null)
// TODO: 주인공 캐릭터를 찾는 로직 추가 필요
// 주인공 스크립트를 찾아 처리할 것.
var character = other.GetComponent<CharacterBase>();
if (character != null)
{
playerController.TakeDamage(_damage);
character.TakeDamage(_damage);
DestroyBullet();
}
DestroyBullet();
}
protected virtual void DestroyBullet()

View File

@ -5,6 +5,8 @@ using Random = UnityEngine.Random;
public class CasterDemonController : EnemyController
{
// Animation
public static readonly int Cast = Animator.StringToHash("Cast");
public static readonly int Flee = Animator.StringToHash("Flee");