Browse Source

Using iTween and Portrait commands in same Flowchart causes null exception #116

master
chrisgregan 10 years ago
parent
commit
e41f596020
  1. 2
      Assets/Fungus/iTween/Scripts/Commands/LookFrom.cs
  2. 2
      Assets/Fungus/iTween/Scripts/Commands/LookTo.cs
  3. 2
      Assets/Fungus/iTween/Scripts/Commands/MoveAdd.cs
  4. 2
      Assets/Fungus/iTween/Scripts/Commands/MoveFrom.cs
  5. 2
      Assets/Fungus/iTween/Scripts/Commands/MoveTo.cs
  6. 2
      Assets/Fungus/iTween/Scripts/Commands/PunchPosition.cs
  7. 2
      Assets/Fungus/iTween/Scripts/Commands/PunchRotation.cs
  8. 2
      Assets/Fungus/iTween/Scripts/Commands/PunchScale.cs
  9. 2
      Assets/Fungus/iTween/Scripts/Commands/RotateAdd.cs
  10. 2
      Assets/Fungus/iTween/Scripts/Commands/RotateFrom.cs
  11. 2
      Assets/Fungus/iTween/Scripts/Commands/RotateTo.cs
  12. 2
      Assets/Fungus/iTween/Scripts/Commands/ScaleAdd.cs
  13. 2
      Assets/Fungus/iTween/Scripts/Commands/ScaleFrom.cs
  14. 2
      Assets/Fungus/iTween/Scripts/Commands/ScaleTo.cs
  15. 2
      Assets/Fungus/iTween/Scripts/Commands/ShakePosition.cs
  16. 2
      Assets/Fungus/iTween/Scripts/Commands/ShakeRotation.cs
  17. 2
      Assets/Fungus/iTween/Scripts/Commands/ShakeScale.cs
  18. 2
      Assets/Fungus/iTween/Scripts/Commands/iTweenCommand.cs
  19. 28
      Assets/FungusExamples/DragAndDrop/DragAndDrop.unity

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

@ -45,7 +45,7 @@ namespace Fungus
tweenParams.Add("time", duration); tweenParams.Add("time", duration);
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.LookFrom(targetObject, tweenParams); iTween.LookFrom(targetObject, tweenParams);

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

@ -45,7 +45,7 @@ namespace Fungus
tweenParams.Add("time", duration); tweenParams.Add("time", duration);
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.LookTo(targetObject, tweenParams); iTween.LookTo(targetObject, tweenParams);

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

@ -24,7 +24,7 @@ namespace Fungus
tweenParams.Add("time", duration); tweenParams.Add("time", duration);
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.MoveAdd(targetObject, tweenParams); iTween.MoveAdd(targetObject, tweenParams);

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

@ -34,7 +34,7 @@ namespace Fungus
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("isLocal", isLocal); tweenParams.Add("isLocal", isLocal);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.MoveFrom(targetObject, tweenParams); iTween.MoveFrom(targetObject, tweenParams);

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

@ -34,7 +34,7 @@ namespace Fungus
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("isLocal", isLocal); tweenParams.Add("isLocal", isLocal);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.MoveTo(targetObject, tweenParams); iTween.MoveTo(targetObject, tweenParams);

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

@ -24,7 +24,7 @@ namespace Fungus
tweenParams.Add("time", duration); tweenParams.Add("time", duration);
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.PunchPosition(targetObject, tweenParams); iTween.PunchPosition(targetObject, tweenParams);

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

@ -24,7 +24,7 @@ namespace Fungus
tweenParams.Add("time", duration); tweenParams.Add("time", duration);
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.PunchRotation(targetObject, tweenParams); iTween.PunchRotation(targetObject, tweenParams);

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

@ -20,7 +20,7 @@ namespace Fungus
tweenParams.Add("time", duration); tweenParams.Add("time", duration);
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.PunchScale(targetObject, tweenParams); iTween.PunchScale(targetObject, tweenParams);

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

@ -24,7 +24,7 @@ namespace Fungus
tweenParams.Add("time", duration); tweenParams.Add("time", duration);
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.RotateAdd(targetObject, tweenParams); iTween.RotateAdd(targetObject, tweenParams);

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

@ -34,7 +34,7 @@ namespace Fungus
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("isLocal", isLocal); tweenParams.Add("isLocal", isLocal);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.RotateFrom(targetObject, tweenParams); iTween.RotateFrom(targetObject, tweenParams);

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

@ -34,7 +34,7 @@ namespace Fungus
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("isLocal", isLocal); tweenParams.Add("isLocal", isLocal);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.RotateTo(targetObject, tweenParams); iTween.RotateTo(targetObject, tweenParams);

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

@ -20,7 +20,7 @@ namespace Fungus
tweenParams.Add("time", duration); tweenParams.Add("time", duration);
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.ScaleAdd(targetObject, tweenParams); iTween.ScaleAdd(targetObject, tweenParams);

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

@ -30,7 +30,7 @@ namespace Fungus
tweenParams.Add("time", duration); tweenParams.Add("time", duration);
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.ScaleFrom(targetObject, tweenParams); iTween.ScaleFrom(targetObject, tweenParams);

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

@ -30,7 +30,7 @@ namespace Fungus
tweenParams.Add("time", duration); tweenParams.Add("time", duration);
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.ScaleTo(targetObject, tweenParams); iTween.ScaleTo(targetObject, tweenParams);

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

@ -39,7 +39,7 @@ namespace Fungus
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("isLocal", isLocal); tweenParams.Add("isLocal", isLocal);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.ShakePosition(targetObject, tweenParams); iTween.ShakePosition(targetObject, tweenParams);

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

@ -24,7 +24,7 @@ namespace Fungus
tweenParams.Add("time", duration); tweenParams.Add("time", duration);
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.ShakeRotation(targetObject, tweenParams); iTween.ShakeRotation(targetObject, tweenParams);

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

@ -20,7 +20,7 @@ namespace Fungus
tweenParams.Add("time", duration); tweenParams.Add("time", duration);
tweenParams.Add("easetype", easeType); tweenParams.Add("easetype", easeType);
tweenParams.Add("looptype", loopType); tweenParams.Add("looptype", loopType);
tweenParams.Add("oncomplete", "OnComplete"); tweenParams.Add("oncomplete", "OniTweenComplete");
tweenParams.Add("oncompletetarget", gameObject); tweenParams.Add("oncompletetarget", gameObject);
tweenParams.Add("oncompleteparams", this); tweenParams.Add("oncompleteparams", this);
iTween.ShakeScale(targetObject, tweenParams); iTween.ShakeScale(targetObject, tweenParams);

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

@ -52,7 +52,7 @@ namespace Fungus
public virtual void DoTween() public virtual void DoTween()
{} {}
protected virtual void OnComplete(object param) protected virtual void OniTweenComplete(object param)
{ {
Command command = param as Command; Command command = param as Command;
if (command != null && command.Equals(this)) if (command != null && command.Equals(this))

28
Assets/FungusExamples/DragAndDrop/DragAndDrop.unity

@ -299,30 +299,30 @@ Prefab:
m_RemovedComponents: [] m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 4442b79fcbcbb4aac97f42d6dc3d4e0b, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 4442b79fcbcbb4aac97f42d6dc3d4e0b, type: 2}
m_IsPrefabParent: 0 m_IsPrefabParent: 0
--- !u!1 &591590528 --- !u!1 &591590528 stripped
GameObject: GameObject:
m_PrefabParentObject: {fileID: 100000, guid: 0e6bcf37a2876432fa58eff8888bf177, type: 2} m_PrefabParentObject: {fileID: 100000, guid: 0e6bcf37a2876432fa58eff8888bf177, type: 2}
m_PrefabInternal: {fileID: 1373034542} m_PrefabInternal: {fileID: 1373034542}
--- !u!114 &591590529 --- !u!114 &591590529 stripped
MonoBehaviour: MonoBehaviour:
m_PrefabParentObject: {fileID: 11400000, guid: 0e6bcf37a2876432fa58eff8888bf177, m_PrefabParentObject: {fileID: 11400000, guid: 0e6bcf37a2876432fa58eff8888bf177,
type: 2} type: 2}
m_PrefabInternal: {fileID: 1373034542} m_PrefabInternal: {fileID: 1373034542}
m_Script: {fileID: 11500000, guid: cc03961113fa349c09cb06ef2911013d, type: 3} m_Script: {fileID: 11500000, guid: cc03961113fa349c09cb06ef2911013d, type: 3}
--- !u!1 &606394391 --- !u!1 &606394391 stripped
GameObject: GameObject:
m_PrefabParentObject: {fileID: 100000, guid: 4442b79fcbcbb4aac97f42d6dc3d4e0b, type: 2} m_PrefabParentObject: {fileID: 100000, guid: 4442b79fcbcbb4aac97f42d6dc3d4e0b, type: 2}
m_PrefabInternal: {fileID: 442175927} m_PrefabInternal: {fileID: 442175927}
--- !u!58 &606394392 --- !u!58 &606394392 stripped
CircleCollider2D: CircleCollider2D:
m_PrefabParentObject: {fileID: 5800000, guid: 4442b79fcbcbb4aac97f42d6dc3d4e0b, m_PrefabParentObject: {fileID: 5800000, guid: 4442b79fcbcbb4aac97f42d6dc3d4e0b,
type: 2} type: 2}
m_PrefabInternal: {fileID: 442175927} m_PrefabInternal: {fileID: 442175927}
--- !u!1 &1081858233 --- !u!1 &1081858233 stripped
GameObject: GameObject:
m_PrefabParentObject: {fileID: 100000, guid: 4d55f86cf3b124c8fb1158da26ffa96d, type: 2} m_PrefabParentObject: {fileID: 100000, guid: 4d55f86cf3b124c8fb1158da26ffa96d, type: 2}
m_PrefabInternal: {fileID: 2135880372} m_PrefabInternal: {fileID: 2135880372}
--- !u!114 &1081858236 --- !u!114 &1081858236 stripped
MonoBehaviour: MonoBehaviour:
m_PrefabParentObject: {fileID: 11400000, guid: 4d55f86cf3b124c8fb1158da26ffa96d, m_PrefabParentObject: {fileID: 11400000, guid: 4d55f86cf3b124c8fb1158da26ffa96d,
type: 2} type: 2}
@ -389,11 +389,11 @@ MonoScript:
m_Namespace: Fungus m_Namespace: Fungus
m_AssemblyName: Assembly-CSharp.dll m_AssemblyName: Assembly-CSharp.dll
m_IsEditorScript: 0 m_IsEditorScript: 0
--- !u!1 &1637100245 --- !u!1 &1637100245 stripped
GameObject: GameObject:
m_PrefabParentObject: {fileID: 100000, guid: 0e6bcf37a2876432fa58eff8888bf177, type: 2} m_PrefabParentObject: {fileID: 100000, guid: 0e6bcf37a2876432fa58eff8888bf177, type: 2}
m_PrefabInternal: {fileID: 228925351} m_PrefabInternal: {fileID: 228925351}
--- !u!114 &1637100246 --- !u!114 &1637100246 stripped
MonoBehaviour: MonoBehaviour:
m_PrefabParentObject: {fileID: 11400000, guid: 0e6bcf37a2876432fa58eff8888bf177, m_PrefabParentObject: {fileID: 11400000, guid: 0e6bcf37a2876432fa58eff8888bf177,
type: 2} type: 2}
@ -453,7 +453,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrollPos: {x: 227, y: 20} scrollPos: {x: 226, y: 86}
variablesScrollPos: {x: 0, y: 0} variablesScrollPos: {x: 0, y: 0}
variablesExpanded: 1 variablesExpanded: 1
blockViewHeight: 400 blockViewHeight: 400
@ -470,12 +470,11 @@ MonoBehaviour:
description: 'This scene shows how to set up a drag-and-drop description: 'This scene shows how to set up a drag-and-drop
behavior and making objects clickable.' behavior and making objects clickable.'
runSlowDuration: .25 stepPause: 0
colorCommands: 1 colorCommands: 1
hideComponents: 1 hideComponents: 1
saveSelection: 1 saveSelection: 1
localizationId: localizationId:
nextItemId: 20
--- !u!114 &2019116669 --- !u!114 &2019116669
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 2 m_ObjectHideFlags: 2
@ -496,7 +495,6 @@ MonoBehaviour:
itemId: 17 itemId: 17
blockName: Drag Completed blockName: Drag Completed
description: description:
runSlowInEditor: 0
eventHandler: {fileID: 2019116681} eventHandler: {fileID: 2019116681}
commandList: commandList:
- {fileID: 2019116672} - {fileID: 2019116672}
@ -694,7 +692,6 @@ MonoBehaviour:
itemId: 16 itemId: 16
blockName: Drag Exited blockName: Drag Exited
description: description:
runSlowInEditor: 0
eventHandler: {fileID: 2019116684} eventHandler: {fileID: 2019116684}
commandList: commandList:
- {fileID: 2019116679} - {fileID: 2019116679}
@ -750,7 +747,6 @@ MonoBehaviour:
itemId: 15 itemId: 15
blockName: Drag Entered blockName: Drag Entered
description: description:
runSlowInEditor: 0
eventHandler: {fileID: 2019116686} eventHandler: {fileID: 2019116686}
commandList: commandList:
- {fileID: 2019116682} - {fileID: 2019116682}
@ -789,7 +785,6 @@ MonoBehaviour:
itemId: 14 itemId: 14
blockName: Drag Cancelled blockName: Drag Cancelled
description: description:
runSlowInEditor: 0
eventHandler: {fileID: 2019116673} eventHandler: {fileID: 2019116673}
commandList: commandList:
- {fileID: 2019116674} - {fileID: 2019116674}
@ -828,7 +823,6 @@ MonoBehaviour:
itemId: 13 itemId: 13
blockName: Drag Start blockName: Drag Start
description: description:
runSlowInEditor: 0
eventHandler: {fileID: 2019116678} eventHandler: {fileID: 2019116678}
commandList: commandList:
- {fileID: 2019116675} - {fileID: 2019116675}
@ -945,7 +939,6 @@ MonoBehaviour:
itemId: 18 itemId: 18
blockName: Object Clicked 1 blockName: Object Clicked 1
description: description:
runSlowInEditor: 0
eventHandler: {fileID: 2019116692} eventHandler: {fileID: 2019116692}
commandList: commandList:
- {fileID: 2019116688} - {fileID: 2019116688}
@ -969,7 +962,6 @@ MonoBehaviour:
itemId: 19 itemId: 19
blockName: Object Clicked 2 blockName: Object Clicked 2
description: description:
runSlowInEditor: 0
eventHandler: {fileID: 2019116696} eventHandler: {fileID: 2019116696}
commandList: commandList:
- {fileID: 2019116695} - {fileID: 2019116695}

Loading…
Cancel
Save