From 9ee98e5b4276f3a57519e7f5b2dd12db63a601d4 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Tue, 22 Mar 2016 12:09:06 +0000 Subject: [PATCH] Moved Backwards compatibility region to bottom of source files --- .../Scripts/Commands/ResetAnimTrigger.cs | 14 ++++++-------- .../Animation/Scripts/Commands/SetAnimBool.cs | 14 ++++++-------- .../Animation/Scripts/Commands/SetAnimFloat.cs | 14 ++++++-------- .../Scripts/Commands/SetAnimInteger.cs | 14 ++++++-------- .../Scripts/Commands/SetAnimTrigger.cs | 14 ++++++-------- .../Audio/Scripts/Commands/ControlAudio.cs | 12 +++++------- .../Audio/Scripts/Commands/PlayUsfxrSound.cs | 11 ++++------- .../Flowchart/Scripts/Commands/Destroy.cs | 12 +++++------- .../Flowchart/Scripts/Commands/LoadScene.cs | 12 +++++------- .../Flowchart/Scripts/Commands/SendMessage.cs | 12 +++++------- .../Flowchart/Scripts/Commands/SetActive.cs | 12 +++++------- .../Flowchart/Scripts/Commands/SpawnObject.cs | 18 ++++++++---------- .../Fungus/Flowchart/Scripts/Commands/Wait.cs | 12 +++++------- .../Narrative/Scripts/Commands/MenuTimer.cs | 14 ++++++-------- .../Narrative/Scripts/Commands/SetLanguage.cs | 12 +++++------- .../Sprite/Scripts/Commands/FadeSprite.cs | 14 ++++++-------- .../Sprite/Scripts/Commands/ShowSprite.cs | 11 ++++------- .../Fungus/iTween/Scripts/Commands/LookFrom.cs | 14 ++++++-------- .../Fungus/iTween/Scripts/Commands/LookTo.cs | 14 ++++++-------- .../Fungus/iTween/Scripts/Commands/MoveAdd.cs | 12 +++++------- .../Fungus/iTween/Scripts/Commands/MoveFrom.cs | 14 ++++++-------- .../Fungus/iTween/Scripts/Commands/MoveTo.cs | 14 ++++++-------- .../iTween/Scripts/Commands/PunchPosition.cs | 12 +++++------- .../iTween/Scripts/Commands/PunchRotation.cs | 12 +++++------- .../iTween/Scripts/Commands/PunchScale.cs | 12 +++++------- .../iTween/Scripts/Commands/RotateAdd.cs | 12 +++++------- .../iTween/Scripts/Commands/RotateFrom.cs | 14 ++++++-------- .../Fungus/iTween/Scripts/Commands/RotateTo.cs | 14 ++++++-------- .../Fungus/iTween/Scripts/Commands/ScaleAdd.cs | 12 +++++------- .../iTween/Scripts/Commands/ScaleFrom.cs | 14 ++++++-------- .../Fungus/iTween/Scripts/Commands/ScaleTo.cs | 14 ++++++-------- .../iTween/Scripts/Commands/ShakePosition.cs | 12 +++++------- .../iTween/Scripts/Commands/ShakeRotation.cs | 12 +++++------- .../iTween/Scripts/Commands/ShakeScale.cs | 12 +++++------- .../iTween/Scripts/Commands/StopTween.cs | 12 +++++------- .../iTween/Scripts/Commands/iTweenCommand.cs | 16 +++++++--------- 36 files changed, 198 insertions(+), 272 deletions(-) diff --git a/Assets/Fungus/Animation/Scripts/Commands/ResetAnimTrigger.cs b/Assets/Fungus/Animation/Scripts/Commands/ResetAnimTrigger.cs index 1976b7a7..9bdc1834 100644 --- a/Assets/Fungus/Animation/Scripts/Commands/ResetAnimTrigger.cs +++ b/Assets/Fungus/Animation/Scripts/Commands/ResetAnimTrigger.cs @@ -11,11 +11,6 @@ namespace Fungus [AddComponentMenu("")] public class ResetAnimTrigger : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; - [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; - #endregion - [Tooltip("Reference to an Animator component in a game object")] public AnimatorData _animator; @@ -47,9 +42,10 @@ namespace Fungus return new Color32(170, 204, 169, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; + [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; public void OnBeforeSerialize() {} @@ -68,6 +64,8 @@ namespace Fungus parameterNameOLD = null; } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Animation/Scripts/Commands/SetAnimBool.cs b/Assets/Fungus/Animation/Scripts/Commands/SetAnimBool.cs index bd91c85a..2cbd6642 100644 --- a/Assets/Fungus/Animation/Scripts/Commands/SetAnimBool.cs +++ b/Assets/Fungus/Animation/Scripts/Commands/SetAnimBool.cs @@ -11,11 +11,6 @@ namespace Fungus [AddComponentMenu("")] public class SetAnimBool : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; - [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; - #endregion - [Tooltip("Reference to an Animator component in a game object")] public AnimatorData _animator; @@ -50,9 +45,10 @@ namespace Fungus return new Color32(170, 204, 169, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; + [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; public void OnBeforeSerialize() {} @@ -71,6 +67,8 @@ namespace Fungus parameterNameOLD = null; } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Animation/Scripts/Commands/SetAnimFloat.cs b/Assets/Fungus/Animation/Scripts/Commands/SetAnimFloat.cs index c0cf9fe8..096954f5 100644 --- a/Assets/Fungus/Animation/Scripts/Commands/SetAnimFloat.cs +++ b/Assets/Fungus/Animation/Scripts/Commands/SetAnimFloat.cs @@ -11,11 +11,6 @@ namespace Fungus [AddComponentMenu("")] public class SetAnimFloat : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; - [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; - #endregion - [Tooltip("Reference to an Animator component in a game object")] public AnimatorData _animator; @@ -50,9 +45,10 @@ namespace Fungus return new Color32(170, 204, 169, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; + [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; public void OnBeforeSerialize() {} @@ -71,6 +67,8 @@ namespace Fungus parameterNameOLD = null; } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Animation/Scripts/Commands/SetAnimInteger.cs b/Assets/Fungus/Animation/Scripts/Commands/SetAnimInteger.cs index 307a8374..29add857 100644 --- a/Assets/Fungus/Animation/Scripts/Commands/SetAnimInteger.cs +++ b/Assets/Fungus/Animation/Scripts/Commands/SetAnimInteger.cs @@ -11,11 +11,6 @@ namespace Fungus [AddComponentMenu("")] public class SetAnimInteger : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; - [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; - #endregion - [Tooltip("Reference to an Animator component in a game object")] public AnimatorData _animator; @@ -50,9 +45,10 @@ namespace Fungus return new Color32(170, 204, 169, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; + [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; public void OnBeforeSerialize() {} @@ -71,6 +67,8 @@ namespace Fungus parameterNameOLD = null; } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Animation/Scripts/Commands/SetAnimTrigger.cs b/Assets/Fungus/Animation/Scripts/Commands/SetAnimTrigger.cs index e2a73909..935973bf 100644 --- a/Assets/Fungus/Animation/Scripts/Commands/SetAnimTrigger.cs +++ b/Assets/Fungus/Animation/Scripts/Commands/SetAnimTrigger.cs @@ -11,11 +11,6 @@ namespace Fungus [AddComponentMenu("")] public class SetAnimTrigger : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; - [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; - #endregion - [Tooltip("Reference to an Animator component in a game object")] public AnimatorData _animator; @@ -47,9 +42,10 @@ namespace Fungus return new Color32(170, 204, 169, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("animator")] public Animator animatorOLD; + [HideInInspector] [FormerlySerializedAs("parameterName")] public string parameterNameOLD; public void OnBeforeSerialize() {} @@ -68,6 +64,8 @@ namespace Fungus parameterNameOLD = null; } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Audio/Scripts/Commands/ControlAudio.cs b/Assets/Fungus/Audio/Scripts/Commands/ControlAudio.cs index e1a17011..e7ae9263 100644 --- a/Assets/Fungus/Audio/Scripts/Commands/ControlAudio.cs +++ b/Assets/Fungus/Audio/Scripts/Commands/ControlAudio.cs @@ -9,10 +9,6 @@ namespace Fungus "Plays, loops, or stops an audiosource. Any AudioSources with the same tag as the target Audio Source will automatically be stoped.")] public class ControlAudio : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("audioSource")] public AudioSource audioSourceOLD; - #endregion - public enum controlType { PlayOnce, @@ -262,9 +258,9 @@ namespace Fungus return new Color32(242, 209, 176, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("audioSource")] public AudioSource audioSourceOLD; public virtual void OnBeforeSerialize() {} @@ -277,6 +273,8 @@ namespace Fungus audioSourceOLD = null; } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Audio/Scripts/Commands/PlayUsfxrSound.cs b/Assets/Fungus/Audio/Scripts/Commands/PlayUsfxrSound.cs index cff75f29..6f1f7eb5 100644 --- a/Assets/Fungus/Audio/Scripts/Commands/PlayUsfxrSound.cs +++ b/Assets/Fungus/Audio/Scripts/Commands/PlayUsfxrSound.cs @@ -9,10 +9,6 @@ [AddComponentMenu("")] public class PlayUsfxrSound : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("SettingsString")] public String SettingsStringOLD; - #endregion - protected SfxrSynth _synth = new SfxrSynth(); [Tooltip("Transform to use for positional audio")] @@ -69,9 +65,9 @@ return new Color32(128, 200, 200, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("SettingsString")] public String SettingsStringOLD; public virtual void OnBeforeSerialize() {} @@ -85,5 +81,6 @@ } } + #endregion } } diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Destroy.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Destroy.cs index bb8d145f..783efa68 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Destroy.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Destroy.cs @@ -11,10 +11,6 @@ namespace Fungus [AddComponentMenu("")] public class Destroy : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("targetGameObject")] public GameObject targetGameObjectOLD; - #endregion - [Tooltip("Reference to game object to destroy")] public GameObjectData _targetGameObject; @@ -43,9 +39,9 @@ namespace Fungus return new Color32(235, 191, 217, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("targetGameObject")] public GameObject targetGameObjectOLD; public virtual void OnBeforeSerialize() {} @@ -58,6 +54,8 @@ namespace Fungus targetGameObjectOLD = null; } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/LoadScene.cs b/Assets/Fungus/Flowchart/Scripts/Commands/LoadScene.cs index 864ead5c..4dc19f24 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/LoadScene.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/LoadScene.cs @@ -14,10 +14,6 @@ namespace Fungus [AddComponentMenu("")] public class LoadScene : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("sceneName")] public string sceneNameOLD; - #endregion - [Tooltip("Name of the scene to load. The scene must also be added to the build settings.")] public StringData _sceneName = new StringData(""); @@ -44,9 +40,9 @@ namespace Fungus return new Color32(235, 191, 217, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("sceneName")] public string sceneNameOLD; public virtual void OnBeforeSerialize() {} @@ -59,6 +55,8 @@ namespace Fungus sceneNameOLD = default(string); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/SendMessage.cs b/Assets/Fungus/Flowchart/Scripts/Commands/SendMessage.cs index cbb8e0fb..35708df8 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/SendMessage.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/SendMessage.cs @@ -10,10 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class SendMessage : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("message")] public string messageOLD; - #endregion - public enum MessageTarget { SameFlowchart, @@ -72,9 +68,9 @@ namespace Fungus return new Color32(235, 191, 217, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("message")] public string messageOLD; public virtual void OnBeforeSerialize() {} @@ -87,6 +83,8 @@ namespace Fungus messageOLD = default(string); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/SetActive.cs b/Assets/Fungus/Flowchart/Scripts/Commands/SetActive.cs index 9116185a..4e0c4a5d 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/SetActive.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/SetActive.cs @@ -11,10 +11,6 @@ namespace Fungus [AddComponentMenu("")] public class SetActive : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("targetGameObject")] public GameObject targetGameObjectOLD; - #endregion - [Tooltip("Reference to game object to enable / disable")] public GameObjectData _targetGameObject; @@ -46,9 +42,9 @@ namespace Fungus return new Color32(235, 191, 217, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("targetGameObject")] public GameObject targetGameObjectOLD; public virtual void OnBeforeSerialize() {} @@ -61,6 +57,8 @@ namespace Fungus targetGameObjectOLD = null; } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/SpawnObject.cs b/Assets/Fungus/Flowchart/Scripts/Commands/SpawnObject.cs index 5d22988c..6fc6f947 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/SpawnObject.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/SpawnObject.cs @@ -13,13 +13,6 @@ namespace Fungus [AddComponentMenu("")] public class SpawnObject : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("sourceObject")] public GameObject sourceObjectOLD; - [HideInInspector] [FormerlySerializedAs("parentTransform")] public Transform parentTransformOLD; - [HideInInspector] [FormerlySerializedAs("spawnPosition")] public Vector3 spawnPositionOLD; - [HideInInspector] [FormerlySerializedAs("spawnRotation")] public Vector3 spawnRotationOLD; - #endregion - [Tooltip("Game object to copy when spawning. Can be a scene object or a prefab.")] public GameObjectData _sourceObject; @@ -67,9 +60,12 @@ namespace Fungus return new Color32(235, 191, 217, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("sourceObject")] public GameObject sourceObjectOLD; + [HideInInspector] [FormerlySerializedAs("parentTransform")] public Transform parentTransformOLD; + [HideInInspector] [FormerlySerializedAs("spawnPosition")] public Vector3 spawnPositionOLD; + [HideInInspector] [FormerlySerializedAs("spawnRotation")] public Vector3 spawnRotationOLD; public virtual void OnBeforeSerialize() {} @@ -97,6 +93,8 @@ namespace Fungus spawnRotationOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Wait.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Wait.cs index 6b906e46..700afd85 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Wait.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Wait.cs @@ -11,10 +11,6 @@ namespace Fungus [AddComponentMenu("")] public class Wait : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("duration")] public float durationOLD; - #endregion - [Tooltip("Duration to wait for")] public FloatData _duration = new FloatData(1); @@ -38,9 +34,9 @@ namespace Fungus return new Color32(235, 191, 217, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("duration")] public float durationOLD; public virtual void OnBeforeSerialize() {} @@ -53,6 +49,8 @@ namespace Fungus durationOLD = default(float); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Narrative/Scripts/Commands/MenuTimer.cs b/Assets/Fungus/Narrative/Scripts/Commands/MenuTimer.cs index 09066563..66924f78 100644 --- a/Assets/Fungus/Narrative/Scripts/Commands/MenuTimer.cs +++ b/Assets/Fungus/Narrative/Scripts/Commands/MenuTimer.cs @@ -12,11 +12,7 @@ namespace Fungus "Displays a timer bar and executes a target block if the player fails to select a menu option in time.")] [AddComponentMenu("")] public class MenuTimer : Command, ISerializationCallbackReceiver - { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("duration")] public float durationOLD; - #endregion - + { [Tooltip("Length of time to display the timer for")] public FloatData _duration = new FloatData(1); @@ -60,9 +56,9 @@ namespace Fungus return new Color32(184, 210, 235, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("duration")] public float durationOLD; public virtual void OnBeforeSerialize() {} @@ -75,6 +71,8 @@ namespace Fungus durationOLD = default(float); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Narrative/Scripts/Commands/SetLanguage.cs b/Assets/Fungus/Narrative/Scripts/Commands/SetLanguage.cs index 1d835292..32262544 100644 --- a/Assets/Fungus/Narrative/Scripts/Commands/SetLanguage.cs +++ b/Assets/Fungus/Narrative/Scripts/Commands/SetLanguage.cs @@ -10,10 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class SetLanguage : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("languageCode")] public string languageCodeOLD; - #endregion - [Tooltip("Code of the language to set. e.g. ES, DE, JA")] public StringData _languageCode = new StringData(); @@ -44,9 +40,9 @@ namespace Fungus return new Color32(184, 210, 235, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("languageCode")] public string languageCodeOLD; public virtual void OnBeforeSerialize() {} @@ -59,5 +55,7 @@ namespace Fungus languageCodeOLD = default(string); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Sprite/Scripts/Commands/FadeSprite.cs b/Assets/Fungus/Sprite/Scripts/Commands/FadeSprite.cs index 6a008ee6..900964a5 100644 --- a/Assets/Fungus/Sprite/Scripts/Commands/FadeSprite.cs +++ b/Assets/Fungus/Sprite/Scripts/Commands/FadeSprite.cs @@ -11,11 +11,6 @@ namespace Fungus [AddComponentMenu("")] public class FadeSprite : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("duration")] public float durationOLD; - [HideInInspector] [FormerlySerializedAs("targetColor")] public Color targetColorOLD; - #endregion - [Tooltip("Sprite object to be faded")] public SpriteRenderer spriteRenderer; @@ -72,9 +67,10 @@ namespace Fungus return new Color32(221, 184, 169, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("duration")] public float durationOLD; + [HideInInspector] [FormerlySerializedAs("targetColor")] public Color targetColorOLD; public virtual void OnBeforeSerialize() {} @@ -92,6 +88,8 @@ namespace Fungus targetColorOLD = default(Color); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Sprite/Scripts/Commands/ShowSprite.cs b/Assets/Fungus/Sprite/Scripts/Commands/ShowSprite.cs index 68472dd0..41c369ae 100644 --- a/Assets/Fungus/Sprite/Scripts/Commands/ShowSprite.cs +++ b/Assets/Fungus/Sprite/Scripts/Commands/ShowSprite.cs @@ -11,10 +11,6 @@ namespace Fungus [AddComponentMenu("")] public class ShowSprite : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("visible")] public bool visibleOLD; - #endregion - [Tooltip("Sprite object to be made visible / invisible")] public SpriteRenderer spriteRenderer; @@ -67,10 +63,9 @@ namespace Fungus return new Color32(221, 184, 169, 255); } + #region Backwards compatibility - // - // ISerializationCallbackReceiver implementation - // + [HideInInspector] [FormerlySerializedAs("visible")] public bool visibleOLD; public virtual void OnBeforeSerialize() {} @@ -83,6 +78,8 @@ namespace Fungus visibleOLD = default(bool); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/LookFrom.cs b/Assets/Fungus/iTween/Scripts/Commands/LookFrom.cs index 2e84e721..afd16d4c 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/LookFrom.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/LookFrom.cs @@ -10,11 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class LookFrom : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("fromTransform")] public Transform fromTransformOLD; - [HideInInspector] [FormerlySerializedAs("fromPosition")] public Vector3 fromPositionOLD; - #endregion - [Tooltip("Target transform that the GameObject will look at")] public TransformData _fromTransform; @@ -57,9 +52,10 @@ namespace Fungus iTween.LookFrom(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("fromTransform")] public Transform fromTransformOLD; + [HideInInspector] [FormerlySerializedAs("fromPosition")] public Vector3 fromPositionOLD; public override void OnBeforeSerialize() {} @@ -80,6 +76,8 @@ namespace Fungus fromPositionOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/LookTo.cs b/Assets/Fungus/iTween/Scripts/Commands/LookTo.cs index bc9e5834..3a2d743c 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/LookTo.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/LookTo.cs @@ -10,11 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class LookTo : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("toTransform")] public Transform toTransformOLD; - [HideInInspector] [FormerlySerializedAs("toPosition")] public Vector3 toPositionOLD; - #endregion - [Tooltip("Target transform that the GameObject will look at")] public TransformData _toTransform; @@ -57,9 +52,10 @@ namespace Fungus iTween.LookTo(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("toTransform")] public Transform toTransformOLD; + [HideInInspector] [FormerlySerializedAs("toPosition")] public Vector3 toPositionOLD; public override void OnBeforeSerialize() {} @@ -80,6 +76,8 @@ namespace Fungus toPositionOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/MoveAdd.cs b/Assets/Fungus/iTween/Scripts/Commands/MoveAdd.cs index 04d217e5..a03a778c 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/MoveAdd.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/MoveAdd.cs @@ -10,10 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class MoveAdd : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("offset")] public Vector3 offsetOLD; - #endregion - [Tooltip("A translation offset in space the GameObject will animate to")] public Vector3Data _offset; @@ -35,9 +31,9 @@ namespace Fungus iTween.MoveAdd(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("offset")] public Vector3 offsetOLD; public override void OnBeforeSerialize() {} @@ -52,6 +48,8 @@ namespace Fungus offsetOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/MoveFrom.cs b/Assets/Fungus/iTween/Scripts/Commands/MoveFrom.cs index 72d2df28..34d5b4d0 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/MoveFrom.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/MoveFrom.cs @@ -10,11 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class MoveFrom : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("fromTransform")] public Transform fromTransformOLD; - [HideInInspector] [FormerlySerializedAs("fromPosition")] public Vector3 fromPositionOLD; - #endregion - [Tooltip("Target transform that the GameObject will move from")] public TransformData _fromTransform; @@ -46,9 +41,10 @@ namespace Fungus iTween.MoveFrom(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("fromTransform")] public Transform fromTransformOLD; + [HideInInspector] [FormerlySerializedAs("fromPosition")] public Vector3 fromPositionOLD; public override void OnBeforeSerialize() {} @@ -69,6 +65,8 @@ namespace Fungus fromPositionOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/MoveTo.cs b/Assets/Fungus/iTween/Scripts/Commands/MoveTo.cs index 13ad4b48..45e90864 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/MoveTo.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/MoveTo.cs @@ -10,11 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class MoveTo : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("toTransform")] public Transform toTransformOLD; - [HideInInspector] [FormerlySerializedAs("toPosition")] public Vector3 toPositionOLD; - #endregion - [Tooltip("Target transform that the GameObject will move to")] public TransformData _toTransform; @@ -46,9 +41,10 @@ namespace Fungus iTween.MoveTo(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("toTransform")] public Transform toTransformOLD; + [HideInInspector] [FormerlySerializedAs("toPosition")] public Vector3 toPositionOLD; public override void OnBeforeSerialize() {} @@ -69,6 +65,8 @@ namespace Fungus toPositionOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/PunchPosition.cs b/Assets/Fungus/iTween/Scripts/Commands/PunchPosition.cs index 94b61567..af66015e 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/PunchPosition.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/PunchPosition.cs @@ -10,10 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class PunchPosition : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("amount")] public Vector3 amountOLD; - #endregion - [Tooltip("A translation offset in space the GameObject will animate to")] public Vector3Data _amount; @@ -35,9 +31,9 @@ namespace Fungus iTween.PunchPosition(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("amount")] public Vector3 amountOLD; public override void OnBeforeSerialize() {} @@ -52,6 +48,8 @@ namespace Fungus amountOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/PunchRotation.cs b/Assets/Fungus/iTween/Scripts/Commands/PunchRotation.cs index 0071edda..38612bdd 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/PunchRotation.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/PunchRotation.cs @@ -10,10 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class PunchRotation : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("amount")] public Vector3 amountOLD; - #endregion - [Tooltip("A rotation offset in space the GameObject will animate to")] public Vector3Data _amount; @@ -35,9 +31,9 @@ namespace Fungus iTween.PunchRotation(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("amount")] public Vector3 amountOLD; public override void OnBeforeSerialize() {} @@ -52,6 +48,8 @@ namespace Fungus amountOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/PunchScale.cs b/Assets/Fungus/iTween/Scripts/Commands/PunchScale.cs index 040200fd..0bd3d4f9 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/PunchScale.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/PunchScale.cs @@ -10,10 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class PunchScale : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("amount")] public Vector3 amountOLD; - #endregion - [Tooltip("A scale offset in space the GameObject will animate to")] public Vector3Data _amount; @@ -31,9 +27,9 @@ namespace Fungus iTween.PunchScale(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("amount")] public Vector3 amountOLD; public override void OnBeforeSerialize() {} @@ -48,6 +44,8 @@ namespace Fungus amountOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/RotateAdd.cs b/Assets/Fungus/iTween/Scripts/Commands/RotateAdd.cs index 2c1401e5..f69939db 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/RotateAdd.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/RotateAdd.cs @@ -10,10 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class RotateAdd : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("offset")] public Vector3 offsetOLD; - #endregion - [Tooltip("A rotation offset in space the GameObject will animate to")] public Vector3Data _offset; @@ -35,9 +31,9 @@ namespace Fungus iTween.RotateAdd(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("offset")] public Vector3 offsetOLD; public override void OnBeforeSerialize() {} @@ -52,6 +48,8 @@ namespace Fungus offsetOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/RotateFrom.cs b/Assets/Fungus/iTween/Scripts/Commands/RotateFrom.cs index cb4898bf..c87df6bd 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/RotateFrom.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/RotateFrom.cs @@ -10,11 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class RotateFrom : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("fromTransform")] public Transform fromTransformOLD; - [HideInInspector] [FormerlySerializedAs("fromRotation")] public Vector3 fromRotationOLD; - #endregion - [Tooltip("Target transform that the GameObject will rotate from")] public TransformData _fromTransform; @@ -46,9 +41,10 @@ namespace Fungus iTween.RotateFrom(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("fromTransform")] public Transform fromTransformOLD; + [HideInInspector] [FormerlySerializedAs("fromRotation")] public Vector3 fromRotationOLD; public override void OnBeforeSerialize() {} @@ -69,6 +65,8 @@ namespace Fungus fromRotationOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/RotateTo.cs b/Assets/Fungus/iTween/Scripts/Commands/RotateTo.cs index 926d62b5..9f516b8c 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/RotateTo.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/RotateTo.cs @@ -10,11 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class RotateTo : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("toTransform")] public Transform toTransformOLD; - [HideInInspector] [FormerlySerializedAs("toRotation")] public Vector3 toRotationOLD; - #endregion - [Tooltip("Target transform that the GameObject will rotate to")] public TransformData _toTransform; @@ -46,9 +41,10 @@ namespace Fungus iTween.RotateTo(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("toTransform")] public Transform toTransformOLD; + [HideInInspector] [FormerlySerializedAs("toRotation")] public Vector3 toRotationOLD; public override void OnBeforeSerialize() {} @@ -69,6 +65,8 @@ namespace Fungus toRotationOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/ScaleAdd.cs b/Assets/Fungus/iTween/Scripts/Commands/ScaleAdd.cs index 0ddfcc5b..53ac135a 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/ScaleAdd.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/ScaleAdd.cs @@ -10,10 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class ScaleAdd : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("offset")] public Vector3 offsetOLD; - #endregion - [Tooltip("A scale offset in space the GameObject will animate to")] public Vector3Data _offset; @@ -31,9 +27,9 @@ namespace Fungus iTween.ScaleAdd(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("offset")] public Vector3 offsetOLD; public override void OnBeforeSerialize() {} @@ -48,6 +44,8 @@ namespace Fungus offsetOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/ScaleFrom.cs b/Assets/Fungus/iTween/Scripts/Commands/ScaleFrom.cs index 1d1f7eba..beea48bf 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/ScaleFrom.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/ScaleFrom.cs @@ -10,11 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class ScaleFrom : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("fromTransform")] public Transform fromTransformOLD; - [HideInInspector] [FormerlySerializedAs("fromScale")] public Vector3 fromScaleOLD; - #endregion - [Tooltip("Target transform that the GameObject will scale from")] public TransformData _fromTransform; @@ -42,9 +37,10 @@ namespace Fungus iTween.ScaleFrom(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("fromTransform")] public Transform fromTransformOLD; + [HideInInspector] [FormerlySerializedAs("fromScale")] public Vector3 fromScaleOLD; public override void OnBeforeSerialize() {} @@ -65,6 +61,8 @@ namespace Fungus fromScaleOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/ScaleTo.cs b/Assets/Fungus/iTween/Scripts/Commands/ScaleTo.cs index 84108c97..2a414f29 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/ScaleTo.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/ScaleTo.cs @@ -10,11 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class ScaleTo : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("toTransform")] public Transform toTransformOLD; - [HideInInspector] [FormerlySerializedAs("toScale")] public Vector3 toScaleOLD; - #endregion - [Tooltip("Target transform that the GameObject will scale to")] public TransformData _toTransform; @@ -42,9 +37,10 @@ namespace Fungus iTween.ScaleTo(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("toTransform")] public Transform toTransformOLD; + [HideInInspector] [FormerlySerializedAs("toScale")] public Vector3 toScaleOLD; public override void OnBeforeSerialize() {} @@ -65,6 +61,8 @@ namespace Fungus toScaleOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/ShakePosition.cs b/Assets/Fungus/iTween/Scripts/Commands/ShakePosition.cs index 89d8760b..658f29f2 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/ShakePosition.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/ShakePosition.cs @@ -10,10 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class ShakePosition : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("amount")] public Vector3 amountOLD; - #endregion - [Tooltip("A translation offset in space the GameObject will animate to")] public Vector3Data _amount; @@ -50,9 +46,9 @@ namespace Fungus iTween.ShakePosition(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("amount")] public Vector3 amountOLD; public override void OnBeforeSerialize() {} @@ -67,6 +63,8 @@ namespace Fungus amountOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/ShakeRotation.cs b/Assets/Fungus/iTween/Scripts/Commands/ShakeRotation.cs index d57f7f74..38dcefa9 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/ShakeRotation.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/ShakeRotation.cs @@ -10,10 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class ShakeRotation : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("amount")] public Vector3 amountOLD; - #endregion - [Tooltip("A rotation offset in space the GameObject will animate to")] public Vector3Data _amount; @@ -35,9 +31,9 @@ namespace Fungus iTween.ShakeRotation(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("amount")] public Vector3 amountOLD; public override void OnBeforeSerialize() {} @@ -52,6 +48,8 @@ namespace Fungus amountOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/ShakeScale.cs b/Assets/Fungus/iTween/Scripts/Commands/ShakeScale.cs index b88f9bbc..b32248cd 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/ShakeScale.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/ShakeScale.cs @@ -10,10 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class ShakeScale : iTweenCommand, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("amount")] public Vector3 amountOLD; - #endregion - [Tooltip("A scale offset in space the GameObject will animate to")] public Vector3Data _amount; @@ -31,9 +27,9 @@ namespace Fungus iTween.ShakeScale(_targetObject.Value, tweenParams); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("amount")] public Vector3 amountOLD; public override void OnBeforeSerialize() {} @@ -48,6 +44,8 @@ namespace Fungus amountOLD = default(Vector3); } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/StopTween.cs b/Assets/Fungus/iTween/Scripts/Commands/StopTween.cs index 0f79ec37..9b47d702 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/StopTween.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/StopTween.cs @@ -10,10 +10,6 @@ namespace Fungus [AddComponentMenu("")] public class StopTween : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("tweenName")] public string tweenNameOLD; - #endregion - [Tooltip("Stop and destroy any Tweens in current scene with the supplied name")] public StringData _tweenName; @@ -23,9 +19,9 @@ namespace Fungus Continue(); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("tweenName")] public string tweenNameOLD; public virtual void OnBeforeSerialize() {} @@ -38,6 +34,8 @@ namespace Fungus tweenNameOLD = ""; } } + + #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/iTween/Scripts/Commands/iTweenCommand.cs b/Assets/Fungus/iTween/Scripts/Commands/iTweenCommand.cs index dc142018..6035d267 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/iTweenCommand.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/iTweenCommand.cs @@ -15,12 +15,6 @@ namespace Fungus public abstract class iTweenCommand : Command, ISerializationCallbackReceiver { - #region Obsolete Properties - [HideInInspector] [FormerlySerializedAs("target")] [FormerlySerializedAs("targetObject")] public GameObject targetObjectOLD; - [HideInInspector] [FormerlySerializedAs("tweenName")] public string tweenNameOLD; - [HideInInspector] [FormerlySerializedAs("duration")] public float durationOLD; - #endregion - [Tooltip("Target game object to apply the Tween to")] public GameObjectData _targetObject; @@ -98,9 +92,11 @@ namespace Fungus return new Color32(233, 163, 180, 255); } - // - // ISerializationCallbackReceiver implementation - // + #region Backwards compatibility + + [HideInInspector] [FormerlySerializedAs("target")] [FormerlySerializedAs("targetObject")] public GameObject targetObjectOLD; + [HideInInspector] [FormerlySerializedAs("tweenName")] public string tweenNameOLD; + [HideInInspector] [FormerlySerializedAs("duration")] public float durationOLD; public virtual void OnBeforeSerialize() {} @@ -119,6 +115,8 @@ namespace Fungus durationOLD = default(float); } } + + #endregion } } \ No newline at end of file