Skip to content

Commit a388abd

Browse files
committed
chore: def programming
1 parent c168b48 commit a388abd

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

Assets/JCSUnity/Scripts/Managers/JCS_UIManager.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class JCS_UIManager : JCS_Manager<JCS_UIManager>
5858
// List of all the window that are opened!
5959
private LinkedList<JCS_DialogueObject> mOpenWindow = null;
6060

61-
[Header("UI Screen")]
61+
[Header("- UI Screen")]
6262

6363
[Tooltip("Panel that could do the fade loose focus effect.")]
6464
[SerializeField]
@@ -177,6 +177,7 @@ private void Test()
177177
public void AddCanvas(JCS_Canvas canvas)
178178
{
179179
mCanvases.Add(canvas);
180+
mCanvases = JCS_Array.RemoveEmptyMissing(mCanvases);
180181
mCanvases = mCanvases.OrderBy(x => x.canvas.sortingOrder).ToList();
181182
}
182183

Assets/JCSUnity/Scripts/UI/JCS_Canvas.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,9 @@ public void Show(bool mute = false)
336336

337337
private void ShowEnable()
338338
{
339+
if (mCanvas == null)
340+
return;
341+
339342
mCanvas.enabled = true;
340343

341344
if (mCanvasGroup != null)
@@ -344,6 +347,9 @@ private void ShowEnable()
344347

345348
private void ShowFade()
346349
{
350+
if (mCanvas == null)
351+
return;
352+
347353
// Remains enabled since we're going to do fading.
348354
mCanvas.enabled = true;
349355

0 commit comments

Comments
 (0)