diff options
Diffstat (limited to 'Assets/ActionTool')
| -rw-r--r-- | Assets/ActionTool/Editor/ActionData.cs | 4 | ||||
| -rw-r--r-- | Assets/ActionTool/Editor/ActionEditor.cs | 6 | ||||
| -rw-r--r-- | Assets/ActionTool/Editor/ActionPreviewEditor.cs | 8 | ||||
| -rw-r--r-- | Assets/ActionTool/Editor/AnimationParameterEditor.cs | 4 |
4 files changed, 16 insertions, 6 deletions
diff --git a/Assets/ActionTool/Editor/ActionData.cs b/Assets/ActionTool/Editor/ActionData.cs index 600eccc5..85b0cc6e 100644 --- a/Assets/ActionTool/Editor/ActionData.cs +++ b/Assets/ActionTool/Editor/ActionData.cs @@ -50,7 +50,9 @@ namespace ActionTool private float m_PrevNormalTime;
- private bool m_NotApplyCurve;
+ private bool m_NotApplyCurves;
+ public bool applyCurves { get { return !m_NotApplyCurves; } set { m_NotApplyCurves = !value; } } // 是否开启curve控制速度
+ private bool m_NotApplyCurve;
public bool applyCurve { get { return !m_NotApplyCurve; } set { m_NotApplyCurve = !value; } } // 是否开启curve控制速度
private bool m_NotApplyRM;
public bool applyRootMotion { get { return !m_NotApplyRM; } set { m_NotApplyRM = !value; } }
diff --git a/Assets/ActionTool/Editor/ActionEditor.cs b/Assets/ActionTool/Editor/ActionEditor.cs index d94806ad..10706fb4 100644 --- a/Assets/ActionTool/Editor/ActionEditor.cs +++ b/Assets/ActionTool/Editor/ActionEditor.cs @@ -44,6 +44,12 @@ namespace ActionTool GUILayout.Space(5);
}
+ public enum Foo
+ {
+ A =0,
+ B= 0,
+ }
+
private void GUI_SelectUnit()
{
diff --git a/Assets/ActionTool/Editor/ActionPreviewEditor.cs b/Assets/ActionTool/Editor/ActionPreviewEditor.cs index 938ffd39..4ed289cc 100644 --- a/Assets/ActionTool/Editor/ActionPreviewEditor.cs +++ b/Assets/ActionTool/Editor/ActionPreviewEditor.cs @@ -387,10 +387,12 @@ namespace ActionTool float x = 5;
action.applyRootMotion = GUI.Toggle(new Rect(x, y, 120, 15), action.applyRootMotion, "Apply RootMotion", styles.toggleSmallBold);
- x += 130;
- action.applyCurve = GUI.Toggle(new Rect(x, y, 120, 15), action.applyCurve, "Apply SpeedCurve", styles.toggleSmallBold);
+ x += 130;
+ action.applyCurve = GUI.Toggle(new Rect(x, y, 120, 15), action.applyCurve, "Apply SpeedCurve", styles.toggleSmallBold);
+ x += 130;
+ action.applyCurves = GUI.Toggle(new Rect(x, y, 120, 15), action.applyCurves, "Apply Curves", styles.toggleSmallBold);
- y += 20;
+ y += 20;
}
Vector2 scrollPos = Vector2.zero;
diff --git a/Assets/ActionTool/Editor/AnimationParameterEditor.cs b/Assets/ActionTool/Editor/AnimationParameterEditor.cs index 4a382170..a62ea4a1 100644 --- a/Assets/ActionTool/Editor/AnimationParameterEditor.cs +++ b/Assets/ActionTool/Editor/AnimationParameterEditor.cs @@ -17,8 +17,8 @@ namespace ActionTool private void OnEnable() { titleContent = new GUIContent("Parameters"); - maxSize = new Vector2(300, 200); - minSize = maxSize; + minSize = new Vector2(300, 200); + maxSize = new Vector2(300, 2000); } private void OnDisable() |