@galacean/effects 1.2.1 → 1.2.3

package/dist/player.d.ts

@@ -1,4 +1,4 @@
-import type { Disposable, JSONValue, LostHandler, RestoreHandler, SceneLoadOptions, Scene, math, GPUCapability } from '@galacean/effects-core';
+import type { Disposable, LostHandler, RestoreHandler, SceneLoadOptions, SceneType, math, GPUCapability } from '@galacean/effects-core';
 import { Ticker, Composition, Renderer } from '@galacean/effects-core';
 /**
  * `onItemClicked` 点击回调函数的传入参数
@@ -119,7 +119,6 @@ export interface PlayerConfig {
     reportGPUTime?: (time: number) => void;
     [key: string]: any;
 }
-export type SceneType = string | JSONValue | Scene;
 export type SceneWithOptionsType = {
     scene: SceneType;
     options: SceneLoadOptions;

package/dist/weapp.js

@@ -19966,9 +19966,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;
     };
     /**
@@ -23463,6 +23464,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 对象
@@ -23554,6 +23575,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); })];
@@ -23573,6 +23595,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,
@@ -30287,7 +30310,7 @@ var Player = /** @class */ (function () {
 }());
 function isSceneWithOptions(scene) {
     // TODO: 判断不太优雅，后期试情况优化
-    return isObject(scene) && 'scene' in scene;
+    return isObject(scene) && 'scene' in scene && 'options' in scene;
 }
 /**
  * 禁止/允许创建新的播放器，已创建的不受影响
@@ -30417,7 +30440,7 @@ Renderer.create = function (canvas, framework, renderOptions) {
 Engine.create = function (gl) {
     return new GLEngine(gl);
 };
-var version = "1.2.1";
+var version = "1.2.3";
 logger.info('player version: ' + version);
 
 exports.AbstractPlugin = AbstractPlugin;