From fa1bf29ae80ea7ac929c67a1326d340bdc61b376 Mon Sep 17 00:00:00 2001 From: fiore Date: Tue, 13 May 2025 11:15:10 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[fix]=20=EB=A7=88=EB=B2=95=EC=82=AC=20?= =?UTF-8?q?=EC=8A=A4=ED=8E=A0=20=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4?= =?UTF-8?q?=EC=85=98,=20SFX=20=ED=83=80=EC=9D=B4=EB=B0=8D=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Character/Enemy/CasterDemonController.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Assets/Scripts/Character/Enemy/CasterDemonController.cs b/Assets/Scripts/Character/Enemy/CasterDemonController.cs index e04f27ee..3aa6c17c 100644 --- a/Assets/Scripts/Character/Enemy/CasterDemonController.cs +++ b/Assets/Scripts/Character/Enemy/CasterDemonController.cs @@ -280,13 +280,13 @@ public class CasterDemonController : EnemyController // 1. 시전 애니메이션 transform.LookAt(aimPosition); SetAnimation(Cast); - SFXPlayer(slowFieldSound); + // 2. 장판 생성과 세팅 var fixedPos = new Vector3(aimPosition.x, aimPosition.y, aimPosition.z); var warning = Instantiate(chariotWarning, fixedPos, Quaternion.identity).GetComponent(); - warning.SetEffect(SlowFieldEffectData, null, null); + warning.SetEffect(SlowFieldEffectData, () => { SFXPlayer(slowFieldSound);}, null); // 3. 짧은 텀 후 끝내기 yield return Wait.For(1f); @@ -294,13 +294,10 @@ public class CasterDemonController : EnemyController private IEnumerator KnockbackSpell() { - // 시전 애니메이션 - SetAnimation(Spin); - SFXPlayer(spinSound); - - // 넉백 발생 var knockback = Instantiate(chariotWarning, transform).GetComponent(); - knockback.SetEffect(KnockbackData, null, null, DebuffType.Knockback.ToString()); + knockback.SetEffect(KnockbackData, ()=>{ + SetAnimation(Spin); + SFXPlayer(spinSound);}, null, DebuffType.Knockback.ToString()); yield return Wait.For(1f); } From 0efe56ad42dda69563d57ca0b8bc16ab85daec13 Mon Sep 17 00:00:00 2001 From: fiore Date: Tue, 13 May 2025 13:36:50 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[fix]=20=EC=9E=A5=ED=8C=90=20=EB=A7=88?= =?UTF-8?q?=EB=B2=95=20=EC=BA=90=EC=8A=A4=ED=8C=85=20=EC=95=A0=EB=8B=88?= =?UTF-8?q?=EB=A9=94=EC=9D=B4=EC=85=98=20=ED=83=80=EC=9D=B4=EB=B0=8D=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DEG-62 --- .../Character/Enemy/CasterDemonController.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Assets/Scripts/Character/Enemy/CasterDemonController.cs b/Assets/Scripts/Character/Enemy/CasterDemonController.cs index 3aa6c17c..56c09c46 100644 --- a/Assets/Scripts/Character/Enemy/CasterDemonController.cs +++ b/Assets/Scripts/Character/Enemy/CasterDemonController.cs @@ -277,18 +277,20 @@ public class CasterDemonController : EnemyController private IEnumerator SlowFieldSpell() { var aimPosition = TargetPosOracle(out var basePos, out var rb); - // 1. 시전 애니메이션 + transform.LookAt(aimPosition); - SetAnimation(Cast); - - // 2. 장판 생성과 세팅 + // 장판 생성과 세팅 var fixedPos = new Vector3(aimPosition.x, aimPosition.y, aimPosition.z); var warning = Instantiate(chariotWarning, fixedPos, Quaternion.identity).GetComponent(); - warning.SetEffect(SlowFieldEffectData, () => { SFXPlayer(slowFieldSound);}, null); + warning.SetEffect(SlowFieldEffectData, () => + { + SetAnimation(Cast); + SFXPlayer(slowFieldSound); + }, null); - // 3. 짧은 텀 후 끝내기 + // 짧은 텀 후 끝내기 yield return Wait.For(1f); } From 396f625ac8cf58ea8885db9dd8788625a830d9e1 Mon Sep 17 00:00:00 2001 From: fiore Date: Tue, 13 May 2025 13:44:50 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[fix]=20=EB=A7=88=EB=B2=95=EC=82=AC=20?= =?UTF-8?q?=EB=A7=A4=EC=A7=81=EB=AF=B8=EC=82=AC=EC=9D=BC=20=EB=B0=9C?= =?UTF-8?q?=EC=82=AC=20=EC=9C=84=EC=B9=98=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 하단으로 조정하여 플레이어 머리 위로 날아가지 않도록 조정 DEG-62 --- Assets/JYY/Prefabs/Alien Big Blink.prefab | 4 ++-- Assets/JYY/Scenes/MonsterTest.unity | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/JYY/Prefabs/Alien Big Blink.prefab b/Assets/JYY/Prefabs/Alien Big Blink.prefab index d0829083..a773ae34 100644 --- a/Assets/JYY/Prefabs/Alien Big Blink.prefab +++ b/Assets/JYY/Prefabs/Alien Big Blink.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:957feb878cd80c20a3dc70cfb66c740204db8155c97835537e39de8730221fdc -size 77283 +oid sha256:dfd903c1aeeb5a94942b711769cdf0466e1f9d045ece4136273a665742493e52 +size 77259 diff --git a/Assets/JYY/Scenes/MonsterTest.unity b/Assets/JYY/Scenes/MonsterTest.unity index 1afc100f..9923e4bf 100644 --- a/Assets/JYY/Scenes/MonsterTest.unity +++ b/Assets/JYY/Scenes/MonsterTest.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e8d721e4d0b53d0d1f036e49add6145b037d53c26f1d05c02f1526eca8923fd -size 23594 +oid sha256:41fff336c7ddea02b8494fd1b922c447e7093a98c8a2cbf9b61ff1ee18c315da +size 22653 From 00fee9d6a28e210a68b6da48077011638e616adf Mon Sep 17 00:00:00 2001 From: fiore Date: Tue, 13 May 2025 16:40:04 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[fix]=20=ED=94=BC=EA=B2=A9=20=EB=B2=94?= =?UTF-8?q?=EC=9C=84=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 레이 캐스트에서 구형 캐스트로 변경함 DEG-62 --- .../JYY/Prefabs/Bullets/Magic Missaile.prefab | 2 +- .../Character/Enemy/Bullet/BulletBase.cs | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Assets/JYY/Prefabs/Bullets/Magic Missaile.prefab b/Assets/JYY/Prefabs/Bullets/Magic Missaile.prefab index c7bbc27d..a06b9f98 100644 --- a/Assets/JYY/Prefabs/Bullets/Magic Missaile.prefab +++ b/Assets/JYY/Prefabs/Bullets/Magic Missaile.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d51e7bbc994507d09d8e41c524596021b31347e399b76074317e2fa3b19fbbc2 +oid sha256:f2ca28b16f1e9e6161b75435af51d2f18fae41effe525d00ab1eb6746f5235cb size 10895 diff --git a/Assets/Scripts/Character/Enemy/Bullet/BulletBase.cs b/Assets/Scripts/Character/Enemy/Bullet/BulletBase.cs index 788d8b55..3020b535 100644 --- a/Assets/Scripts/Character/Enemy/Bullet/BulletBase.cs +++ b/Assets/Scripts/Character/Enemy/Bullet/BulletBase.cs @@ -51,9 +51,15 @@ public class BulletBase : MonoBehaviour float moveDist = _speed * Time.deltaTime; // 1) Raycast 충돌 검사 - if (Physics.Raycast(_prevPosition, _direction, out RaycastHit hit, moveDist, _targetLayer)) + if (Physics.SphereCast( + _prevPosition, + 1, + _direction, + out RaycastHit hit, + moveDist, + _targetLayer + )) { - // 닿은 지점으로 이동 transform.position = hit.point; OnBulletHit(hit); return; @@ -85,4 +91,11 @@ public class BulletBase : MonoBehaviour Debug.Log("## Bullet destroyed"); Destroy(gameObject); } + + // 기즈모로 반지름 시각화 + private void OnDrawGizmosSelected() + { + Gizmos.color = Color.red; + Gizmos.DrawWireSphere(transform.position, 1); + } } \ No newline at end of file