报错冲突处理

yyl

2025-05-19 b118ece3db250a5a257b60713da92234d8d5a57a

 Main/Component/UI/Core/CanvasAddition.cs

@@ -30,17 +30,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 +48,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 +71,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;
        }