Merge branch 'v3.5.1' into v3.6.0_merge_v3.5.1

kylin206 · May 24, 2022 · 7814949 · 7814949
2 parents c09995b + 9be0225
commit 7814949
Show file tree

Hide file tree

Showing 954 changed files with 11,304 additions and 4,782 deletions.
diff --git a/.github/workflows/build-problem-matcher.json b/.github/workflows/build-problem-matcher.json
@@ -2,7 +2,7 @@
 {
     "problemMatcher": [
         {
-            "owner": "circular-reference-check",
+            "owner": "<Web> build",
             "pattern": [
                 {
                     "regexp": "^Circular dependency: (.*)$",

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -56,7 +56,8 @@
                 "program": "${workspaceFolder}/node_modules/jest/bin/jest.js"
             },
             "args": [
-                "${fileBasenameNoExtension}"
+                "--runTestsByPath",
+                "${relativeFileDirname}/${fileBasename}"
             ],
             "cwd": "${workspaceFolder}",
             "console": "integratedTerminal",

diff --git a/cocos/2d/assembler/graphics/webgl/graphics-assembler.ts b/cocos/2d/assembler/graphics/webgl/graphics-assembler.ts
@@ -22,12 +22,6 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 */
-
-/**
- * @packageDocumentation
- * @module ui-assembler
- */
-
 import { Color, Vec3 } from '../../../../core/math';
 import { IAssembler } from '../../../renderer/base';
 import { MeshRenderData } from '../../../renderer/render-data';

diff --git a/cocos/2d/assembler/index.ts b/cocos/2d/assembler/index.ts
@@ -23,11 +23,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module ui
- */
-
 import './utils';
 
 export * from './graphics';

diff --git a/cocos/2d/assembler/label/bmfont.ts b/cocos/2d/assembler/label/bmfont.ts
@@ -23,11 +23,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module ui-assembler
- */
-
 import { SpriteFrame } from '../../assets/sprite-frame';
 import * as js from '../../../core/utils/js';
 import { Color, Rect } from '../../../core/math';

diff --git a/cocos/2d/assembler/label/index.ts b/cocos/2d/assembler/label/index.ts
@@ -23,11 +23,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module ui-assembler
- */
-
 import { BitmapFont } from '../../assets';
 import { Label } from '../../components';
 import { IAssemblerManager } from '../../renderer/base';

diff --git a/cocos/2d/assembler/label/letter.ts b/cocos/2d/assembler/label/letter.ts
@@ -23,11 +23,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module ui-assembler
- */
-
 import { addon } from '../../../core/utils/js';
 import { IBatcher } from '../../renderer/i-batcher';
 import { Label } from '../../components/label';

diff --git a/cocos/2d/assembler/mask/index.ts b/cocos/2d/assembler/mask/index.ts
@@ -23,8 +23,6 @@
  THE SOFTWARE.
  */
 
-
-
 import { maskAssembler as mask, maskEndAssembler as maskEnd } from './mask-assembler';
 
 export {

diff --git a/cocos/2d/assembler/mask/mask-assembler.ts b/cocos/2d/assembler/mask/mask-assembler.ts
@@ -23,11 +23,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module ui-assembler
- */
-
 import { IBatcher } from '../../renderer/i-batcher';
 import { Mask, MaskType } from '../../components/mask';
 import { IAssembler, IAssemblerManager } from '../../renderer/base';

diff --git a/cocos/2d/assembler/sprite/bar-filled.ts b/cocos/2d/assembler/sprite/bar-filled.ts
@@ -23,11 +23,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module ui-assembler
- */
-
 import { Color, Mat4, Vec3 } from '../../../core/math';
 import { IRenderData, RenderData } from '../../renderer/render-data';
 import { IBatcher } from '../../renderer/i-batcher';

diff --git a/cocos/2d/assembler/sprite/radial-filled.ts b/cocos/2d/assembler/sprite/radial-filled.ts
@@ -23,11 +23,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module ui-assembler
- */
-
 import { SpriteFrame } from '../../assets';
 import { Color, Mat4, Vec2, Vec3 } from '../../../core/math';
 import { IRenderData, RenderData } from '../../renderer/render-data';

diff --git a/cocos/2d/assembler/sprite/simple.ts b/cocos/2d/assembler/sprite/simple.ts
@@ -23,11 +23,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module ui-assembler
- */
-
 import { Vec3 } from '../../../core/math';
 import { IAssembler } from '../../renderer/base';
 import { IRenderData, RenderData } from '../../renderer/render-data';

diff --git a/cocos/2d/assembler/sprite/sliced.ts b/cocos/2d/assembler/sprite/sliced.ts
@@ -23,11 +23,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module ui-assembler
- */
-
 import { Mat4, Vec3 } from '../../../core/math';
 import { IRenderData, RenderData } from '../../renderer/render-data';
 import { IBatcher } from '../../renderer/i-batcher';

diff --git a/cocos/2d/assembler/utils.ts b/cocos/2d/assembler/utils.ts
@@ -23,8 +23,6 @@
  THE SOFTWARE.
  */
 
-
-
 import { Color, Mat4, Vec3 } from '../../core/math';
 import { RenderData } from '../renderer/render-data';
 import { IBatcher } from '../renderer/i-batcher';

diff --git a/cocos/2d/assets/bitmap-font.ts b/cocos/2d/assets/bitmap-font.ts
@@ -24,11 +24,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module asset
- */
-
 import { ccclass, type, serializable, editable } from 'cc.decorator';
 import { Font } from './font';
 import { SpriteFrame } from './sprite-frame';

diff --git a/cocos/2d/assets/font.ts b/cocos/2d/assets/font.ts
@@ -24,11 +24,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module asset
- */
-
 import { ccclass } from 'cc.decorator';
 import { Asset } from '../../core/assets';
 import { legacyCC } from '../../core/global-exports';

diff --git a/cocos/2d/assets/index.ts b/cocos/2d/assets/index.ts
@@ -1,7 +1,4 @@
-/**
- * @packageDocumentation
- * @module asset
- */
+
 
 export * from './sprite-frame';
 export { SpriteAtlas } from './sprite-atlas';

diff --git a/cocos/2d/assets/label-atlas.ts b/cocos/2d/assets/label-atlas.ts
@@ -24,11 +24,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module asset
- */
-
 import { ccclass } from 'cc.decorator';
 import { BitmapFont } from './bitmap-font';
 import { legacyCC } from '../../core/global-exports';

diff --git a/cocos/2d/assets/sprite-atlas.ts b/cocos/2d/assets/sprite-atlas.ts
@@ -24,11 +24,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module asset
- */
-
 import { EDITOR, TEST } from 'internal:constants';
 import { ccclass, serializable, editable } from 'cc.decorator';
 import * as js from '../../core/utils/js';

diff --git a/cocos/2d/assets/sprite-frame.ts b/cocos/2d/assets/sprite-frame.ts
@@ -25,11 +25,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module asset
- */
-
 import { ccclass } from 'cc.decorator';
 import { EDITOR, TEST, BUILD } from 'internal:constants';
 import { Rect, Size, Vec2 } from '../../core/math';
@@ -239,8 +234,8 @@ export class SpriteFrame extends Asset {
     }
 
     /**
-     * @en
-     * @zh
+     * @en uv update event
+     * @zh uv 更新事件
      */
     public static EVENT_UV_UPDATED = 'uv_updated';
 
@@ -661,7 +656,7 @@ export class SpriteFrame extends Asset {
     }
 
     /**
-     * @en Gets the related GFX [[Texture]] resource
+     * @en Gets the related GFX [[gfx.Texture]] resource
      * @zh 获取渲染贴图的 GFX 资源
      */
     public getGFXTexture () {

diff --git a/cocos/2d/assets/ttf-font.ts b/cocos/2d/assets/ttf-font.ts
@@ -24,11 +24,6 @@
  THE SOFTWARE.
 */
 
-/**
- * @packageDocumentation
- * @module asset
- */
-
 import { ccclass, string, override, serializable } from 'cc.decorator';
 import { extname } from '../../core/utils/path';
 import { Font } from './font';

diff --git a/cocos/2d/components/deprecated.ts b/cocos/2d/components/deprecated.ts
@@ -23,10 +23,6 @@
  THE SOFTWARE.
  */
 
-/**
- * @packageDocumentation
- * @module ui
- */
 import { Mask } from './mask';
 import { Label } from './label';
 import { LabelOutline } from './label-outline';
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,8 +23,6 @@ @@
      THE SOFTWARE.
      */
     import { maskAssembler as mask, maskEndAssembler as maskEnd } from './mask-assembler';
     export {
@@ Expand Down @@