mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
b2830f5271
# Conflicts: # cocos/core/3d/builtin/effects.ts # cocos/core/3d/framework/light-component.ts # cocos/core/3d/framework/model-component.ts # cocos/core/animation/animation-state.ts # cocos/core/assets/image-asset.ts # cocos/core/data/object.ts # cocos/core/event/callbacks-invoker.ts # cocos/core/game.ts # cocos/core/gfx/webgl/webgl-commands.ts # cocos/core/gfx/webgl2/webgl2-commands.ts # cocos/core/pipeline/define.ts # cocos/core/platform/event-manager/events.ts # cocos/core/primitive/primitive.ts # cocos/core/renderer/scene/model.ts # cocos/core/renderer/scene/render-scene.ts # cocos/core/root.ts # cocos/core/scene-graph/node-event-processor.ts # cocos/core/splash-screen-webgl.ts # cocos/particle/index.ts # cocos/terrain/terrain.ts # exports/base.ts