mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
7ef995b655
Conflicts: cocos/3d/lights/spot-light-component.ts cocos/animation/event/event-emitter.ts cocos/physics-2d/box2d/physics-contact.ts cocos/physics-2d/box2d/physics-world.ts cocos/physics-2d/box2d/platform/physics-contact-listener.ts cocos/physics-2d/builtin/builtin-world.ts cocos/physics/framework/components/constraints/configurable-constraint.ts cocos/spine/assembler/simple.ts cocos/spine/skeleton.ts native/cocos/editor-support/spine-wasm/spine-model.cpp native/cocos/editor-support/spine-wasm/spine-model.h 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/external-config.json