diff options
Diffstat (limited to 'Assets')
5 files changed, 68 insertions, 6 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset index 72b6fe04..4f63709a 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Run(Clone) + m_Name: Run m_EditorClassIdentifier: animationName: Run animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Run.anim diff --git a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller index 5bd460df..6ee2f276 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller +++ b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorController.controller @@ -65,7 +65,7 @@ AnimatorController: m_Controller: {fileID: 0} - m_Name: IdleStatus m_Type: 1 - m_DefaultFloat: 0.4 + m_DefaultFloat: 0.8 m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} @@ -207,9 +207,9 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.13518895 + m_TransitionDuration: 0.07834961 m_TransitionOffset: 0 - m_ExitTime: 0.7449714 + m_ExitTime: 0.74497145 m_HasExitTime: 0 m_HasFixedDuration: 0 m_InterruptionSource: 0 @@ -669,7 +669,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: e76576c66f234104e870a20846c4c6fa, type: 3} + m_Motion: {fileID: 7400000, guid: 95c80bbb74677844aad0f268349b4743, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Scripts/Unit/Component/UnitCollider.cs b/Assets/Scripts/Unit/Component/UnitCollider.cs index 2630cb91..57585ba2 100644 --- a/Assets/Scripts/Unit/Component/UnitCollider.cs +++ b/Assets/Scripts/Unit/Component/UnitCollider.cs @@ -2,12 +2,43 @@ using System.Collections.Generic;
using UnityEngine;
+public class ColliderRegistry : Singleton<ColliderRegistry>
+{
+ public List<UnitCollider> colliders = new List<UnitCollider>();
+
+ public void AddCollider(UnitCollider collider)
+ {
+ if (!colliders.Contains(collider))
+ colliders.Add(collider);
+ }
+
+ public void RemoveCollider(UnitCollider collider)
+ {
+ if (colliders.Contains(collider))
+ colliders.Remove(collider);
+ }
+}
+
// 角色当前的碰撞盒
[DisallowMultipleComponent]
public class UnitCollider : UnitComponent
{
public bool showGizmos;
+ public override void Awake()
+ {
+ base.Awake();
+
+ ColliderRegistry.Instance.AddCollider(this);
+ }
+
+ public override void OnDestroy()
+ {
+ ColliderRegistry.Instance.RemoveCollider(this);
+
+ base.OnDestroy();
+ }
+
public override void Initialize()
{
base.Initialize();
diff --git a/Assets/Scripts/Unit/Component/UnitComponent.cs b/Assets/Scripts/Unit/Component/UnitComponent.cs index 6c8dc916..1e4df1fc 100644 --- a/Assets/Scripts/Unit/Component/UnitComponent.cs +++ b/Assets/Scripts/Unit/Component/UnitComponent.cs @@ -4,6 +4,8 @@ using UnityEngine; public class UnitComponent : MonoBehaviour
{
+ public UnitController owner { get { return m_Owner; } }
+
protected UnitController m_Owner;
public bool IsAlive
@@ -14,6 +16,14 @@ public class UnitComponent : MonoBehaviour }
}
+ public virtual void Awake()
+ {
+ }
+
+ public virtual void OnDestroy()
+ {
+ }
+
public virtual void Initialize()
{
m_Owner = GetComponent<UnitController>();
diff --git a/Assets/Scripts/Unit/Controller/UnitController.cs b/Assets/Scripts/Unit/Controller/UnitController.cs index b1e708bb..4169ca6a 100644 --- a/Assets/Scripts/Unit/Controller/UnitController.cs +++ b/Assets/Scripts/Unit/Controller/UnitController.cs @@ -2,7 +2,14 @@ using System.Collections.Generic;
using UnityEngine;
-public class UnitController : MonoBehaviour
+public interface Interactable
+{
+ void OnHit();
+ void OnHurt();
+ void OnGrab();
+}
+
+public class UnitController : MonoBehaviour, Interactable
{
// 角色共有的组件
@@ -88,4 +95,18 @@ public class UnitController : MonoBehaviour unitRootMotion.OnUpdate();
}
+ public void OnHit()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void OnHurt()
+ {
+ throw new System.NotImplementedException();
+ }
+
+ public void OnGrab()
+ {
+ throw new System.NotImplementedException();
+ }
}
|