mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 15:42:39 +08:00
a9f3969245
# Conflicts: # cocos/audio/assets/clip.ts # cocos/core/3d/builtin/effects.ts # cocos/core/3d/framework/batched-skinning-model-component.ts # cocos/core/3d/framework/editor-camera-component.ts # cocos/core/3d/framework/index.ts # cocos/core/3d/framework/model-component.ts # cocos/core/animation/animation-clip.ts # cocos/core/animation/animation-manager.ts # cocos/core/animation/animation-state.ts # cocos/core/animation/skeletal-animation-component.ts # cocos/core/animation/skeletal-animation-state.ts # cocos/core/assets/mesh.ts # cocos/core/assets/simple-texture.ts # cocos/core/assets/sprite-frame.ts # cocos/core/assets/texture-base.ts # cocos/core/data/class-decorator.ts # cocos/core/data/instantiate.ts # cocos/core/event/event-target.ts # cocos/core/game.ts # cocos/core/load-pipeline/CCLoader.ts # cocos/core/load-pipeline/plist-parser.ts # cocos/core/load-pipeline/unpackers.ts # cocos/core/load-pipeline/url.ts # cocos/core/math/deprecated.ts # cocos/core/renderer/scene/model.ts # cocos/core/scene-graph/base-node.ts # cocos/core/scene-graph/scene-globals.ts # cocos/terrain/terrain.ts # predefine.ts