Browse Source

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

master
Christopher 9 years ago
parent
commit
624f66f516
  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

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

6
Assets/Fungus/Animation/Scripts/Commands/SetAnimBool.cs

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

6
Assets/Fungus/Animation/Scripts/Commands/SetAnimFloat.cs

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

6
Assets/Fungus/Animation/Scripts/Commands/SetAnimInteger.cs

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

6
Assets/Fungus/Animation/Scripts/Commands/SetAnimTrigger.cs

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

2
Assets/Fungus/Audio/Scripts/Commands/PlayUsfxrSound.cs

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

2
Assets/Fungus/Flowchart/Scripts/Commands/LoadScene.cs

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

2
Assets/Fungus/Flowchart/Scripts/Commands/SendMessage.cs

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

2
Assets/Fungus/Narrative/Scripts/Commands/SetLanguage.cs

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

2
Assets/Fungus/iTween/Scripts/Commands/StopTween.cs

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

8
Assets/Fungus/iTween/Scripts/Commands/iTweenCommand.cs

@ -96,7 +96,7 @@ namespace Fungus
#region Backwards compatibility
[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;
protected virtual void OnEnable()
@ -107,6 +107,12 @@ namespace Fungus
targetObjectOLD = null;
}
if (tweenNameOLD != "")
{
_tweenName.Value = tweenNameOLD;
tweenNameOLD = "";
}
if (durationOLD != default(float))
{
_duration.Value = durationOLD;

Loading…
Cancel
Save