Merge pull request #1166 from galacean/main

Merge origin/main into origin/dev

Author: yiiqii

CHANGELOG-zh_CN.md

@@ -8,6 +8,25 @@
 
 ---
 
+## 2.6.5
+
+`2025-08-29`
+
+- Fix: video `gotoAndStop` func. [#1159](https://github.com/galacean/effects-runtime/pull/1159) @ChengYi996
+
+## 2.6.4
+
+`2025-08-26`
+
+- Fix: add video assets dispose logic. [#1157](https://github.com/galacean/effects-runtime/pull/1157) @wumaolinmaoan
+
+## 2.6.3
+
+`2025-08-22`
+
+- Fix: the adapter returns a string when loading JSON from a relative path in the miniprogram. [#1145](https://github.com/galacean/effects-runtime/pull/1145) @yiiqii
+- Fix: plain object judgment. [#1147](https://github.com/galacean/effects-runtime/pull/1147) @wumaolinmaoan
+
 ## 2.6.2
 
 `2025-08-15`

CHANGELOG.md

@@ -7,6 +7,25 @@
 
 ---
 
+## 2.6.5
+
+`2025-08-29`
+
+- Fix: video `gotoAndStop` func. [#1159](https://github.com/galacean/effects-runtime/pull/1159) @ChengYi996
+
+## 2.6.4
+
+`2025-08-26`
+
+- Fix: add video assets dispose logic. [#1157](https://github.com/galacean/effects-runtime/pull/1157) @wumaolinmaoan
+
+## 2.6.3
+
+`2025-08-22`
+
+- Fix: the adapter returns a string when loading JSON from a relative path in the miniprogram. [#1145](https://github.com/galacean/effects-runtime/pull/1145) @yiiqii
+- Fix: plain object judgment. [#1147](https://github.com/galacean/effects-runtime/pull/1147) @wumaolinmaoan
+
 ## 2.6.2
 
 `2025-08-15`

packages/effects-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-core",
-  "version": "2.6.2",
+  "version": "2.6.5",
   "description": "Galacean Effects runtime core for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

packages/effects-core/src/composition.ts

@@ -251,6 +251,7 @@ export class Composition extends EventEmitter<CompositionEvent<Composition>> imp
   private paused = false;
   private isEndCalled = false;
   private _textures: Texture[] = [];
+  private videos: HTMLVideoElement[] = [];
 
   /**
    * 合成中消息元素创建/销毁时触发的回调
@@ -305,6 +306,15 @@ export class Composition extends EventEmitter<CompositionEvent<Composition>> imp
 
     this.renderer = renderer;
     this._textures = scene.textures;
+
+    for (const key of Object.keys(scene.assets)) {
+      const videoAsset = scene.assets[key];
+
+      if (videoAsset instanceof HTMLVideoElement) {
+        this.videos.push(videoAsset);
+      }
+    }
+
     this.postProcessingEnabled = scene.jsonScene.renderSettings?.postProcessingEnabled ?? false;
     this.getEngine().renderLevel = scene.renderLevel;
 
@@ -905,6 +915,14 @@ export class Composition extends EventEmitter<CompositionEvent<Composition>> imp
         // textures.forEach(tex => tex && tex.dispose());
       }
     }
+
+    for (const video of this.videos) {
+      video.pause();
+      video.removeAttribute('src');
+      video.load();
+    }
+    this.videos = [];
+
     this.rootItem.dispose();
     // FIXME: 注意这里增加了renderFrame销毁
     this.renderFrame.dispose();

packages/effects-helper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-helper",
-  "version": "2.6.2",
+  "version": "2.6.5",
   "description": "Galacean Effects runtime helper for the web",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",

packages/effects-threejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-threejs",
-  "version": "2.6.2",
+  "version": "2.6.5",
   "description": "Galacean Effects runtime threejs plugin for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

packages/effects-webgl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-webgl",
-  "version": "2.6.2",
+  "version": "2.6.5",
   "description": "Galacean Effects runtime webgl for the web",
   "types": "./dist/index.d.ts",
   "files": [

packages/effects/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects",
-  "version": "2.6.2",
+  "version": "2.6.5",
   "description": "Galacean Effects runtime player for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

plugin-packages/alipay-downgrade/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-alipay-downgrade",
-  "version": "2.6.2",
+  "version": "2.6.5",
   "description": "Galacean Effects player downgrade plugin for Alipay",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

plugin-packages/downgrade/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-downgrade",
-  "version": "2.6.2",
+  "version": "2.6.5",
   "description": "Galacean Effects player downgrade plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",