diff options
Diffstat (limited to 'Assets/Scripts/Test')
-rw-r--r-- | Assets/Scripts/Test/SaionjiScript.cs | 2 | ||||
-rw-r--r-- | Assets/Scripts/Test/SaionjiScript_Ability.cs | 2 | ||||
-rw-r--r-- | Assets/Scripts/Test/SaionjiScript_Anim.cs | 2 | ||||
-rw-r--r-- | Assets/Scripts/Test/SaionjiScript_Physics.cs | 49 |
4 files changed, 4 insertions, 51 deletions
diff --git a/Assets/Scripts/Test/SaionjiScript.cs b/Assets/Scripts/Test/SaionjiScript.cs index 03dfbf8d..10f2e9e3 100644 --- a/Assets/Scripts/Test/SaionjiScript.cs +++ b/Assets/Scripts/Test/SaionjiScript.cs @@ -2,7 +2,7 @@ using System.Collections.Generic;
using UnityEngine;
-public partial class SaionjiScript : MonoBehaviour, IInteractable
+public partial class SaionjiScript : Avatar
{
HitBoxTest hitbox;
Animator animator;
diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs b/Assets/Scripts/Test/SaionjiScript_Ability.cs index 10f358e4..32859b8d 100644 --- a/Assets/Scripts/Test/SaionjiScript_Ability.cs +++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs @@ -2,7 +2,7 @@ using System.Collections.Generic;
using UnityEngine;
-public partial class SaionjiScript : MonoBehaviour
+public partial class SaionjiScript : Avatar
{
/// <summary>
/// ability system
diff --git a/Assets/Scripts/Test/SaionjiScript_Anim.cs b/Assets/Scripts/Test/SaionjiScript_Anim.cs index 5dec9db6..9b7bfca5 100644 --- a/Assets/Scripts/Test/SaionjiScript_Anim.cs +++ b/Assets/Scripts/Test/SaionjiScript_Anim.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -public partial class SaionjiScript : MonoBehaviour +public partial class SaionjiScript : Avatar { int Anim_Idle; int Anim_Run; diff --git a/Assets/Scripts/Test/SaionjiScript_Physics.cs b/Assets/Scripts/Test/SaionjiScript_Physics.cs index 1b296f43..b6fcb393 100644 --- a/Assets/Scripts/Test/SaionjiScript_Physics.cs +++ b/Assets/Scripts/Test/SaionjiScript_Physics.cs @@ -2,54 +2,7 @@ using System.Collections.Generic; using UnityEngine; -public partial class SaionjiScript : MonoBehaviour, IInteractable +public partial class SaionjiScript : Avatar { - public PhysicsBox[] m_Hitbox; - public PhysicsBox[] m_Hurtbox; - public PhysicsBody m_Body; - public PhysicsBox m_BodyCollider; - public PhysicsPrimitive[] GetAllPrimitive() - { - throw new System.NotImplementedException(); - } - - public PhysicsBox GetHitbox() - { - throw new System.NotImplementedException(); - } - - public PhysicsBox GetHurtbox() - { - throw new System.NotImplementedException(); - } - - public PhysicsPrimitive[] GetAllHit() - { - throw new System.NotImplementedException(); - } - - public bool IsHit() - { - for(int i = 0;i < m_Hitbox.Length; ++i) - { - if(PhysicsWorld.Instance.HasCollision(m_Hitbox[i])) - { - return true; - } - } - return false; - } - - public bool IsHurt() - { - for (int i = 0; i < m_Hitbox.Length; ++i) - { - if (PhysicsWorld.Instance.HasCollision(m_Hurtbox[i])) - { - return true; - } - } - return false; - } } |