mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 15:42:39 +08:00
802d7a9b49
# Conflicts: # cocos/core/components/ui-base/canvas-component.ts # cocos/core/components/ui-base/ui-render-component.ts # cocos/core/game.ts # cocos/core/pipeline/forward/forward-pipeline.ts # cocos/core/pipeline/render-flow.ts # cocos/core/pipeline/render-pipeline.ts # cocos/core/root.ts # cocos/core/scene-graph/base-node.ts