Browse Source

Tidied up Portrait scripts folder, renamed Stage command to ControlStage #84

master
chrisgregan 10 years ago
parent
commit
301609de56
  1. 2
      Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs
  2. 4
      Assets/Fungus/Portrait/Editor/StageEditor.cs
  3. 5
      Assets/Fungus/Portrait/Scripts/Commands.meta
  4. 4
      Assets/Fungus/Portrait/Scripts/Commands/ControlStage.cs
  5. 0
      Assets/Fungus/Portrait/Scripts/Commands/ControlStage.cs.meta
  6. 0
      Assets/Fungus/Portrait/Scripts/Commands/Portrait.cs
  7. 0
      Assets/Fungus/Portrait/Scripts/Commands/Portrait.cs.meta

2
Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs

@ -26,7 +26,6 @@ namespace Fungus
protected virtual void OnEnable() protected virtual void OnEnable()
{ {
descriptionProp = serializedObject.FindProperty("description"); descriptionProp = serializedObject.FindProperty("description");
defaultPortraitStageProp = serializedObject.FindProperty("defaultPortraitStage");
colorCommandsProp = serializedObject.FindProperty("colorCommands"); colorCommandsProp = serializedObject.FindProperty("colorCommands");
hideComponentsProp = serializedObject.FindProperty("hideComponents"); hideComponentsProp = serializedObject.FindProperty("hideComponents");
runSlowDurationProp = serializedObject.FindProperty("runSlowDuration"); runSlowDurationProp = serializedObject.FindProperty("runSlowDuration");
@ -42,7 +41,6 @@ namespace Fungus
fungusScript.UpdateHideFlags(); fungusScript.UpdateHideFlags();
EditorGUILayout.PropertyField(descriptionProp); EditorGUILayout.PropertyField(descriptionProp);
EditorGUILayout.PropertyField(defaultPortraitStageProp);
EditorGUILayout.PropertyField(colorCommandsProp); EditorGUILayout.PropertyField(colorCommandsProp);
EditorGUILayout.PropertyField(hideComponentsProp); EditorGUILayout.PropertyField(hideComponentsProp);
EditorGUILayout.PropertyField(runSlowDurationProp); EditorGUILayout.PropertyField(runSlowDurationProp);

4
Assets/Fungus/Portrait/Editor/StageEditor.cs

@ -12,7 +12,7 @@ using Rotorz.ReorderableList;
namespace Fungus namespace Fungus
{ {
[CustomEditor (typeof(Stage))] [CustomEditor (typeof(ControlStage))]
public class StageEditor : CommandEditor public class StageEditor : CommandEditor
{ {
protected SerializedProperty displayProp; protected SerializedProperty displayProp;
@ -36,7 +36,7 @@ namespace Fungus
{ {
serializedObject.Update(); serializedObject.Update();
Stage t = target as Stage; ControlStage t = target as ControlStage;
// Format Enum names // Format Enum names
string[] displayLabels = StringFormatter.FormatEnumNames(t.display,"<None>"); string[] displayLabels = StringFormatter.FormatEnumNames(t.display,"<None>");

5
Assets/Fungus/Portrait/Scripts/Commands.meta

@ -0,0 +1,5 @@
fileFormatVersion: 2
guid: d788ef66df2204e64bb317a89edbd1a7
folderAsset: yes
DefaultImporter:
userData:

4
Assets/Fungus/Portrait/Scripts/Stage.cs → Assets/Fungus/Portrait/Scripts/Commands/ControlStage.cs

@ -19,9 +19,9 @@ namespace Fungus
} }
[CommandInfo("Portrait", [CommandInfo("Portrait",
"Stage", "Control Stage",
"Controls the stage on which character portraits are displayed.")] "Controls the stage on which character portraits are displayed.")]
public class Stage : Command public class ControlStage : Command
{ {
[Tooltip("Display type")] [Tooltip("Display type")]
public StageDisplayType display; public StageDisplayType display;

0
Assets/Fungus/Portrait/Scripts/Stage.cs.meta → Assets/Fungus/Portrait/Scripts/Commands/ControlStage.cs.meta

0
Assets/Fungus/Portrait/Scripts/Portrait.cs → Assets/Fungus/Portrait/Scripts/Commands/Portrait.cs

0
Assets/Fungus/Portrait/Scripts/Portrait.cs.meta → Assets/Fungus/Portrait/Scripts/Commands/Portrait.cs.meta

Loading…
Cancel
Save