|
@@ -182,11 +182,7 @@ public class Bullet : MonoBehaviour
|
|
|
hitTrigger.owner.DebugAttackFrom(owner.name, curDamage);
|
|
hitTrigger.owner.DebugAttackFrom(owner.name, curDamage);
|
|
|
}
|
|
}
|
|
|
isGetTarget = true;
|
|
isGetTarget = true;
|
|
|
- if (!canStop)
|
|
|
|
|
- {
|
|
|
|
|
- gameObject.SetActive(false);
|
|
|
|
|
- }
|
|
|
|
|
- else
|
|
|
|
|
|
|
+ if (canStop && (hitTrigger.owner.gameObject.layer == 6 || hitTrigger.owner.gameObject.layer == 7))
|
|
|
{
|
|
{
|
|
|
rb.velocity = Vector3.zero;
|
|
rb.velocity = Vector3.zero;
|
|
|
rb.isKinematic = true;
|
|
rb.isKinematic = true;
|
|
@@ -204,7 +200,10 @@ public class Bullet : MonoBehaviour
|
|
|
bs.SetDisappearTime(stopTime);
|
|
bs.SetDisappearTime(stopTime);
|
|
|
enabled = false;
|
|
enabled = false;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ gameObject.SetActive(false);
|
|
|
|
|
+ }
|
|
|
break;
|
|
break;
|
|
|
case BulletType.Penetrate:
|
|
case BulletType.Penetrate:
|
|
|
hitTrigger.BeHit(curDamage, force * (-transform.right), changeHurt, repelValue);
|
|
hitTrigger.BeHit(curDamage, force * (-transform.right), changeHurt, repelValue);
|