Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync v3.8.2 to v3.8.3 #16568

Merged
merged 23 commits into from
Dec 8, 2023
Merged

sync v3.8.2 to v3.8.3 #16568

merged 23 commits into from
Dec 8, 2023

Conversation

minggo
Copy link
Contributor

@minggo minggo commented Dec 7, 2023

Re: #

Changelog


Continuous Integration

This pull request:

  • needs automatic test cases check.

    Manual trigger with @cocos-robot run test cases afterward.

  • does not change any runtime related code or build configuration

    If any reviewer thinks the CI checks are needed, please uncheck this option, then close and reopen the issue.


Compatibility Check

This pull request:

  • changes public API, and have ensured backward compatibility with deprecated features.
  • affects platform compatibility, e.g. system version, browser version, platform sdk version, platform toolchain, language version, hardware compatibility etc.
  • affects file structure of the build package or build configuration which requires user project upgrade.
  • introduces breaking changes, please list all changes, affected features and the scope of violation.

bofeng-song and others added 21 commits November 23, 2023 11:24
* Fix linking error of missing bcmp function for OHOS

* Refactor a bit.

* Remove unneeded hack code for android api level <=21, it's probably the building arguments is wrong while building the old v8 9.1.

* std::strcmp -> strcmp
* Fix an error of mesh.renderingSubMeshes is undefined

* Update renderingSubMeshes checking logic
call `_processDeltaMove()` in `update()`
it should not call  run _processDeltaMove()  in every touch move event ,  it will take bad performance.
* feat: inspector: dump merge

* fix: inspector: dump merge
* add missing directional light shadow ubo

* fix lint
…initialized (#16526)

* If the parent node has a uiopacity component, it does not need to be initialized
---------

Co-authored-by: qgh <>
* add disable cpu light-culling to improve cyberpunk

* revert lint
* fix bullet can not work normaly at taobao-creative-app

* update external version

* Revert "fix bullet can not work normaly at taobao-creative-app"

This reverts commit af12ac5.

* refine
…nel audios (#16559)

* fix  infinite loop cause js error while playing more than maxAudioChannel audios
Copy link

github-actions bot commented Dec 7, 2023

Interface Check Report

! WARNING this pull request has changed these public interfaces:

@@ -2922,9 +2922,9 @@
          * 透明度。
          */
         get opacity(): number;
         set opacity(value: number);
-        static setEntityLocalOpacityDirtyRecursively(node: Node, dirty: boolean, interruptParentOpacity: number): void;
+        static setEntityLocalOpacityDirtyRecursively(node: Node, dirty: boolean, interruptParentOpacity: number, setByParent: boolean): void;
         protected _opacity: number;
         onEnable(): void;
         onDisable(): void;
     }
@@ -35955,8 +35955,9 @@
          */
         export interface BasicPipeline extends __private._cocos_rendering_custom_pipeline__PipelineRuntime {
             readonly type: PipelineType;
             readonly capabilities: PipelineCapabilities;
+            enableCpuLightCulling: boolean;
             /**
              * @en Check whether the resource has been registered in the pipeline.
              * @zh 检查资源是否在管线中已注册
              * @param name @en Resource name @zh 资源名字
@@ -45234,8 +45235,10 @@
          * @zh billboard绕中心点旋转的角度
          */
         get rotation(): number;
         set rotation(val: number);
+        get technique(): number;
+        set technique(val: number);
         constructor();
         onLoad(): void;
         onEnable(): void;
         onDisable(): void;
@@ -51732,8 +51735,9 @@
                 transform(x: number, y: number): void;
                 end(): void;
             }
             export class SkeletonSystem {
+                public static destroySpineInstance(instance: SkeletonInstance): void;
                 public static updateAnimation(deltaTime: number): void;
                 public static updateRenderData(): void;
                 public static getCount(): number;
             }
@@ -51770,9 +51774,8 @@
                 static createSpineSkeletonDataWithJson(jsonStr: string, atlasText: string): SkeletonData;
                 static createSpineSkeletonDataWithBinary(byteSize: number, atlasText: string): SkeletonData;
                 static registerSpineSkeletonDataWithUUID(data: SkeletonData, uuid: string);
                 static destroySpineSkeletonDataWithUUID(uuid: string);
-                static destroySpineInstance(instance: SkeletonInstance);
                 static getCurrentListenerID(): number;
                 static getCurrentEventType(): EventType;
                 static getCurrentTrackEntry(): TrackEntry;
                 static getCurrentEvent(): Event;
@@ -55534,8 +55537,9 @@
         protected _scrollEventEmitMask: number;
         protected _isBouncing: boolean;
         protected _contentPos: math.Vec3;
         protected _deltaPos: math.Vec3;
+        protected _deltaAmount: math.Vec3;
         protected _hoverIn: __private._cocos_ui_scroll_view__XrhoverType;
         /**
          * @en
          * Scroll the content to the bottom boundary of ScrollView.
@@ -67134,8 +67138,9 @@
             protected _skeletonBones: sp.spine.Bone[] | _cocos_spine_skeleton_cache__FrameBoneInfo[] | null;
             protected _socketNodes: Map<number, Node> | null;
             constructor();
             init(skeletonComp: sp.Skeleton): void;
+            updateSkeletonBones(bones: _cocos_spine_skeleton_cache__FrameBoneInfo[]): void;
             reset(): void;
             _syncAttachedNode(): void;
             matrixHandle(node: Node, bone: any): void;
         }
@@ -68853,8 +68858,16 @@
          */
         export enum _cocos_ui_scroll_view__EventType {
             /**
              * @en
+             * It means an invalid event type or "default empty value" of EventType.
+             *
+             * @zh
+             * 代表无效事件, 或者EventType的默认空值。
+             */
+            NONE = "",
+            /**
+             * @en
              * The event emitted when ScrollView scroll to the top boundary of inner container.
              *
              * @zh
              * 滚动视图滚动到顶部边界事件。

@minggo minggo merged commit e4da0cb into v3.8.3 Dec 8, 2023
23 of 25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants