diff options
Diffstat (limited to 'Assets/ActionTool')
| -rw-r--r-- | Assets/ActionTool/ActionTool Settings.asset | 4 | ||||
| -rw-r--r-- | Assets/ActionTool/Editor/ActionEventEditor.cs | 162 |
2 files changed, 106 insertions, 60 deletions
diff --git a/Assets/ActionTool/ActionTool Settings.asset b/Assets/ActionTool/ActionTool Settings.asset index a49f5e71..0e104412 100644 --- a/Assets/ActionTool/ActionTool Settings.asset +++ b/Assets/ActionTool/ActionTool Settings.asset @@ -30,12 +30,13 @@ MonoBehaviour: - EventBulletTime - EventMesh_FadeIn - EventMesh_FadeOut + - EventGame_TimeScale eventColors: - {r: 0, g: 0, b: 0, a: 1} - {r: 0, g: 0, b: 0, a: 1} - {r: 0, g: 0, b: 0, a: 1} - {r: 0, g: 0, b: 0, a: 1} - - {r: 0, g: 0, b: 0, a: 1} + - {r: 0.5343158, g: 0.3037113, b: 0.8584906, a: 1} - {r: 0, g: 0, b: 0, a: 1} - {r: 0, g: 0, b: 0, a: 1} - {r: 0, g: 0, b: 0, a: 1} @@ -48,3 +49,4 @@ MonoBehaviour: - {r: 0, g: 0, b: 0, a: 1} - {r: 0.3773585, g: 0.21537913, b: 0.21537913, a: 1} - {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1} + - {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/ActionTool/Editor/ActionEventEditor.cs b/Assets/ActionTool/Editor/ActionEventEditor.cs index a2aefbf6..50b697e4 100644 --- a/Assets/ActionTool/Editor/ActionEventEditor.cs +++ b/Assets/ActionTool/Editor/ActionEventEditor.cs @@ -102,65 +102,109 @@ namespace ActionTool {
tooltip = tooltipattr.tooltip;
}
- else if (attr.GetType() == typeof(DisallowModifiyInGUI))
- {
- GUI.enabled = false;
- }
- else if (attr.GetType() == typeof(WhenAttribute))
- {
- WhenAttribute when = attr as WhenAttribute;
- string conditionName = when.conditionName;
- FieldInfo condition = type.GetField(conditionName);
- if ((int)condition.GetValue(animEvent) != when.value)
- {
- skip = true;
- break;
- }
- }
- else if (attr.GetType() == typeof(WhenNotAttribute))
- {
- WhenNotAttribute when = attr as WhenNotAttribute;
- string conditionName = when.conditionName;
- FieldInfo condition = type.GetField(conditionName);
- if ((int)condition.GetValue(animEvent) == when.value)
- {
- skip = true;
- break;
- }
- }
- else if (attr.GetType() == typeof(IfAttribute))
- {
- IfAttribute when = attr as IfAttribute;
- string conditionName = when.conditionName;
- FieldInfo condition = type.GetField(conditionName);
- if (!(bool)condition.GetValue(animEvent))
- {
- skip = true;
- break;
- }
- }
- else if (attr.GetType() == typeof(IfNotAttribute))
- {
- IfNotAttribute when = attr as IfNotAttribute;
- string conditionName = when.conditionName;
- FieldInfo condition = type.GetField(conditionName);
- if ((bool)condition.GetValue(animEvent))
- {
- skip = true;
- break;
- }
- }
- else if (attr.GetType() == typeof(SpaceAttribute))
- {
- SpaceAttribute space = attr as SpaceAttribute;
- GUILayout.Space(space.height);
- }
- else if (attr.GetType() == typeof(CommentAttribute))
- {
- CommentAttribute comment = attr as CommentAttribute;
- EditorGUILayout.LabelField(comment.comment);
- }
- }
+ }
+ else if (attr.GetType() == typeof(DisallowModifiyInGUI))
+ {
+ GUI.enabled = false;
+ }
+ else if (attr.GetType() == typeof(WhenAttribute))
+ {
+ WhenAttribute when = attr as WhenAttribute;
+ string conditionName = when.conditionName;
+ FieldInfo condition = type.GetField(conditionName);
+ if ((int)condition.GetValue(animEvent) != when.value)
+ {
+ skip = true;
+ break;
+ }
+ }
+ else if (attr.GetType() == typeof(WhenNotAttribute))
+ {
+ WhenNotAttribute when = attr as WhenNotAttribute;
+ string conditionName = when.conditionName;
+ FieldInfo condition = type.GetField(conditionName);
+ if ((int)condition.GetValue(animEvent) == when.value)
+ {
+ skip = true;
+ break;
+ }
+ }
+ else if (attr.GetType() == typeof(IfAttribute))
+ {
+ IfAttribute when = attr as IfAttribute;
+ string conditionName = when.conditionName;
+ FieldInfo condition = type.GetField(conditionName);
+ if (!(bool)condition.GetValue(animEvent))
+ {
+ skip = true;
+ break;
+ }
+ }
+ else if (attr.GetType() == typeof(IfNotAttribute))
+ {
+ IfNotAttribute when = attr as IfNotAttribute;
+ string conditionName = when.conditionName;
+ FieldInfo condition = type.GetField(conditionName);
+ if ((bool)condition.GetValue(animEvent))
+ {
+ skip = true;
+ break;
+ }
+ }
+ else if (attr.GetType() == typeof(SpaceAttribute))
+ {
+ SpaceAttribute space = attr as SpaceAttribute;
+ GUILayout.Space(space.height);
+ }
+ else if (attr.GetType() == typeof(CommentAttribute))
+ {
+ CommentAttribute comment = attr as CommentAttribute;
+ EditorGUILayout.LabelField(comment.comment);
+ }
+ else if (attr.GetType() == typeof(WhenAttribute))
+ {
+ WhenAttribute when = attr as WhenAttribute;
+ string conditionName = when.conditionName;
+ FieldInfo condition = type.GetField(conditionName);
+ if ((float)condition.GetValue(animEvent) != when.value)
+ {
+ skip = true;
+ break;
+ }
+ }
+ else if (attr.GetType() == typeof(WhenNotAttribute))
+ {
+ WhenNotAttribute when = attr as WhenNotAttribute;
+ string conditionName = when.conditionName;
+ FieldInfo condition = type.GetField(conditionName);
+ if ((float)condition.GetValue(animEvent) == when.value)
+ {
+ skip = true;
+ break;
+ }
+ }
+ else if (attr.GetType() == typeof(IfAttribute))
+ {
+ IfAttribute when = attr as IfAttribute;
+ string conditionName = when.conditionName;
+ FieldInfo condition = type.GetField(conditionName);
+ if (!(bool)condition.GetValue(animEvent))
+ {
+ skip = true;
+ break;
+ }
+ }
+ else if (attr.GetType() == typeof(IfNotAttribute))
+ {
+ IfNotAttribute when = attr as IfNotAttribute;
+ string conditionName = when.conditionName;
+ FieldInfo condition = type.GetField(conditionName);
+ if ((bool)condition.GetValue(animEvent))
+ {
+ skip = true;
+ break;
+ }
+ }
}
if (skip)
{
|