Skip to content

Commit d7bcede

Browse files
committed
feat: Accept multiple events
1 parent bdfd4f0 commit d7bcede

File tree

2 files changed

+20
-14
lines changed

2 files changed

+20
-14
lines changed

Assets/JCSUnity/Scripts/Effects/JCS_ScaleEffect.cs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ public class JCS_ScaleEffect : JCS_UnityObject
7676

7777
[Tooltip("Event trigger type to active the the slide effect.")]
7878
[SerializeField]
79-
private EventTriggerType mActiveEventTriggerType = EventTriggerType.PointerEnter;
79+
private EventTriggerType[] mActiveEventTriggerType = null;
8080

8181
[Tooltip("Event trigger type to deactive the the slide effect.")]
8282
[SerializeField]
83-
private EventTriggerType mDeactiveEventTriggerType = EventTriggerType.PointerExit;
83+
private EventTriggerType[] mDeactiveEventTriggerType = null;
8484

8585
/* Setter & Getter */
8686

@@ -105,14 +105,17 @@ private void Start()
105105
{
106106
// Event trigger is the must if we need to add the
107107
// event to event trigger system.
108+
mEventTrigger = gameObject.GetOrAddComponent<EventTrigger>();
109+
110+
foreach (EventTriggerType evt in mActiveEventTriggerType)
108111
{
109-
mEventTrigger = GetComponent<EventTrigger>();
110-
if (mEventTrigger == null)
111-
mEventTrigger = gameObject.AddComponent<EventTrigger>();
112+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, JCS_OnMouseOver);
112113
}
113114

114-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, mActiveEventTriggerType, JCS_OnMouseOver);
115-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, mDeactiveEventTriggerType, JCS_OnMouseExit);
115+
foreach (EventTriggerType evt in mDeactiveEventTriggerType)
116+
{
117+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, JCS_OnMouseExit);
118+
}
116119
}
117120
}
118121

Assets/JCSUnity/Scripts/Effects/JCS_SlideEffect.cs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ public class JCS_SlideEffect : JCS_UnityObject
8888

8989
[Tooltip("Event trigger type to active the the slide effect.")]
9090
[SerializeField]
91-
private EventTriggerType mActiveEventTriggerType = EventTriggerType.PointerEnter;
91+
private EventTriggerType[] mActiveEventTriggerType = null;
9292

9393
[Tooltip("Event trigger type to deactive the the slide effect.")]
9494
[SerializeField]
95-
private EventTriggerType mDeactiveEventTriggerType = EventTriggerType.PointerExit;
95+
private EventTriggerType[] mDeactiveEventTriggerType = null;
9696

9797
[Header("Sound")]
9898

@@ -196,14 +196,17 @@ private void Start()
196196
{
197197
// Event trigger is the must if we need to add the
198198
// event to event trigger system.
199+
mEventTrigger = gameObject.GetOrAddComponent<EventTrigger>();
200+
201+
foreach (EventTriggerType evt in mActiveEventTriggerType)
199202
{
200-
mEventTrigger = GetComponent<EventTrigger>();
201-
if (mEventTrigger == null)
202-
mEventTrigger = gameObject.AddComponent<EventTrigger>();
203+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, JCS_OnMouseOver);
203204
}
204205

205-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, mActiveEventTriggerType, JCS_OnMouseOver);
206-
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, mDeactiveEventTriggerType, JCS_OnMouseExit);
206+
foreach (EventTriggerType evt in mDeactiveEventTriggerType)
207+
{
208+
JCS_UIUtil.AddEventTriggerEvent(mEventTrigger, evt, JCS_OnMouseExit);
209+
}
207210
}
208211
}
209212

0 commit comments

Comments
 (0)