@galacean/effects-core 1.2.1 → 1.2.3

package/dist/asset-manager.d.ts

@@ -1,5 +1,4 @@
-import type * as spec from '@galacean/effects-specification';
-import type { JSONValue } from './downloader';
+import * as spec from '@galacean/effects-specification';
 import { Downloader } from './downloader';
 import type { Disposable } from './utils';
 import type { Scene } from './scene';
@@ -73,6 +72,10 @@ export interface SceneLoadOptions {
      */
     speed?: number;
 }
+/**
+ * 被接受用于加载的数据类型
+ */
+export type SceneType = string | Scene | Record<string, unknown>;
 /**
  * 资源管理器
  * 用于加载和动效中所有的资源文件，包括图片、插件、图层粒子数据等
@@ -109,6 +112,10 @@ export declare class AssetManager implements Disposable {
      */
     constructor(options?: SceneLoadOptions, downloader?: Downloader);
     updateOptions(options?: SceneLoadOptions): void;
+    /**
+     * 根据用户传入的参数修改场景数据
+     */
+    private updateSceneData;
     /**
      * 场景创建，通过 json 创建出场景对象，并进行提前编译等工作
      * @param url - json 的 URL 链接或者 json 对象
@@ -116,7 +123,7 @@ export declare class AssetManager implements Disposable {
      * @param options - 扩展参数
      * @returns
      */
-    loadScene(url: string | JSONValue | Scene, renderer?: Renderer, options?: {
+    loadScene(url: SceneType, renderer?: Renderer, options?: {
         env: string;
     }): Promise<Scene>;
     private precompile;

package/dist/composition.d.ts

@@ -1,6 +1,6 @@
 import * as spec from '@galacean/effects-specification';
 import type { Ray } from '@galacean/effects-math/es/core/index';
-import type { JSONValue } from './downloader';
+import type { SceneType } from './asset-manager';
 import type { Scene } from './scene';
 import type { Disposable, LostHandler } from './utils';
 import { Transform } from './transform';
@@ -138,7 +138,7 @@ export declare class Composition implements Disposable, LostHandler {
     /**
      * 合成对应的 url 或者 JSON
      */
-    readonly url: string | JSONValue;
+    readonly url: SceneType;
     /**
      * 合成对象
      */

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v1.2.1
+ * Version: v1.2.3
  */
 
 'use strict';
@@ -19972,9 +19972,10 @@ var TextItem = /** @class */ (function (_super) {
         if (this.textStyle.fontSize === value) {
             return;
         }
+        // 保证字号变化后位置正常
+        var diff = this.textStyle.fontSize - value;
+        this.textLayout.lineHeight += diff;
         this.textStyle.fontSize = value;
-        // 1.5175 = 31.43 / 20
-        this.textLayout.lineHeight = this.textStyle.fontSize * 1.5175;
         this.isDirty = true;
     };
     /**
@@ -23469,6 +23470,26 @@ var AssetManager = /** @class */ (function () {
         var _a = options.timeout, timeout = _a === void 0 ? 10 : _a;
         this.timeout = timeout;
     };
+    /**
+     * 根据用户传入的参数修改场景数据
+     */
+    AssetManager.prototype.updateSceneData = function (compositions) {
+        var variables = this.options.variables;
+        if (!variables || Object.keys(variables).length <= 0) {
+            return compositions;
+        }
+        compositions.forEach(function (composition) {
+            composition.items.forEach(function (item) {
+                if (item.type === ItemType$1.text) {
+                    var textVariable = variables[item.name];
+                    if (textVariable) {
+                        item.content.options.text = textVariable;
+                    }
+                }
+            });
+        });
+        return compositions;
+    };
     /**
      * 场景创建，通过 json 创建出场景对象，并进行提前编译等工作
      * @param url - json 的 URL 链接或者 json 对象
@@ -23560,6 +23581,7 @@ var AssetManager = /** @class */ (function () {
                                 for (i = 0; i < scene.images.length; i++) {
                                     scene.textureOptions[i].image = scene.images[i];
                                 }
+                                scene.jsonScene.compositions = this.updateSceneData(scene.jsonScene.compositions);
                                 _e.label = 5;
                             case 5: return [3 /*break*/, 12];
                             case 6: return [4 /*yield*/, hookTimeInfo('processJSON', function () { return _this.processJSON(rawJSON); })];
@@ -23579,6 +23601,7 @@ var AssetManager = /** @class */ (function () {
                                 return [4 /*yield*/, hookTimeInfo('processTextures', function () { return _this.processTextures(loadedImages_1, loadedBins_1, jsonScene_1); })];
                             case 10:
                                 loadedTextures = _e.sent();
+                                jsonScene_1.compositions = this.updateSceneData(jsonScene_1.compositions);
                                 scene = {
                                     url: url,
                                     renderLevel: this.options.renderLevel,