KenSchae
/
fungus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fixed Set Anim Integer/Float/Bool lose property settings #492

master
Christopher 9 years ago
parent
49cd02c20b
commit
624f66f516
11 changed files with 27 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Assets/Fungus/Animation/Scripts/Commands/ResetAnimTrigger.cs
  2. 6
      Assets/Fungus/Animation/Scripts/Commands/SetAnimBool.cs
  3. 6
      Assets/Fungus/Animation/Scripts/Commands/SetAnimFloat.cs
  4. 6
      Assets/Fungus/Animation/Scripts/Commands/SetAnimInteger.cs
  5. 6
      Assets/Fungus/Animation/Scripts/Commands/SetAnimTrigger.cs
  6. 2
      Assets/Fungus/Audio/Scripts/Commands/PlayUsfxrSound.cs
  7. 2
      Assets/Fungus/Flowchart/Scripts/Commands/LoadScene.cs
  8. 2
      Assets/Fungus/Flowchart/Scripts/Commands/SendMessage.cs
  9. 2
      Assets/Fungus/Narrative/Scripts/Commands/SetLanguage.cs
  10. 2
      Assets/Fungus/iTween/Scripts/Commands/StopTween.cs
  11. 8
      Assets/Fungus/iTween/Scripts/Commands/iTweenCommand.cs

6
Assets/Fungus/Animation/Scripts/Commands/ResetAnimTrigger.cs
Unescape View File

@ -46,7 +46,7 @@ namespace Fungus
#region Backwards compatibility #region Backwards compatibility
[HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD;
[HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD = "";
protected virtual void OnEnable() protected virtual void OnEnable()
{ {
@ -56,10 +56,10 @@ namespace Fungus
animatorOLD = null; animatorOLD = null;
} }
if (parameterNameOLD != null) if (parameterNameOLD != "")
{ {
_parameterName.Value = parameterNameOLD; _parameterName.Value = parameterNameOLD;
parameterNameOLD = null; parameterNameOLD = "";
} }
} }

6
Assets/Fungus/Animation/Scripts/Commands/SetAnimBool.cs
Unescape View File

@ -49,7 +49,7 @@ namespace Fungus
#region Backwards compatibility #region Backwards compatibility
[HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD;
[HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD = "";
protected virtual void OnEnable() protected virtual void OnEnable()
{ {
@ -59,10 +59,10 @@ namespace Fungus
animatorOLD = null; animatorOLD = null;
} }
if (parameterNameOLD != null) if (parameterNameOLD != "")
{ {
_parameterName.Value = parameterNameOLD; _parameterName.Value = parameterNameOLD;
parameterNameOLD = null; parameterNameOLD = "";
} }
} }

6
Assets/Fungus/Animation/Scripts/Commands/SetAnimFloat.cs
Unescape View File

@ -49,7 +49,7 @@ namespace Fungus
#region Backwards compatibility #region Backwards compatibility
[HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD;
[HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD = "";
protected virtual void OnEnable() protected virtual void OnEnable()
{ {
@ -59,10 +59,10 @@ namespace Fungus
animatorOLD = null; animatorOLD = null;
} }
if (parameterNameOLD != null) if (parameterNameOLD != "")
{ {
_parameterName.Value = parameterNameOLD; _parameterName.Value = parameterNameOLD;
parameterNameOLD = null; parameterNameOLD = "";
} }
} }

6
Assets/Fungus/Animation/Scripts/Commands/SetAnimInteger.cs
Unescape View File

@ -49,7 +49,7 @@ namespace Fungus
#region Backwards compatibility #region Backwards compatibility
[HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD;
[HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD = "";
protected virtual void OnEnable() protected virtual void OnEnable()
{ {
@ -59,10 +59,10 @@ namespace Fungus
animatorOLD = null; animatorOLD = null;
} }
if (parameterNameOLD != null) if (parameterNameOLD != "")
{ {
_parameterName.Value = parameterNameOLD; _parameterName.Value = parameterNameOLD;
parameterNameOLD = null; parameterNameOLD = "";
} }
} }

6
Assets/Fungus/Animation/Scripts/Commands/SetAnimTrigger.cs
Unescape View File

@ -46,7 +46,7 @@ namespace Fungus
#region Backwards compatibility #region Backwards compatibility
[HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD;
[HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD = "";
protected virtual void OnEnable() protected virtual void OnEnable()
{ {
@ -56,10 +56,10 @@ namespace Fungus
animatorOLD = null; animatorOLD = null;
} }
if (parameterNameOLD != null) if (parameterNameOLD != "")
{ {
_parameterName.Value = parameterNameOLD; _parameterName.Value = parameterNameOLD;
parameterNameOLD = null; parameterNameOLD = "";
} }
} }

2
Assets/Fungus/Audio/Scripts/Commands/PlayUsfxrSound.cs
Unescape View File

@ -68,7 +68,7 @@
#region Backwards compatibility #region Backwards compatibility
[HideInInspector] [FormerlySerializedAs("SettingsString")] public String SettingsStringOLD; [HideInInspector] [FormerlySerializedAs("SettingsString")] public String SettingsStringOLD = "";
protected virtual void OnEnable() protected virtual void OnEnable()
{ {

2
Assets/Fungus/Flowchart/Scripts/Commands/LoadScene.cs
Unescape View File

@ -43,7 +43,7 @@ namespace Fungus
#region Backwards compatibility #region Backwards compatibility
[HideInInspector] [FormerlySerializedAs("sceneName")] public string sceneNameOLD; [HideInInspector] [FormerlySerializedAs("sceneName")] public string sceneNameOLD = "";
protected virtual void OnEnable() protected virtual void OnEnable()
{ {

2
Assets/Fungus/Flowchart/Scripts/Commands/SendMessage.cs
Unescape View File

@ -71,7 +71,7 @@ namespace Fungus
#region Backwards compatibility #region Backwards compatibility
[HideInInspector] [FormerlySerializedAs("message")] public string messageOLD; [HideInInspector] [FormerlySerializedAs("message")] public string messageOLD = "";
protected virtual void OnEnable() protected virtual void OnEnable()
{ {

2
Assets/Fungus/Narrative/Scripts/Commands/SetLanguage.cs
Unescape View File

@ -43,7 +43,7 @@ namespace Fungus
#region Backwards compatibility #region Backwards compatibility
[HideInInspector] [FormerlySerializedAs("languageCode")] public string languageCodeOLD; [HideInInspector] [FormerlySerializedAs("languageCode")] public string languageCodeOLD = "";
protected virtual void OnEnable() protected virtual void OnEnable()
{ {

2
Assets/Fungus/iTween/Scripts/Commands/StopTween.cs
Unescape View File

@ -22,7 +22,7 @@ namespace Fungus
#region Backwards compatibility #region Backwards compatibility
[HideInInspector] [FormerlySerializedAs("tweenName")] public string tweenNameOLD; [HideInInspector] [FormerlySerializedAs("tweenName")] public string tweenNameOLD = "";
protected virtual void OnEnable() protected virtual void OnEnable()
{ {

8
Assets/Fungus/iTween/Scripts/Commands/iTweenCommand.cs
Unescape View File

@ -96,7 +96,7 @@ namespace Fungus
#region Backwards compatibility #region Backwards compatibility
[HideInInspector] [FormerlySerializedAs("target")] [FormerlySerializedAs("targetObject")] public GameObject targetObjectOLD; [HideInInspector] [FormerlySerializedAs("target")] [FormerlySerializedAs("targetObject")] public GameObject targetObjectOLD;
[HideInInspector] [FormerlySerializedAs("tweenName")] public string tweenNameOLD; [HideInInspector] [FormerlySerializedAs("tweenName")] public string tweenNameOLD = "";
[HideInInspector] [FormerlySerializedAs("duration")] public float durationOLD; [HideInInspector] [FormerlySerializedAs("duration")] public float durationOLD;
protected virtual void OnEnable() protected virtual void OnEnable()
@ -107,6 +107,12 @@ namespace Fungus
targetObjectOLD = null; targetObjectOLD = null;
} }
if (tweenNameOLD != "")
{
_tweenName.Value = tweenNameOLD;
tweenNameOLD = "";
}
if (durationOLD != default(float)) if (durationOLD != default(float))
{ {
_duration.Value = durationOLD; _duration.Value = durationOLD;

Write Preview
Loading…
Cancel
Save