diff options
Diffstat (limited to 'Erika/Assets/Scripts/Unit/Components')
3 files changed, 20 insertions, 14 deletions
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs b/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs index 48ec46bb..6858fe74 100644 --- a/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs +++ b/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs @@ -8,18 +8,19 @@ public class UnitCollider : UnitComponent { public bool showGizmos; - private Dictionary<int/*hitbox hash*/, List<int/*unitController hash*/>> m_HitMask = new Dictionary<int, List<int>>(); + [System.Obsolete("废弃")] + private Dictionary<int/*hitbox hash*/, List<int/*unitController hash*/>> m_HitMask = new Dictionary<int, List<int>>(); public override void Awake() { base.Awake(); - ColliderRegistry.Instance.AddCollider(this); + //ColliderRegistry.Instance.AddCollider(this); } public override void OnDestroy() { - ColliderRegistry.Instance.RemoveCollider(this); + //ColliderRegistry.Instance.RemoveCollider(this); base.OnDestroy(); } @@ -30,7 +31,12 @@ public class UnitCollider : UnitComponent showGizmos = true; } - // 返回当前激活的对应类型的碰撞盒数据 + /// <summary> + /// 返回当前激活的对应类型的碰撞盒数据 + /// </summary> + /// <param name="type"></param> + /// <param name="layer"></param> + /// <returns></returns> public ColliderInfo[] GetCurrentBoxesInfoByType(ColliderBox.EColliderType type, int layer = 0) { AnimationData animData = m_Owner.unitAnimation.animationData; @@ -40,12 +46,16 @@ public class UnitCollider : UnitComponent return infos; } - // 动作切换，重置collider mask - public void OnAnimationChange() + /// <summary> + /// 动作切换，重置collider mask + /// </summary> + [System.Obsolete("废弃")] + public void OnAnimationChange() { m_HitMask.Clear(); } + [System.Obsolete("废弃")] public void RecordCollision(int colliderHash, int targetHash) { List<int> record; @@ -57,6 +67,7 @@ public class UnitCollider : UnitComponent record.Add(targetHash); } + [System.Obsolete("废弃")] public bool CanCollide(int colliderHash, int targetHash) { List<int> record; diff --git a/Erika/Assets/Scripts/Unit/Components/UnitPhysicsBoxCollection.cs b/Erika/Assets/Scripts/Unit/Components/UnitPhysicsBoxCollection.cs index ef4676a4..b3d0c580 100644 --- a/Erika/Assets/Scripts/Unit/Components/UnitPhysicsBoxCollection.cs +++ b/Erika/Assets/Scripts/Unit/Components/UnitPhysicsBoxCollection.cs @@ -2,6 +2,9 @@ using System.Collections.Generic;
using UnityEngine;
+/// <summary>
+/// 角色身体上所有trigger集合
+/// </summary>
public class UnitPhysicsBoxCollection : UnitComponent
{
// 列表里不一定按顺序存储
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/CyberAngel.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/CyberAngel.meta deleted file mode 100644 index 13682d7f..00000000 --- a/Erika/Assets/Scripts/Unit/Components/UnitState/CyberAngel.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fa5eb9b1f1ac0184b9daa4cab5baaf64 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: |