From 39001a600fcae2bcf27c225df8752d75fb92fef4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 31 十月 2025 11:18:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/Component/UI/Core/CanvasAddition.cs | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/Main/Component/UI/Core/CanvasAddition.cs b/Main/Component/UI/Core/CanvasAddition.cs
index d9ce2f4..c7ae492 100644
--- a/Main/Component/UI/Core/CanvasAddition.cs
+++ b/Main/Component/UI/Core/CanvasAddition.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
-using vnxbqy.UI;
[DisallowMultipleComponent]
[RequireComponent(typeof(Canvas))]
@@ -30,17 +29,17 @@
{
m_Canvas = this.GetComponent<Canvas>();
- WindowCenter.Instance.windowAfterOpenEvent += OnWindowOpen;
- WindowCenter.Instance.windowAfterCloseEvent += OnWindowClose;
+ UIManager.Instance.OnOpenWindow += OnWindowOpen;
+ UIManager.Instance.OnCloseWindow += OnWindowClose;
}
private void OnDestroy()
{
- WindowCenter.Instance.windowAfterOpenEvent -= OnWindowOpen;
- WindowCenter.Instance.windowAfterCloseEvent -= OnWindowClose;
+ UIManager.Instance.OnOpenWindow -= OnWindowOpen;
+ UIManager.Instance.OnCloseWindow -= OnWindowClose;
}
- private void OnWindowOpen(Window _window)
+ private void OnWindowOpen(UIBase _window)
{
var culling = false;
switch (m_Culling)
@@ -48,18 +47,22 @@
case CullingFullScreenType.None:
culling = false;
break;
- case CullingFullScreenType.Any:
- culling = WindowCenter.Instance.ExistAnyFullScreenOrMaskWin();
- break;
+
+ // TODO YYL
+ // case CullingFullScreenType.Any:
+ // culling = UIManager.Instance.ExistAnyFullScreenOrMaskWin();
+ // break;
+ // default:
+ // culling = UIManager.Instance.ExistAnyFullScreenOrMaskWinLEqual((WindowType)m_Culling);
+ // break;
default:
- culling = WindowCenter.Instance.ExistAnyFullScreenOrMaskWinLEqual((WindowType)m_Culling);
break;
}
canvas.gameObject.SetLayer(culling ? LayerUtility.DevisableUI : LayerUtility.UILayer, false);
}
- private void OnWindowClose(Window _window)
+ private void OnWindowClose(UIBase _window)
{
var culling = false;
switch (m_Culling)
@@ -67,11 +70,15 @@
case CullingFullScreenType.None:
culling = false;
break;
- case CullingFullScreenType.Any:
- culling = WindowCenter.Instance.ExistAnyFullScreenOrMaskWin();
- break;
+
+ // TODO YYL
+ // case CullingFullScreenType.Any:
+ // culling = WindowCenter.Instance.ExistAnyFullScreenOrMaskWin();
+ // break;
+ // default:
+ // culling = WindowCenter.Instance.ExistAnyFullScreenOrMaskWinLEqual((WindowType)m_Culling);
+ // break;
default:
- culling = WindowCenter.Instance.ExistAnyFullScreenOrMaskWinLEqual((WindowType)m_Culling);
break;
}
--
Gitblit v1.8.0