@galacean/engine-ui 1.6.0-alpha.1 → 1.6.0-alpha.2

package/dist/browser.js

@@ -560,14 +560,30 @@
         _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
             // @ts-ignore
             Transform.prototype._cloneTo.call(this, target, srcRoot, targetRoot);
-            target.size.copyFrom(this._size);
-            target.pivot.copyFrom(this._pivot);
+            var size = target._size, pivot = target._pivot;
+            // @ts-ignore
+            size._onValueChanged = pivot._onValueChanged = null;
+            size.copyFrom(this._size);
+            pivot.copyFrom(this._pivot);
+            // @ts-ignore
+            size._onValueChanged = target._onSizeChanged;
+            // @ts-ignore
+            pivot._onValueChanged = target._onPivotChanged;
         };
         _proto._onLocalMatrixChanging = function _onLocalMatrixChanging() {
-            this._updatePositionByAlignment();
+            // `super._onLocalMatrixChanging()` will set `LocalMatrix` dirty flag `false`
+            // If there is an alignment, `position` and `localMatrix` will be reset again
+            if (this._horizontalAlignment || this._verticalAlignment) {
+                this._updatePositionByAlignment();
+                this._setDirtyFlagTrue(engine.TransformModifyFlags.LocalMatrix);
+            } else {
+                Transform.prototype._onLocalMatrixChanging.call(this);
+            }
         };
-        _proto._onWorldMatrixChange = function _onWorldMatrixChange() {
-            !this._horizontalAlignment && !this._verticalAlignment && Transform.prototype._onWorldMatrixChange.call(this);
+        _proto._onWorldMatrixChanging = function _onWorldMatrixChanging() {
+            // `super._onWorldMatrixChanging()` will set `WorldMatrix` dirty flag `false`
+            // If there is an alignment, `position` and `worldMatrix` will be reset again(`worldMatrix` dirty flag is already `true`)
+            !this._horizontalAlignment && !this._verticalAlignment && Transform.prototype._onWorldMatrixChanging.call(this);
         };
         _proto._onPositionChanged = function _onPositionChanged() {
             (this._horizontalAlignment || this._verticalAlignment) && this._updatePositionByAlignment();
@@ -633,7 +649,7 @@
                 size._onValueChanged = this._onSizeChanged;
             }
         };
-        _proto._updateRectByPivot = function _updateRectByPivot() {
+        _proto._updateRectBySizeAndPivot = function _updateRectBySizeAndPivot() {
             var _this = this, size = _this.size, pivot = _this._pivot;
             var x = -pivot.x * size.x;
             var y = -pivot.y * size.y;
@@ -643,13 +659,13 @@
             if (this._horizontalAlignment === HorizontalAlignmentMode.LeftAndRight || this._verticalAlignment === VerticalAlignmentMode.TopAndBottom) {
                 this._updateSizeByAlignment();
             }
-            this._updateRectByPivot();
+            this._updateRectBySizeAndPivot();
             this._updateWorldFlagWithSelfRectChange();
             // @ts-ignore
             this._entity._updateFlagManager.dispatch(512);
         };
         _proto._onPivotChanged = function _onPivotChanged() {
-            this._updateRectByPivot();
+            this._updateRectBySizeAndPivot();
             this._updateWorldFlagWithSelfRectChange();
             // @ts-ignore
             this._entity._updateFlagManager.dispatch(1024);
@@ -676,7 +692,7 @@
                 if (horizontalAlignment || verticalAlignment) {
                     if (horizontalAlignment === HorizontalAlignmentMode.LeftAndRight || verticalAlignment === VerticalAlignmentMode.TopAndBottom) {
                         this._updateSizeByAlignment();
-                        this._updateRectByPivot();
+                        this._updateRectBySizeAndPivot();
                         selfChange = true;
                     }
                     this._updatePositionByAlignment();
@@ -899,13 +915,13 @@
         return UITransform;
     }(engine.Transform);
     __decorate([
-        engine.deepClone
+        engine.ignoreClone
     ], UITransform.prototype, "_size", void 0);
     __decorate([
-        engine.deepClone
+        engine.ignoreClone
     ], UITransform.prototype, "_pivot", void 0);
     __decorate([
-        engine.ignoreClone
+        engine.deepClone
     ], UITransform.prototype, "_rect", void 0);
     __decorate([
         engine.ignoreClone
@@ -2701,6 +2717,7 @@
         };
         _proto._buildChunk = function _buildChunk(textChunk, count) {
             var _this_color = this.color, r = _this_color.r, g = _this_color.g, b = _this_color.b, a = _this_color.a;
+            var finalAlpha = a * this._getGlobalAlpha();
             var tempIndices = engine.CharRenderInfo.triangles;
             var tempIndicesLength = tempIndices.length;
             var subChunk = textChunk.subChunk = this._getChunkManager().allocateSubChunk(count * 4);
@@ -2721,7 +2738,7 @@
                     vertices[vo + 2] = r;
                     vertices[vo + 3] = g;
                     vertices[vo + 4] = b;
-                    vertices[vo + 5] = a;
+                    vertices[vo + 5] = finalAlpha;
                 }
             }
             return subChunk;