Merge pull request #808 from galacean/main

Merge origin/main into origin/feat/2.2
galacean · Dec 27, 2024 · 98a2c9c · 98a2c9c
2 parents de402e1 + e2adbf1
commit 98a2c9c
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 24 deletions.
diff --git a/CHANGELOG-zh_CN.md b/CHANGELOG-zh_CN.md
@@ -8,6 +8,14 @@
 
 ---
 
+## 2.1.5
+
+`2024-12-27`
+
+- Fix: 修复消息元素触发问题。[#801](https://github.com/galacean/effects-runtime/pull/801) @Sruimeng
+  - Fix: message item triggering issue caused by time accuracy. [#804](https://github.com/galacean/effects-runtime/pull/804) @wumaolinmaoan
+- Fix: player fps setting. [#802](https://github.com/galacean/effects-runtime/pull/802) @wumaolinmaoan
+
 ## 2.1.4
 
 `2024-12-20`

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@
 
 ---
 
+## 2.1.5
+
+`2024-12-27`
+
+- Fix: Resolve the issue with message element triggering. [#801](https://github.com/galacean/effects-runtime/pull/801) @Sruimeng
+  - Fix: message item triggering issue caused by time accuracy. [#804](https://github.com/galacean/effects-runtime/pull/804) @wumaolinmaoan
+- Fix: player fps setting. [#802](https://github.com/galacean/effects-runtime/pull/802) @wumaolinmaoan
+
 ## 2.1.4
 
 `2024-12-20`

diff --git a/packages/effects-core/package.json b/packages/effects-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-core",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects runtime core for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

diff --git a/packages/effects-core/src/composition.ts b/packages/effects-core/src/composition.ts
@@ -535,7 +535,7 @@ export class Composition extends EventEmitter<CompositionEvent<Composition>> imp
       return;
     }
 
-    const dt = this.getUpdateTime(deltaTime * this.speed);
+    const dt = parseFloat(this.getUpdateTime(deltaTime * this.speed).toFixed(0));
 
     this.updateRootComposition(dt / 1000);
     this.updateVideo();

diff --git a/packages/effects-core/src/plugins/timeline/track.ts b/packages/effects-core/src/plugins/timeline/track.ts
@@ -229,7 +229,7 @@ export class RuntimeClip {
     }
     this.parentMixer.setClipWeight(this.playable, weight);
 
-    const clipTime = clip.toLocalTime(localTime);
+    const clipTime = parseFloat(clip.toLocalTime(localTime).toFixed(3));
 
     this.playable.setTime(clipTime);
 

diff --git a/packages/effects-helper/package.json b/packages/effects-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-helper",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects runtime helper for the web",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/effects-threejs/package.json b/packages/effects-threejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-threejs",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects runtime threejs plugin for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

diff --git a/packages/effects-webgl/package.json b/packages/effects-webgl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-webgl",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects runtime webgl for the web",
   "types": "./dist/index.d.ts",
   "files": [

diff --git a/packages/effects/package.json b/packages/effects/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects runtime player for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

diff --git a/packages/effects/src/player.ts b/packages/effects/src/player.ts
@@ -6,7 +6,7 @@ import {
   AssetManager, Composition, EVENT_TYPE_CLICK, EventSystem, logger, Renderer, Material,
   TextureLoadAction, Ticker, canvasPool, getPixelRatio, gpuTimer, initErrors, isAndroid,
   isArray, pluginLoaderMap, setSpriteMeshMaxItemCountByGPU, spec, EventEmitter,
-  generateWhiteTexture, Texture, PLAYER_OPTIONS_ENV_EDITOR, isIOS, DEFAULT_FPS, Scene,
+  generateWhiteTexture, Texture, PLAYER_OPTIONS_ENV_EDITOR, isIOS, Scene,
 } from '@galacean/effects-core';
 import type { GLRenderer } from '@galacean/effects-webgl';
 import { HELP_LINK } from './constants';
@@ -385,13 +385,9 @@ export class Player extends EventEmitter<PlayerEvent<Player>> implements Disposa
       },
     }, scene);
 
-    if (this.ticker) {
-      // 中低端设备降帧到 30fps
-      if (opts.renderLevel === spec.RenderLevel.B) {
-        this.ticker.setFPS(Math.min(this.ticker.getFPS(), 30));
-      } else {
-        this.ticker.setFPS(DEFAULT_FPS);
-      }
+    // 中低端设备降帧到 30fps·
+    if (this.ticker && opts.renderLevel === spec.RenderLevel.B) {
+      this.ticker.setFPS(Math.min(this.ticker.getFPS(), 30));
     }
 
     // TODO 目前编辑器会每帧调用 loadScene, 在这编译会导致闪帧，待编辑器渲染逻辑优化后移除。

diff --git a/plugin-packages/alipay-downgrade/package.json b/plugin-packages/alipay-downgrade/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-alipay-downgrade",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects player downgrade plugin for Alipay",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

diff --git a/plugin-packages/downgrade/package.json b/plugin-packages/downgrade/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-downgrade",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects player downgrade plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

diff --git a/plugin-packages/editor-gizmo/package.json b/plugin-packages/editor-gizmo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-editor-gizmo",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects player editor gizmo plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

diff --git a/plugin-packages/model/package.json b/plugin-packages/model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-model",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects player model plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

diff --git a/plugin-packages/multimedia/package.json b/plugin-packages/multimedia/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-multimedia",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects player multimedia plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

diff --git a/plugin-packages/orientation-transformer/package.json b/plugin-packages/orientation-transformer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-orientation-transformer",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects player orientation transformer plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

diff --git a/plugin-packages/rich-text/package.json b/plugin-packages/rich-text/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-rich-text",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects player richtext plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

diff --git a/plugin-packages/spine/package.json b/plugin-packages/spine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-spine",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects player spine plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

diff --git a/plugin-packages/stats/package.json b/plugin-packages/stats/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-stats",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Galacean Effects runtime stats for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",