diff --git a/Assets/Fungus/iTween/Scripts/Commands/LookFrom.cs b/Assets/Fungus/iTween/Scripts/Commands/LookFrom.cs index 5fef3526..cee06f50 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/LookFrom.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/LookFrom.cs @@ -45,7 +45,7 @@ namespace Fungus tweenParams.Add("time", duration); tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.LookFrom(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/LookTo.cs b/Assets/Fungus/iTween/Scripts/Commands/LookTo.cs index 9bbc0d2e..d1a4fae4 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/LookTo.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/LookTo.cs @@ -45,7 +45,7 @@ namespace Fungus tweenParams.Add("time", duration); tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.LookTo(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/MoveAdd.cs b/Assets/Fungus/iTween/Scripts/Commands/MoveAdd.cs index 1960ff01..6d9d5b21 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/MoveAdd.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/MoveAdd.cs @@ -24,7 +24,7 @@ namespace Fungus tweenParams.Add("time", duration); tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.MoveAdd(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/MoveFrom.cs b/Assets/Fungus/iTween/Scripts/Commands/MoveFrom.cs index 4405707b..fadb1476 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/MoveFrom.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/MoveFrom.cs @@ -34,7 +34,7 @@ namespace Fungus tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); tweenParams.Add("isLocal", isLocal); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.MoveFrom(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/MoveTo.cs b/Assets/Fungus/iTween/Scripts/Commands/MoveTo.cs index 2a48f406..f427c9ef 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/MoveTo.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/MoveTo.cs @@ -34,7 +34,7 @@ namespace Fungus tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); tweenParams.Add("isLocal", isLocal); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.MoveTo(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/PunchPosition.cs b/Assets/Fungus/iTween/Scripts/Commands/PunchPosition.cs index 962c7685..87149a9e 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/PunchPosition.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/PunchPosition.cs @@ -24,7 +24,7 @@ namespace Fungus tweenParams.Add("time", duration); tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.PunchPosition(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/PunchRotation.cs b/Assets/Fungus/iTween/Scripts/Commands/PunchRotation.cs index 14c44f3b..89ad7991 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/PunchRotation.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/PunchRotation.cs @@ -24,7 +24,7 @@ namespace Fungus tweenParams.Add("time", duration); tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.PunchRotation(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/PunchScale.cs b/Assets/Fungus/iTween/Scripts/Commands/PunchScale.cs index 133d4987..e9991768 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/PunchScale.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/PunchScale.cs @@ -20,7 +20,7 @@ namespace Fungus tweenParams.Add("time", duration); tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.PunchScale(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/RotateAdd.cs b/Assets/Fungus/iTween/Scripts/Commands/RotateAdd.cs index 60a11a7c..7cad1509 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/RotateAdd.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/RotateAdd.cs @@ -24,7 +24,7 @@ namespace Fungus tweenParams.Add("time", duration); tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.RotateAdd(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/RotateFrom.cs b/Assets/Fungus/iTween/Scripts/Commands/RotateFrom.cs index d9b52908..2c33c441 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/RotateFrom.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/RotateFrom.cs @@ -34,7 +34,7 @@ namespace Fungus tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); tweenParams.Add("isLocal", isLocal); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.RotateFrom(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/RotateTo.cs b/Assets/Fungus/iTween/Scripts/Commands/RotateTo.cs index 45098e03..5f10f21d 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/RotateTo.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/RotateTo.cs @@ -34,7 +34,7 @@ namespace Fungus tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); tweenParams.Add("isLocal", isLocal); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.RotateTo(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/ScaleAdd.cs b/Assets/Fungus/iTween/Scripts/Commands/ScaleAdd.cs index e71f00f8..2aca66aa 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/ScaleAdd.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/ScaleAdd.cs @@ -20,7 +20,7 @@ namespace Fungus tweenParams.Add("time", duration); tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.ScaleAdd(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/ScaleFrom.cs b/Assets/Fungus/iTween/Scripts/Commands/ScaleFrom.cs index d9719347..d680d58c 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/ScaleFrom.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/ScaleFrom.cs @@ -30,7 +30,7 @@ namespace Fungus tweenParams.Add("time", duration); tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.ScaleFrom(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/ScaleTo.cs b/Assets/Fungus/iTween/Scripts/Commands/ScaleTo.cs index be9f1abc..af81d1e5 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/ScaleTo.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/ScaleTo.cs @@ -30,7 +30,7 @@ namespace Fungus tweenParams.Add("time", duration); tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.ScaleTo(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/ShakePosition.cs b/Assets/Fungus/iTween/Scripts/Commands/ShakePosition.cs index 361d5aba..8da68a2a 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/ShakePosition.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/ShakePosition.cs @@ -39,7 +39,7 @@ namespace Fungus tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); tweenParams.Add("isLocal", isLocal); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.ShakePosition(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/ShakeRotation.cs b/Assets/Fungus/iTween/Scripts/Commands/ShakeRotation.cs index 2585f4cf..8950d64e 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/ShakeRotation.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/ShakeRotation.cs @@ -24,7 +24,7 @@ namespace Fungus tweenParams.Add("time", duration); tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.ShakeRotation(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/ShakeScale.cs b/Assets/Fungus/iTween/Scripts/Commands/ShakeScale.cs index 86e40fee..d26ad140 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/ShakeScale.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/ShakeScale.cs @@ -20,7 +20,7 @@ namespace Fungus tweenParams.Add("time", duration); tweenParams.Add("easetype", easeType); tweenParams.Add("looptype", loopType); - tweenParams.Add("oncomplete", "OnComplete"); + tweenParams.Add("oncomplete", "OniTweenComplete"); tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompleteparams", this); iTween.ShakeScale(targetObject, tweenParams); diff --git a/Assets/Fungus/iTween/Scripts/Commands/iTweenCommand.cs b/Assets/Fungus/iTween/Scripts/Commands/iTweenCommand.cs index 29e23efb..634ac54d 100644 --- a/Assets/Fungus/iTween/Scripts/Commands/iTweenCommand.cs +++ b/Assets/Fungus/iTween/Scripts/Commands/iTweenCommand.cs @@ -52,7 +52,7 @@ namespace Fungus public virtual void DoTween() {} - protected virtual void OnComplete(object param) + protected virtual void OniTweenComplete(object param) { Command command = param as Command; if (command != null && command.Equals(this)) diff --git a/Assets/FungusExamples/DragAndDrop/DragAndDrop.unity b/Assets/FungusExamples/DragAndDrop/DragAndDrop.unity index 4218183c..6a5e22ed 100644 --- a/Assets/FungusExamples/DragAndDrop/DragAndDrop.unity +++ b/Assets/FungusExamples/DragAndDrop/DragAndDrop.unity @@ -299,30 +299,30 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4442b79fcbcbb4aac97f42d6dc3d4e0b, type: 2} m_IsPrefabParent: 0 ---- !u!1 &591590528 +--- !u!1 &591590528 stripped GameObject: m_PrefabParentObject: {fileID: 100000, guid: 0e6bcf37a2876432fa58eff8888bf177, type: 2} m_PrefabInternal: {fileID: 1373034542} ---- !u!114 &591590529 +--- !u!114 &591590529 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11400000, guid: 0e6bcf37a2876432fa58eff8888bf177, type: 2} m_PrefabInternal: {fileID: 1373034542} m_Script: {fileID: 11500000, guid: cc03961113fa349c09cb06ef2911013d, type: 3} ---- !u!1 &606394391 +--- !u!1 &606394391 stripped GameObject: m_PrefabParentObject: {fileID: 100000, guid: 4442b79fcbcbb4aac97f42d6dc3d4e0b, type: 2} m_PrefabInternal: {fileID: 442175927} ---- !u!58 &606394392 +--- !u!58 &606394392 stripped CircleCollider2D: m_PrefabParentObject: {fileID: 5800000, guid: 4442b79fcbcbb4aac97f42d6dc3d4e0b, type: 2} m_PrefabInternal: {fileID: 442175927} ---- !u!1 &1081858233 +--- !u!1 &1081858233 stripped GameObject: m_PrefabParentObject: {fileID: 100000, guid: 4d55f86cf3b124c8fb1158da26ffa96d, type: 2} m_PrefabInternal: {fileID: 2135880372} ---- !u!114 &1081858236 +--- !u!114 &1081858236 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11400000, guid: 4d55f86cf3b124c8fb1158da26ffa96d, type: 2} @@ -389,11 +389,11 @@ MonoScript: m_Namespace: Fungus m_AssemblyName: Assembly-CSharp.dll m_IsEditorScript: 0 ---- !u!1 &1637100245 +--- !u!1 &1637100245 stripped GameObject: m_PrefabParentObject: {fileID: 100000, guid: 0e6bcf37a2876432fa58eff8888bf177, type: 2} m_PrefabInternal: {fileID: 228925351} ---- !u!114 &1637100246 +--- !u!114 &1637100246 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11400000, guid: 0e6bcf37a2876432fa58eff8888bf177, type: 2} @@ -453,7 +453,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} m_Name: m_EditorClassIdentifier: - scrollPos: {x: 227, y: 20} + scrollPos: {x: 226, y: 86} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 blockViewHeight: 400 @@ -470,12 +470,11 @@ MonoBehaviour: description: 'This scene shows how to set up a drag-and-drop behavior and making objects clickable.' - runSlowDuration: .25 + stepPause: 0 colorCommands: 1 hideComponents: 1 saveSelection: 1 localizationId: - nextItemId: 20 --- !u!114 &2019116669 MonoBehaviour: m_ObjectHideFlags: 2 @@ -496,7 +495,6 @@ MonoBehaviour: itemId: 17 blockName: Drag Completed description: - runSlowInEditor: 0 eventHandler: {fileID: 2019116681} commandList: - {fileID: 2019116672} @@ -694,7 +692,6 @@ MonoBehaviour: itemId: 16 blockName: Drag Exited description: - runSlowInEditor: 0 eventHandler: {fileID: 2019116684} commandList: - {fileID: 2019116679} @@ -750,7 +747,6 @@ MonoBehaviour: itemId: 15 blockName: Drag Entered description: - runSlowInEditor: 0 eventHandler: {fileID: 2019116686} commandList: - {fileID: 2019116682} @@ -789,7 +785,6 @@ MonoBehaviour: itemId: 14 blockName: Drag Cancelled description: - runSlowInEditor: 0 eventHandler: {fileID: 2019116673} commandList: - {fileID: 2019116674} @@ -828,7 +823,6 @@ MonoBehaviour: itemId: 13 blockName: Drag Start description: - runSlowInEditor: 0 eventHandler: {fileID: 2019116678} commandList: - {fileID: 2019116675} @@ -945,7 +939,6 @@ MonoBehaviour: itemId: 18 blockName: Object Clicked 1 description: - runSlowInEditor: 0 eventHandler: {fileID: 2019116692} commandList: - {fileID: 2019116688} @@ -969,7 +962,6 @@ MonoBehaviour: itemId: 19 blockName: Object Clicked 2 description: - runSlowInEditor: 0 eventHandler: {fileID: 2019116696} commandList: - {fileID: 2019116695}