mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
802a1f0959
Conflicts: cocos/core/utils/x-deprecated.ts cocos/physics/bullet/instantiated.ts cocos/physics/framework/components/character-controllers/character-controller.ts cocos/render-scene/scene/shadows.ts cocos/rendering/render-shadow-map-batched-queue.ts cocos/spine/lib/instantiated.ts cocos/spine/lib/spine-define.ts cocos/spine/skeleton.ts native/cocos/editor-support/spine-wasm/AtlasAttachmentLoaderExtension.cpp native/cocos/editor-support/spine-wasm/spine-skeleton-instance.cpp native/cocos/editor-support/spine-wasm/spine-skeleton-instance.h native/cocos/editor-support/spine-wasm/spine-type-export.cpp native/cocos/editor-support/spine-wasm/spine-wasm.cpp native/external-config.json