Skip to content

Commit 8f09c30

Browse files
author
Dogukan Erenel
committed
Merge branch 'develop' of https://hub.jazz.net/git/sanjayko/unity-sdk into develop
2 parents a9e92fd + f5eaafe commit 8f09c30

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

Scripts/Utilities/Constants.cs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -399,14 +399,17 @@ public enum Event
399399
///
400400
/// </summary>
401401
ON_COMMAND_PROCUREMENT,
402+
/// <summary>
403+
///
404+
/// </summary>
405+
ON_COMMAND_PROCUREMENT_LIST,
406+
#endregion
402407

403-
#endregion
404-
405-
#region Input - Touch
406-
/// <summary>
407-
/// Event if there is touch on fullscreen pressed - It is called for each touch
408-
/// </summary>
409-
ON_TOUCH_PRESSED_FULLSCREEN = 500,
408+
#region Input - Touch
409+
/// <summary>
410+
/// Event if there is touch on fullscreen pressed - It is called for each touch
411+
/// </summary>
412+
ON_TOUCH_PRESSED_FULLSCREEN = 500,
410413
/// <summary>
411414
/// Event if
412415
/// </summary>

Scripts/Utilities/Utility.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public static GameObject FindObject(GameObject parent, string nameChild)
150150
/// <param name="nameChild">Name child.</param>
151151
/// <param name="isContains">Check string contains the name instead of equality.</param>
152152
/// <param name="sortByName">If true, children will be returned sorted by their name.</param>
153-
public static T[] FindObjects<T>(GameObject parent, string nameChild, bool isContains = false, bool sortByName = false) where T : Component
153+
public static T[] FindObjects<T>(GameObject parent, string nameChild, bool isContains = false, bool sortByName = false, bool includeInactive = true) where T : Component
154154
{
155155
T[] childObjects = null;
156156
List<T> listGameObject = new List<T>();
@@ -160,7 +160,7 @@ public static T[] FindObjects<T>(GameObject parent, string nameChild, bool isCon
160160
for (int i = 0; i < childPath.Length; i++)
161161
{
162162
string childTransformName = childPath[i];
163-
T[] childerenTransform = parent.GetComponentsInChildren<T>(includeInactive: true);
163+
T[] childerenTransform = parent.GetComponentsInChildren<T>(includeInactive: includeInactive);
164164
if (childerenTransform != null)
165165
{
166166
foreach (T item in childerenTransform)

0 commit comments

Comments
 (0)