diff options
Diffstat (limited to 'Assets')
| -rw-r--r-- | Assets/ActionTool/Editor/ActionColliderEditor.cs | 4 | ||||
| -rw-r--r-- | Assets/Scripts/Unit/Collider/ColliderAttributes.cs | 10 | ||||
| -rw-r--r-- | Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs | 6 |
3 files changed, 11 insertions, 9 deletions
diff --git a/Assets/ActionTool/Editor/ActionColliderEditor.cs b/Assets/ActionTool/Editor/ActionColliderEditor.cs index 69f6a372..adb8819f 100644 --- a/Assets/ActionTool/Editor/ActionColliderEditor.cs +++ b/Assets/ActionTool/Editor/ActionColliderEditor.cs @@ -118,7 +118,7 @@ namespace ActionTool WhenAttribute when = attr as WhenAttribute;
string conditionName = when.conditionName;
FieldInfo condition = type.GetField(conditionName);
- if ((int)condition.GetValue(collider) != when.value)
+ if ((float)condition.GetValue(collider) != when.value)
{
skip = true;
break;
@@ -129,7 +129,7 @@ namespace ActionTool WhenNotAttribute when = attr as WhenNotAttribute;
string conditionName = when.conditionName;
FieldInfo condition = type.GetField(conditionName);
- if ((int)condition.GetValue(collider) == when.value)
+ if ((float)condition.GetValue(collider) == when.value)
{
skip = true;
break;
diff --git a/Assets/Scripts/Unit/Collider/ColliderAttributes.cs b/Assets/Scripts/Unit/Collider/ColliderAttributes.cs index a39b6961..3f3db4c5 100644 --- a/Assets/Scripts/Unit/Collider/ColliderAttributes.cs +++ b/Assets/Scripts/Unit/Collider/ColliderAttributes.cs @@ -39,26 +39,24 @@ public class IfNotAttribute : Attribute public class WhenAttribute : Attribute { - public WhenAttribute(string name, int value) + public WhenAttribute(string name, float value) { this.conditionName = name; } public string conditionName; - public int value; + public float value; } - - public class WhenNotAttribute : Attribute { - public WhenNotAttribute(string name, int value) + public WhenNotAttribute(string name, float value) { this.conditionName = name; } public string conditionName; - public int value; + public float value; } public class CommentAttribute : Attribute diff --git a/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs b/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs index 83dec0bb..be0749fd 100644 --- a/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs +++ b/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs @@ -47,11 +47,15 @@ public partial class ColliderBox [Comment("[ 击中效果 ]", TextAnchor.MiddleCenter)]
- [Foldout("顿帧", 2)]
+ [Foldout("时间效果", 2)]
[Tooltip("自身顿帧")]
public float freezeFramesSelf;
+ //[WhenNot("freezeFramesSelf", 0)]
+ //public AnimationCurve freezeFramesSelfCurve;
[Tooltip("对方顿帧")]
public float freezeFramesOther;
+ //[WhenNot("freezeFramesOther", 0)]
+ //public AnimationCurve freezeFramesOtherCurve;
[Foldout("粒子效果", 10)]
[Tooltip("击中后的粒子效果")] |