minggo
|
e7c5b34e18
|
Merge branch 'v3.8.0' into v3.8.1-merge-v3.8.0
Conflicts:
cocos/2d/assembler/label/text-processing.ts
cocos/physics/bullet/instantiated.ts
cocos/profiler/profiler.ts
cocos/rendering/custom/executor.ts
cocos/rendering/custom/index.ts
cocos/rendering/custom/web-pipeline.ts
cocos/rendering/pipeline-scene-data.ts
cocos/root.ts
cocos/spine/assembler/simple.ts
cocos/spine/lib/instantiated.ts
cocos/spine/lib/spine-define.ts
cocos/spine/skeleton.ts
|
2023-06-27 13:35:35 +08:00 |
|