|
@@ -122,6 +122,11 @@ public class Bullet : MonoBehaviour
|
|
|
{
|
|
{
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
+ if(bulletType == BulletType.Single && (other.CompareTag("Platform")|| other.CompareTag("Ground")))
|
|
|
|
|
+ {
|
|
|
|
|
+ gameObject.SetActive(false);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
BeHitTrigger hitTrigger = other.GetComponent<BeHitTrigger>();
|
|
BeHitTrigger hitTrigger = other.GetComponent<BeHitTrigger>();
|
|
|
if (hitTrigger != null)
|
|
if (hitTrigger != null)
|
|
|
{
|
|
{
|
|
@@ -139,7 +144,6 @@ public class Bullet : MonoBehaviour
|
|
|
trigedObjs.Add(hitTrigger);
|
|
trigedObjs.Add(hitTrigger);
|
|
|
if (Util.CheckCanHit(owner.tag, hitTrigger.owner.tag) && !hitTrigger.owner.isDie)
|
|
if (Util.CheckCanHit(owner.tag, hitTrigger.owner.tag) && !hitTrigger.owner.isDie)
|
|
|
{
|
|
{
|
|
|
- float dir = transform.position.x < hitTrigger.transform.position.x ? -1 : 1;
|
|
|
|
|
switch (bulletType)
|
|
switch (bulletType)
|
|
|
{
|
|
{
|
|
|
case BulletType.Single:
|
|
case BulletType.Single:
|
|
@@ -159,7 +163,7 @@ public class Bullet : MonoBehaviour
|
|
|
hitTrigger.owner.DebugAttackFrom(owner.name, attackInfo.damage);
|
|
hitTrigger.owner.DebugAttackFrom(owner.name, attackInfo.damage);
|
|
|
}
|
|
}
|
|
|
isGetTarget = true;
|
|
isGetTarget = true;
|
|
|
- if (canStop && (hitTrigger.owner.gameObject.layer == 6 || hitTrigger.owner.gameObject.layer == 7))
|
|
|
|
|
|
|
+ if (canStop && (hitTrigger.owner.CompareTag("Player") || hitTrigger.owner.CompareTag("Demonic")))
|
|
|
{
|
|
{
|
|
|
rb.velocity = Vector3.zero;
|
|
rb.velocity = Vector3.zero;
|
|
|
rb.isKinematic = true;
|
|
rb.isKinematic = true;
|