|
|
@@ -88,8 +88,11 @@ public class SoulBoom : MonoBehaviour
|
|
|
}
|
|
|
private void OnTriggerEnter(Collider other)
|
|
|
{
|
|
|
+
|
|
|
BeHitTrigger beHitTrigger = other.GetComponent<BeHitTrigger>();
|
|
|
- if (!isTransfiguration && beHitTrigger != null && (other.gameObject.layer == 6 || other.gameObject.layer == 7))
|
|
|
+ if (beHitTrigger != null
|
|
|
+ && (other.transform.parent.parent.parent.gameObject.layer == 6
|
|
|
+ || other.transform.parent.parent.parent.gameObject.layer == 7))
|
|
|
{
|
|
|
MoveCharacter character = other.GetComponentInParent<MoveCharacter>();
|
|
|
if (character.rb == null)
|
|
|
@@ -102,29 +105,39 @@ public class SoulBoom : MonoBehaviour
|
|
|
characters.Add(character);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- if (isTransfiguration && beHitTrigger != null && other.gameObject.layer == 8)
|
|
|
- {
|
|
|
- MoveCharacter character = other.GetComponentInParent<MoveCharacter>();
|
|
|
- if (!characters.Exists(t => t == character))
|
|
|
- {
|
|
|
-
|
|
|
- characters.Add(character);
|
|
|
- }
|
|
|
- }
|
|
|
+ //if (!isTransfiguration && beHitTrigger != null
|
|
|
+ // && (other.transform.parent.parent.parent.gameObject.layer == 6
|
|
|
+ // || other.transform.parent.parent.parent.gameObject.layer == 7))
|
|
|
+ //{
|
|
|
+ // print(111);
|
|
|
+ // MoveCharacter character = other.GetComponentInParent<MoveCharacter>();
|
|
|
+ // if (character.rb == null)
|
|
|
+ // {
|
|
|
+ // character = character.transform.parent.GetComponent<MoveCharacter>();
|
|
|
+
|
|
|
+ // }
|
|
|
+ // if (!characters.Exists(t => t == character))
|
|
|
+ // {
|
|
|
+ // characters.Add(character);
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+
|
|
|
+ //if (isTransfiguration && beHitTrigger != null && other.transform.parent.parent.parent.gameObject.layer == 8)
|
|
|
+ //{
|
|
|
+ // MoveCharacter character = other.GetComponentInParent<MoveCharacter>();
|
|
|
+ // if (!characters.Exists(t => t == character))
|
|
|
+ // {
|
|
|
+
|
|
|
+ // characters.Add(character);
|
|
|
+ // }
|
|
|
+ //}
|
|
|
}
|
|
|
private void OnTriggerExit(Collider other)
|
|
|
{
|
|
|
BeHitTrigger beHitTrigger = other.GetComponent<BeHitTrigger>();
|
|
|
- if (!isTransfiguration && beHitTrigger != null && (other.gameObject.layer == 6 || other.gameObject.layer == 7))
|
|
|
- {
|
|
|
- MoveCharacter character = other.GetComponentInParent<MoveCharacter>();
|
|
|
- if (characters.Exists(t => t == character))
|
|
|
- {
|
|
|
- characters.Remove(character);
|
|
|
- }
|
|
|
- }
|
|
|
- if (isTransfiguration && beHitTrigger != null && other.gameObject.layer == 8)
|
|
|
+ if (beHitTrigger != null
|
|
|
+ && (other.transform.parent.parent.parent.gameObject.layer == 6
|
|
|
+ || other.transform.parent.parent.parent.gameObject.layer == 7))
|
|
|
{
|
|
|
MoveCharacter character = other.GetComponentInParent<MoveCharacter>();
|
|
|
if (characters.Exists(t => t == character))
|
|
|
@@ -132,5 +145,23 @@ public class SoulBoom : MonoBehaviour
|
|
|
characters.Remove(character);
|
|
|
}
|
|
|
}
|
|
|
+ //if (!isTransfiguration && beHitTrigger != null
|
|
|
+ // && (other.transform.parent.parent.parent.gameObject.layer == 6
|
|
|
+ // || other.transform.parent.parent.parent.gameObject.layer == 7))
|
|
|
+ //{
|
|
|
+ // MoveCharacter character = other.GetComponentInParent<MoveCharacter>();
|
|
|
+ // if (characters.Exists(t => t == character))
|
|
|
+ // {
|
|
|
+ // characters.Remove(character);
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+ //if (isTransfiguration && beHitTrigger != null && other.transform.parent.parent.parent.gameObject.layer == 8)
|
|
|
+ //{
|
|
|
+ // MoveCharacter character = other.GetComponentInParent<MoveCharacter>();
|
|
|
+ // if (characters.Exists(t => t == character))
|
|
|
+ // {
|
|
|
+ // characters.Remove(character);
|
|
|
+ // }
|
|
|
+ //}
|
|
|
}
|
|
|
}
|