Browse Source

added dragableobject list to two commands

master
vjs22334 5 years ago
parent
commit
bb08b4594c
  1. 27
      Assets/Fungus/Scripts/EventHandlers/DragCancelled.cs
  2. 28
      Assets/Fungus/Scripts/EventHandlers/DragStarted.cs

27
Assets/Fungus/Scripts/EventHandlers/DragCancelled.cs

@ -2,6 +2,8 @@
// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)
using UnityEngine; using UnityEngine;
using System.Collections.Generic;
namespace Fungus namespace Fungus
{ {
@ -24,7 +26,7 @@ namespace Fungus
} }
[Tooltip("Draggable object to listen for drag events on")] [Tooltip("Draggable object to listen for drag events on")]
[SerializeField] protected Draggable2D draggableObject; [SerializeField] protected List<Draggable2D> draggableObjects;
protected EventDispatcher eventDispatcher; protected EventDispatcher eventDispatcher;
@ -51,22 +53,37 @@ namespace Fungus
public virtual void OnDragCancelled(Draggable2D draggableObject) public virtual void OnDragCancelled(Draggable2D draggableObject)
{ {
if (draggableObject == this.draggableObject) for (int i = 0; i < this.draggableObjects.Count; i++)
{
if (draggableObject == this.draggableObjects[i])
{ {
ExecuteBlock(); ExecuteBlock();
} }
}
} }
public override string GetSummary() public override string GetSummary()
{ {
if (draggableObject != null) string summary = "Dragable: ";
if (this.draggableObjects != null && this.draggableObjects.Count != 0)
{
for (int i = 0; i < this.draggableObjects.Count; i++)
{
if (draggableObjects[i] != null)
{ {
return draggableObject.name; summary += draggableObjects[i].name + ",";
} }
}
return summary;
}
else
{
return "None"; return "None";
} }
}
#endregion #endregion
} }
} }

28
Assets/Fungus/Scripts/EventHandlers/DragStarted.cs

@ -2,6 +2,7 @@
// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)
using UnityEngine; using UnityEngine;
using System.Collections.Generic;
namespace Fungus namespace Fungus
{ {
@ -23,10 +24,11 @@ namespace Fungus
} }
} }
[SerializeField] protected Draggable2D draggableObject; [SerializeField] protected List<Draggable2D> draggableObjects;
protected EventDispatcher eventDispatcher; protected EventDispatcher eventDispatcher;
protected virtual void OnEnable() protected virtual void OnEnable()
{ {
eventDispatcher = FungusManager.Instance.EventDispatcher; eventDispatcher = FungusManager.Instance.EventDispatcher;
@ -53,22 +55,38 @@ namespace Fungus
/// </summary> /// </summary>
public virtual void OnDragStarted(Draggable2D draggableObject) public virtual void OnDragStarted(Draggable2D draggableObject)
{ {
if (draggableObject == this.draggableObject) for (int i = 0; i < this.draggableObjects.Count; i++)
{
if (draggableObject == this.draggableObjects[i])
{ {
ExecuteBlock(); ExecuteBlock();
} }
}
} }
public override string GetSummary() public override string GetSummary()
{ {
if (draggableObject != null) string summary = "Dragable: ";
if (this.draggableObjects != null && this.draggableObjects.Count != 0)
{
for (int i = 0; i < this.draggableObjects.Count; i++)
{
if (draggableObjects[i] != null)
{ {
return draggableObject.name; summary += draggableObjects[i].name + ",";
} }
}
return summary;
}
else
{
return "None"; return "None";
} }
}
#endregion #endregion
} }
} }

Loading…
Cancel
Save