|
@@ -77,10 +77,9 @@ public class SoulBoom : MonoBehaviour
|
|
|
BeHitTrigger beHitTrigger = other.GetComponent<BeHitTrigger>();
|
|
BeHitTrigger beHitTrigger = other.GetComponent<BeHitTrigger>();
|
|
|
if (beHitTrigger != null)
|
|
if (beHitTrigger != null)
|
|
|
{
|
|
{
|
|
|
- if(other.transform.parent.parent.parent.gameObject.layer == 6
|
|
|
|
|
- || other.transform.parent.parent.parent.gameObject.layer == 7)
|
|
|
|
|
|
|
+ if(beHitTrigger.owner.tag == "Demonic" || beHitTrigger.owner.tag == "Player")
|
|
|
{
|
|
{
|
|
|
- if (other.transform.parent.parent.parent.gameObject.layer == 6 && isInVain)
|
|
|
|
|
|
|
+ if (beHitTrigger.owner.tag == "Player" && isInVain)
|
|
|
{
|
|
{
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
@@ -109,8 +108,7 @@ public class SoulBoom : MonoBehaviour
|
|
|
{
|
|
{
|
|
|
BeHitTrigger beHitTrigger = other.GetComponent<BeHitTrigger>();
|
|
BeHitTrigger beHitTrigger = other.GetComponent<BeHitTrigger>();
|
|
|
if (beHitTrigger != null
|
|
if (beHitTrigger != null
|
|
|
- && (other.transform.parent.parent.parent.gameObject.layer == 6
|
|
|
|
|
- || other.transform.parent.parent.parent.gameObject.layer == 7))
|
|
|
|
|
|
|
+ && (beHitTrigger.owner.tag == "Demonic" || beHitTrigger.owner.tag == "Player"))
|
|
|
{
|
|
{
|
|
|
MoveCharacter character = other.GetComponentInParent<MoveCharacter>();
|
|
MoveCharacter character = other.GetComponentInParent<MoveCharacter>();
|
|
|
if (characters.Exists(t => t == character))
|
|
if (characters.Exists(t => t == character))
|