Skip to content

Commit d00e2e5

Browse files
michael811125michael811125
committed
added HideAllAndExcluded
1 parent 5f31755 commit d00e2e5

4 files changed

Lines changed: 38 additions & 18 deletions

File tree

‎Assets/OxGFrame/CoreFrame/Scripts/Runtime/Core/CoreFrames.cs‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -326,14 +326,24 @@ public static void Hide(string assetName)
326326
UIManager.GetInstance().Hide(assetName);
327327
}
328328

329-
public static void HideAll()
329+
public static void HideAll(params string[] withoutAssetNames)
330330
{
331-
UIManager.GetInstance().HideAll();
331+
UIManager.GetInstance().HideAll(false, withoutAssetNames);
332332
}
333333

334-
public static void HideAll(int groupId)
334+
public static void HideAll(int groupId, params string[] withoutAssetNames)
335335
{
336-
UIManager.GetInstance().HideAll(groupId);
336+
UIManager.GetInstance().HideAll(groupId, false, withoutAssetNames);
337+
}
338+
339+
public static void HideAllAndExcluded()
340+
{
341+
UIManager.GetInstance().HideAll(true);
342+
}
343+
344+
public static void HideAllAndExcluded(int groupId)
345+
{
346+
UIManager.GetInstance().HideAll(groupId, true);
337347
}
338348
#endregion
339349
}
@@ -598,14 +608,24 @@ public static void Hide(string assetName)
598608
SRManager.GetInstance().Hide(assetName);
599609
}
600610

601-
public static void HideAll()
611+
public static void HideAll(params string[] withoutAssetNames)
612+
{
613+
SRManager.GetInstance().HideAll(false, withoutAssetNames);
614+
}
615+
616+
public static void HideAll(int groupId, params string[] withoutAssetNames)
617+
{
618+
SRManager.GetInstance().HideAll(groupId, false, withoutAssetNames);
619+
}
620+
621+
public static void HideAllAndExcluded()
602622
{
603-
SRManager.GetInstance().HideAll();
623+
SRManager.GetInstance().HideAll(true);
604624
}
605625

606-
public static void HideAll(int groupId)
626+
public static void HideAllAndExcluded(int groupId)
607627
{
608-
SRManager.GetInstance().HideAll(groupId);
628+
SRManager.GetInstance().HideAll(groupId, true);
609629
}
610630
#endregion
611631
}

‎Assets/OxGFrame/CoreFrame/Scripts/Runtime/Core/Implement/FrameManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,13 +620,13 @@ public virtual void Hide(string assetName) { }
620620
/// <summary>
621621
/// 全部隱藏 (可透過 Show 或者 Reveal 進行顯示, 差別在於初始行為)
622622
/// </summary>
623-
public virtual void HideAll(params string[] withoutAssetNames) { }
623+
public virtual void HideAll(bool forceHideExcluded = false, params string[] withoutAssetNames) { }
624624

625625
/// <summary>
626626
/// 透過 id 群組進行全部隱藏 (可透過 Show 或者 Reveal 進行顯示, 差別在於初始行為)
627627
/// </summary>
628628
/// <param name="groupId"></param>
629-
public virtual void HideAll(int groupId, params string[] withoutAssetNames) { }
629+
public virtual void HideAll(int groupId, bool forceHideExcluded = false, params string[] withoutAssetNames) { }
630630
#endregion
631631

632632
#region Destroy

‎Assets/OxGFrame/CoreFrame/Scripts/Runtime/Core/SRFrame/SRManager.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ public override void Hide(string assetName)
360360
this._Hide(assetName);
361361
}
362362

363-
public override void HideAll(params string[] withoutAssetNames)
363+
public override void HideAll(bool forceHideExcluded = false, params string[] withoutAssetNames)
364364
{
365365
if (this._dictAllCache.Count == 0) return;
366366

@@ -391,13 +391,13 @@ public override void HideAll(params string[] withoutAssetNames)
391391
if (checkWithout) continue;
392392

393393
// 如有啟用 HideAll 需跳過開關, 則不列入關閉執行
394-
if (srBase.srSetting.whenHideAllToSkip) continue;
394+
if (!forceHideExcluded && srBase.srSetting.whenHideAllToSkip) continue;
395395

396396
this._Hide(assetName);
397397
}
398398
}
399399

400-
public override void HideAll(int groupId, params string[] withoutAssetNames)
400+
public override void HideAll(int groupId, bool forceHideExcluded = false, params string[] withoutAssetNames)
401401
{
402402
if (this._dictAllCache.Count == 0) return;
403403

@@ -430,7 +430,7 @@ public override void HideAll(int groupId, params string[] withoutAssetNames)
430430
if (checkWithout) continue;
431431

432432
// 如有啟用 HideAll 需跳過開關, 則不列入關閉執行
433-
if (srBase.srSetting.whenHideAllToSkip) continue;
433+
if (!forceHideExcluded && srBase.srSetting.whenHideAllToSkip) continue;
434434

435435
this._Hide(assetName);
436436
}

‎Assets/OxGFrame/CoreFrame/Scripts/Runtime/Core/UIFrame/UIManager.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ public override void Hide(string assetName)
810810
this._Hide(assetName);
811811
}
812812

813-
public override void HideAll(params string[] withoutAssetNames)
813+
public override void HideAll(bool forceHideExcluded = false, params string[] withoutAssetNames)
814814
{
815815
if (this._dictAllCache.Count == 0) return;
816816

@@ -842,13 +842,13 @@ public override void HideAll(params string[] withoutAssetNames)
842842
if (checkWithout) continue;
843843

844844
// 如有啟用 HideAll 需跳過開關, 則不列入關閉執行
845-
if (!uiBase.reverseChanges && uiBase.uiSetting.whenHideAllToSkip) continue;
845+
if (!forceHideExcluded && !uiBase.reverseChanges && uiBase.uiSetting.whenHideAllToSkip) continue;
846846

847847
this._Hide(assetName);
848848
}
849849
}
850850

851-
public override void HideAll(int groupId, params string[] withoutAssetNames)
851+
public override void HideAll(int groupId, bool forceHideExcluded = false, params string[] withoutAssetNames)
852852
{
853853
if (this._dictAllCache.Count == 0) return;
854854

@@ -882,7 +882,7 @@ public override void HideAll(int groupId, params string[] withoutAssetNames)
882882
if (checkWithout) continue;
883883

884884
// 如有啟用 HideAll 需跳過開關, 則不列入關閉執行
885-
if (!uiBase.reverseChanges && uiBase.uiSetting.whenHideAllToSkip) continue;
885+
if (!forceHideExcluded && !uiBase.reverseChanges && uiBase.uiSetting.whenHideAllToSkip) continue;
886886

887887
this._Hide(assetName);
888888
}

0 commit comments

Comments
 (0)