@galacean/engine-core 0.0.0-experimental-2.0-migrate.4 → 0.0.0-experimental-2.0-migrate.6

package/dist/main.js

@@ -131,61 +131,58 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
   return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
+/** @internal */ var defaultCloneModeKey = Symbol("defaultCloneMode");
+/** @internal */ var fieldCloneModesKey = Symbol("fieldCloneModes");
 /**
- * How a field is cloned when a clone decorator overrides the built-in default for its type.
+ * @internal
  */ var CloneMode = /*#__PURE__*/ function(CloneMode) {
-    /** Skip — keep the clone's own constructor-built value (for runtime / transient state). */ CloneMode[CloneMode["Ignore"] = 0] = "Ignore";
-    /** Share the reference; a counted resource shared at a component's top-level slot is kept alive by the clone. */ CloneMode[CloneMode["Assignment"] = 1] = "Assignment";
-    /**
-   * Deep clone the whole subtree (fresh containers/instances, the intent carries into members);
-   * engine-bound members keep their defaults — assets stay shared, entity refs remap, runtime
-   * state keeps the clone's own.
-   */ CloneMode[CloneMode["Deep"] = 2] = "Deep";
+    CloneMode[CloneMode["Ignore"] = 0] = "Ignore";
+    CloneMode[CloneMode["Assignment"] = 1] = "Assignment";
+    CloneMode[CloneMode["Remap"] = 2] = "Remap";
+    CloneMode[CloneMode["Copy"] = 3] = "Copy";
+    CloneMode[CloneMode["Deep"] = 4] = "Deep";
     return CloneMode;
 }({});
-
 /**
  * Property decorator — deep clone this field's whole subtree, overriding the value type's default
- * clone mode (field-level decorators have the highest priority). The deep intent carries into the
- * field's members; engine-bound members keep their defaults (assets share, entity refs remap).
- * A decorator is an explicit intent: if the decorated value itself can't be deep cloned (an
- * entity reference, an asset, or a function), cloning throws rather than silently falling back.
+ * clone mode (field-level decorators have the highest priority). The deep intent carries into
+ * field-cloneable members; engine-bound and platform objects keep their defaults. A decorator is
+ * an explicit intent: if the decorated value itself can't be deep cloned (an entity reference,
+ * asset, function, or object with opaque internal state), cloning throws rather than falling back.
+ * Field-cloned classes reproduce only their own enumerable string-keyed properties.
  */ function deepClone(target, propertyKey) {
-    CloneManager._registerFieldMode(target, propertyKey, CloneMode.Deep);
+    CloneMetadata.registerFieldMode(target, propertyKey, 4);
 }
 /**
  * Property decorator — assign (share the reference) this field, overriding the value type's default clone mode.
  */ function assignmentClone(target, propertyKey) {
-    CloneManager._registerFieldMode(target, propertyKey, CloneMode.Assignment);
+    CloneMetadata.registerFieldMode(target, propertyKey, 1);
 }
 /**
  * Property decorator — ignore this field when cloning; keep the clone's own constructor-built value.
  */ function ignoreClone(target, propertyKey) {
-    CloneManager._registerFieldMode(target, propertyKey, CloneMode.Ignore);
+    CloneMetadata.registerFieldMode(target, propertyKey, 0);
 }
 /**
  * @internal
- * Field-level clone mode registry. Must import no engine class, directly or transitively: every
- * class carrying a clone decorator imports this module while still being defined, and pulling a
- * class in here would reorder module evaluation and break `extends` chains. Cloning itself lives
- * in `CloneUtil`.
- */ var CloneManager = /*#__PURE__*/ function() {
-    function CloneManager() {}
-    /**
-   * @internal
-   */ CloneManager._registerFieldMode = function _registerFieldMode(target, propertyKey, mode) {
-        // Each class gets its own `_fieldModes`, prototypally chained to its parent's, so property
-        // lookup resolves inheritance: a subclass re-decorating a field shadows the ancestor's.
-        if (!Object.prototype.hasOwnProperty.call(target, "_fieldModes")) {
-            var _target__fieldModes;
-            Object.defineProperty(target, "_fieldModes", {
-                value: Object.create((_target__fieldModes = target._fieldModes) != null ? _target__fieldModes : null),
+ */ function registerDefaultCloneMode(target, mode) {
+    Object.defineProperty(target.prototype, defaultCloneModeKey, {
+        value: mode
+    });
+}
+var CloneMetadata = /*#__PURE__*/ function() {
+    function CloneMetadata() {}
+    CloneMetadata.registerFieldMode = function registerFieldMode(target, propertyKey, mode) {
+        if (!Object.prototype.hasOwnProperty.call(target, fieldCloneModesKey)) {
+            var _target_fieldCloneModesKey;
+            Object.defineProperty(target, fieldCloneModesKey, {
+                value: Object.create((_target_fieldCloneModesKey = target[fieldCloneModesKey]) != null ? _target_fieldCloneModesKey : null),
                 configurable: true
             });
         }
-        target._fieldModes[propertyKey] = mode;
+        target[fieldCloneModesKey][propertyKey] = mode;
     };
-    return CloneManager;
+    return CloneMetadata;
 }();
 
 /**
@@ -342,6 +339,7 @@ __decorate([
     ]);
     return ReferResource;
 }(EngineObject);
+registerDefaultCloneMode(ReferResource, CloneMode.Assignment);
 
 /**
  * ContentRestorer is a base class for all content restore info classes.
@@ -3634,11 +3632,11 @@ Time._elapsedTimeProperty = ShaderProperty.getByName("scene_ElapsedTime");
 Time._deltaTimeProperty = ShaderProperty.getByName("scene_DeltaTime");
 
 /**
- * Base class of data objects: wherever an instance is held — a component field, an array, a map —
- * cloning produces an independent deep copy instead of a shared reference. A subclass must be
- * constructible without arguments; a preset-less copy is created bare, then populated.
+ * Base class for objects whose own enumerable string-keyed properties are structurally cloned by default.
+ * Subclasses must support argument-less construction when no compatible preset exists.
  */ var DataObject = function DataObject() {
 };
+registerDefaultCloneMode(DataObject, CloneMode.Deep);
 
 var Utils = /*#__PURE__*/ function() {
     function Utils() {}
@@ -3708,10 +3706,16 @@ var Utils = /*#__PURE__*/ function() {
         if (Utils.isAbsoluteUrl(baseUrl)) {
             return relativeUrl ? new URL(relativeUrl, baseUrl).href : baseUrl;
         }
-        var head = "file://";
-        var encodedBaseUrl = head + this._encodePathComponents(baseUrl);
+        // A relative virtual asset path (for example `SpriteAtlas/...`) must be
+        // treated as a path, not as the host portion of a file URL. The latter
+        // lowercases the first segment and breaks case-sensitive virtual-resource
+        // lookup in Editor previews
+        var resolvedHasLeadingSlash = baseUrl.startsWith("/") || relativeUrl.startsWith("/");
+        var head = "file:///";
+        var encodedBaseUrl = head + this._encodePathComponents(baseUrl.replace(/^\/+/, ""));
         var encodedRelativeUrl = this._encodePathComponents(relativeUrl);
-        return decodeURIComponent(new URL(encodedRelativeUrl, encodedBaseUrl).href.slice(head.length));
+        var resolvedPath = decodeURIComponent(new URL(encodedRelativeUrl, encodedBaseUrl).href.slice(head.length));
+        return resolvedHasLeadingSlash ? "/" + resolvedPath : resolvedPath;
     };
     /**
    * @internal
@@ -4048,6 +4052,7 @@ var rePropName$1 = RegExp(// Match anything that isn't a dot or bracket.
     ]);
     return DisorderedArray;
 }();
+registerDefaultCloneMode(DisorderedArray, CloneMode.Ignore);
 
 /**
  * Sprite's tiling mode enumeration.
@@ -4958,6 +4963,7 @@ function _extends() {
     };
     return UpdateFlagManager;
 }();
+registerDefaultCloneMode(UpdateFlagManager, CloneMode.Ignore);
 
 /**
  * Buffer usage.
@@ -5288,6 +5294,7 @@ __decorate([
 __decorate([
     ignoreClone
 ], Component.prototype, "_phasedActive", void 0);
+registerDefaultCloneMode(Component, CloneMode.Remap);
 
 /**
  * @internal
@@ -5417,6 +5424,7 @@ function dependentComponents(componentOrComponents, dependentMode) {
     };
     return UpdateFlag;
 }();
+registerDefaultCloneMode(UpdateFlag, CloneMode.Ignore);
 
 /**
  * Bool update flag.
@@ -5610,8 +5618,8 @@ function dependentComponents(componentOrComponents, dependentMode) {
         return this._frontFaceInvert;
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
         var position = target._position, rotation = target._rotation, scale = target._scale;
         // @ts-ignore
         position._onValueChanged = rotation._onValueChanged = scale._onValueChanged = null;
@@ -6437,15 +6445,15 @@ function _construct(Parent, args, Class) {
     return Layer;
 }({});
 
-var ComponentCloner = /*#__PURE__*/ function() {
+/**
+ * @internal
+ * Clones component fields and runs the component's post-clone hook.
+ */ var ComponentCloner = /*#__PURE__*/ function() {
     function ComponentCloner() {}
     /**
-   * Clone component (opt-out: all fields cloned except @ignoreClone), then run its `_cloneTo` hook.
-   * @param source - Clone source
-   * @param target - Clone target
-   * @param cloneMap - Identity map of the cloned subtree (source object → clone)
+   * @internal
    */ ComponentCloner.cloneComponent = function cloneComponent(source, target, cloneMap) {
-        var fieldModes = source._fieldModes;
+        var fieldModes = source[fieldCloneModesKey];
         var keys = Object.keys(source);
         for(var i = 0, n = keys.length; i < n; i++){
             var k = keys[i];
@@ -6453,10 +6461,10 @@ var ComponentCloner = /*#__PURE__*/ function() {
             if (fieldMode === CloneMode.Ignore) continue;
             var sourceValue = source[k];
             var preset = target[k];
-            var cloned = target[k] = CloneUtil._cloneValue(sourceValue, preset, cloneMap, fieldMode);
+            var cloned = target[k] = CloneUtil._cloneFieldValue(sourceValue, preset, cloneMap, fieldMode);
             CloneUtil._transferSlotOwnership(cloned, sourceValue, preset);
         }
-        source._cloneTo == null ? void 0 : source._cloneTo.call(source, target, cloneMap);
+        source._onClone == null ? void 0 : source._onClone.call(source, target, cloneMap);
     };
     return ComponentCloner;
 }();
@@ -7131,211 +7139,160 @@ var ComponentCloner = /*#__PURE__*/ function() {
     return Entity;
 }(EngineObject);
 /** @internal */ Entity._tempComponentConstructors = [];
-
-var SafeLoopArray = /*#__PURE__*/ function() {
-    function SafeLoopArray() {
-        this._array = [];
-        this._loopArray = [];
-        this._loopArrayDirty = false;
-    }
-    var _proto = SafeLoopArray.prototype;
-    /**
-   * Push item to the array.
-   * @param item - The item which want to be pushed
-   */ _proto.push = function push(item) {
-        this._array.push(item);
-        this._loopArrayDirty = true;
-    };
-    /**
-   * Add item to the array.
-   * @param index - The index of the array
-   * @param item - The item which want to be added
-   */ _proto.add = function add(index, item) {
-        this._array.splice(index, 0, item);
-        this._loopArrayDirty = true;
-    };
-    /**
-   * Remove item from the array.
-   * @param index - The index of the array
-   */ _proto.removeByIndex = function removeByIndex(index) {
-        this._array.splice(index, 1);
-        this._loopArrayDirty = true;
-    };
-    /**
-   * Remove item from array that pass the specified comparison function.
-   * @param filter - The comparison function
-   */ _proto.findAndRemove = function findAndRemove(filter) {
-        var array = this._array;
-        for(var i = array.length - 1; i >= 0; i--){
-            filter(array[i]) && this.removeByIndex(i);
-        }
-    };
-    /**
-   * The index of the item.
-   * @param item - The item which want to get the index
-   * @returns Index of the item
-   */ _proto.indexOf = function indexOf(item) {
-        return this._array.indexOf(item);
-    };
-    /**
-   * Get the array.
-   * @returns The array
-   */ _proto.getArray = function getArray() {
-        return this._array;
-    };
-    /**
-   * Get the array use for loop.
-   * @returns The array use for loop
-   */ _proto.getLoopArray = function getLoopArray() {
-        var loopArray = this._loopArray;
-        if (this._loopArrayDirty) {
-            var array = this._array;
-            var count = array.length;
-            loopArray.length = count;
-            for(var i = 0; i < count; i++){
-                loopArray[i] = array[i];
-            }
-            this._loopArrayDirty = false;
-        }
-        return loopArray;
-    };
-    _create_class(SafeLoopArray, [
-        {
-            key: "length",
-            get: /**
-   * Get the length of the array.
-   */ function get() {
-                return this._array.length;
-            }
-        }
-    ]);
-    return SafeLoopArray;
-}();
+registerDefaultCloneMode(Entity, CloneMode.Remap);
 
 /**
  * @internal
- * Split from `CloneManager`, which must stay free of engine imports.
  */ var CloneUtil = /*#__PURE__*/ function() {
     function CloneUtil() {}
     /**
    * @internal
-   */ CloneUtil._deepCloneObject = function _deepCloneObject(source, target, cloneMap, forceDeepClone) {
-        if (forceDeepClone === void 0) forceDeepClone = false;
-        var fieldModes = source._fieldModes;
+   */ CloneUtil._cloneObjectFields = function _cloneObjectFields(source, target, cloneMap, deepCloneSubtree) {
+        if (deepCloneSubtree === void 0) deepCloneSubtree = false;
+        var fieldModes = source[fieldCloneModesKey];
         var keys = Object.keys(source);
         for(var i = 0, n = keys.length; i < n; i++){
             var k = keys[i];
             var fieldMode = fieldModes == null ? void 0 : fieldModes[k];
             if (fieldMode === CloneMode.Ignore) continue;
-            target[k] = CloneUtil._cloneValue(source[k], target[k], cloneMap, fieldMode, forceDeepClone);
+            target[k] = CloneUtil._cloneFieldValue(source[k], target[k], cloneMap, fieldMode, deepCloneSubtree);
         }
     };
     /**
    * @internal
-   */ CloneUtil._cloneValue = function _cloneValue(source, preset, cloneMap, fieldMode, forceDeepClone) {
-        if (forceDeepClone === void 0) forceDeepClone = false;
+   */ CloneUtil._cloneFieldValue = function _cloneFieldValue(source, preset, cloneMap, fieldMode, deepCloneSubtree) {
+        if (deepCloneSubtree === void 0) deepCloneSubtree = false;
         if (fieldMode === CloneMode.Assignment) return source;
-        if (fieldMode === CloneMode.Deep) {
-            CloneUtil._assertDeepCloneable(source);
-            forceDeepClone = true;
-        }
-        return CloneUtil._cloneByDefault(source, preset, cloneMap, forceDeepClone);
+        if (fieldMode === CloneMode.Deep) return CloneUtil._cloneValueForDeepField(source, preset, cloneMap);
+        return CloneUtil._cloneValueByDefault(source, preset, cloneMap, deepCloneSubtree);
     };
     /**
    * @internal
-   */ CloneUtil._cloneByDefault = function _cloneByDefault(source, preset, cloneMap, forceDeepClone) {
-        if (forceDeepClone === void 0) forceDeepClone = false;
-        if (typeof source === "function") return forceDeepClone ? source : typeof preset === "function" ? preset : source;
-        if (source === null || (typeof source === "undefined" ? "undefined" : _type_of(source)) !== "object") return source;
-        var _cloneMap_get;
-        if (_instanceof(source, Entity) || _instanceof(source, Component)) return (_cloneMap_get = cloneMap.get(source)) != null ? _cloneMap_get : source;
-        if (_instanceof(source, ReferResource)) return source;
-        if (_instanceof(source, UpdateFlagManager) || _instanceof(source, UpdateFlag)) return preset;
-        if (ArrayBuffer.isView(source)) return CloneUtil._deepCloneArrayBuffer(source, preset, cloneMap);
-        if (Array.isArray(source)) return CloneUtil._deepCloneArray(source, preset, cloneMap, forceDeepClone);
-        if (_instanceof(source, Map)) return CloneUtil._deepCloneMap(source, preset, cloneMap, forceDeepClone);
-        if (_instanceof(source, Set)) return CloneUtil._deepCloneSet(source, preset, cloneMap, forceDeepClone);
-        if (_instanceof(source, DisorderedArray) || _instanceof(source, SafeLoopArray)) {
-            if (!forceDeepClone) return preset;
-            var existing = cloneMap.get(source);
-            if (existing) return existing;
-            var dst = CloneUtil._createCloneTarget(source, preset, cloneMap);
-            CloneUtil._deepCloneObject(source, dst, cloneMap, true);
-            return dst;
-        }
-        var ctor = source.constructor;
-        if (ctor && ctor !== Object && typeof source.copyFrom === "function") {
-            var existing1 = cloneMap.get(source);
-            if (existing1) return existing1;
-            var dst1 = CloneUtil._createCloneTarget(source, preset, cloneMap);
-            dst1.copyFrom(source);
-            source._cloneTo == null ? void 0 : source._cloneTo.call(source, dst1, cloneMap);
-            return dst1;
-        }
-        if (_instanceof(source, DataObject) || ctor === Object || ctor === undefined || forceDeepClone) {
-            var existing2 = cloneMap.get(source);
-            if (existing2) return existing2;
-            var dst2 = CloneUtil._createCloneTarget(source, preset, cloneMap);
-            CloneUtil._deepCloneObject(source, dst2, cloneMap, forceDeepClone);
-            source._cloneTo == null ? void 0 : source._cloneTo.call(source, dst2, cloneMap);
-            return dst2;
+   */ CloneUtil._transferSlotOwnership = function _transferSlotOwnership(cloned, source, preset) {
+        if (cloned === preset) return;
+        if (_instanceof(preset, ReferResource)) {
+            var presetRefCount = preset.refCount;
+            presetRefCount !== undefined && presetRefCount <= 0 && Logger.error("CloneUtil: the clone's preset " + preset.constructor.name + " holds no owned reference; " + "a constructor presetting a ref-counted resource must acquire it (assign via its setter or an explicit +1).");
+            preset._addReferCount(-1);
+        }
+        if (cloned === source && _instanceof(cloned, ReferResource)) {
+            cloned._addReferCount(1);
         }
-        return source;
     };
-    /**
-   * @internal
-   */ CloneUtil._assertDeepCloneable = function _assertDeepCloneable(source) {
+    CloneUtil._cloneValueForDeepField = function _cloneValueForDeepField(source, preset, cloneMap) {
         if (typeof source === "function") {
             throw new Error("CloneUtil: @deepClone cannot deep clone a function — code is not a cloneable graph. " + "Remove @deepClone to keep the clone's own binding.");
         }
         if (_instanceof(source, Entity) || _instanceof(source, Component)) {
-            throw new Error('CloneUtil: @deepClone cannot deep clone "' + source.constructor.name + '" — Entity / Component ' + "references are engine-bound. Remove @deepClone to remap the reference by default.");
+            throw new Error('CloneUtil: @deepClone cannot deep clone "' + CloneUtil._getTypeName(source) + '" — Entity / Component ' + "references are engine-bound. Remove @deepClone to remap the reference by default.");
         }
         if (_instanceof(source, ReferResource)) {
-            throw new Error('CloneUtil: @deepClone cannot deep clone "' + source.constructor.name + '" — assets are engine-bound ' + "and shared by reference. Remove @deepClone to share it, or copy it via the asset's own clone() API.");
+            throw new Error('CloneUtil: @deepClone cannot deep clone "' + CloneUtil._getTypeName(source) + '" — assets are engine-bound ' + "and shared by reference. Remove @deepClone to share it, or copy it via the asset's own clone() API.");
         }
         if (_instanceof(source, UpdateFlagManager) || _instanceof(source, UpdateFlag)) {
-            throw new Error('CloneUtil: @deepClone cannot deep clone "' + source.constructor.name + '" — a flag and its manager hold ' + "each other, and a field copy resolves neither side, leaving the pair inconsistent. Remove " + "@deepClone to keep the clone's own.");
+            throw new Error('CloneUtil: @deepClone cannot deep clone "' + CloneUtil._getTypeName(source) + '" — a flag and its manager hold ' + "each other, and a field copy resolves neither side, leaving the pair inconsistent. Remove " + "@deepClone to keep the clone's own.");
+        }
+        if (source === null || (typeof source === "undefined" ? "undefined" : _type_of(source)) !== "object") return source;
+        switch(source[defaultCloneModeKey]){
+            case CloneMode.Copy:
+                return CloneUtil._cloneCopyFromValue(source, preset, cloneMap);
+            case CloneMode.Deep:
+                return CloneUtil._cloneObjectByFields(source, preset, cloneMap, true);
+        }
+        if (ArrayBuffer.isView(source)) {
+            return CloneUtil._deepCloneArrayBufferView(source, preset, cloneMap);
+        }
+        if (Array.isArray(source)) {
+            return CloneUtil._cloneArray(source, preset, cloneMap, true);
         }
+        if (_instanceof(source, Map)) {
+            return CloneUtil._cloneMap(source, preset, cloneMap, true);
+        }
+        if (_instanceof(source, Set)) {
+            return CloneUtil._cloneSet(source, preset, cloneMap, true);
+        }
+        if (!CloneUtil._hasOrdinaryObjectTag(source)) {
+            throw new Error('CloneUtil: @deepClone cannot deep clone "' + CloneUtil._getTypeName(source) + '" — its internal state ' + "cannot be reproduced by cloning enumerable fields. Remove @deepClone to share it, or wrap the value " + "in a field-cloneable type.");
+        }
+        return CloneUtil._cloneObjectByFields(source, preset, cloneMap, true);
     };
-    /**
-   * @internal
-   */ CloneUtil._createCloneTarget = function _createCloneTarget(source, preset, cloneMap) {
-        var ctor = source.constructor;
-        var reusable = preset && preset !== source && preset.constructor === ctor ? preset : null;
+    CloneUtil._cloneValueByDefault = function _cloneValueByDefault(source, preset, cloneMap, deepCloneSubtree) {
+        if (deepCloneSubtree === void 0) deepCloneSubtree = false;
+        if (typeof source === "function") {
+            return deepCloneSubtree ? source : typeof preset === "function" ? preset : source;
+        }
+        if (source === null || (typeof source === "undefined" ? "undefined" : _type_of(source)) !== "object") return source;
+        switch(source[defaultCloneModeKey]){
+            case CloneMode.Ignore:
+                return preset;
+            case CloneMode.Assignment:
+                return source;
+            case CloneMode.Remap:
+                var _cloneMap_get;
+                return (_cloneMap_get = cloneMap.get(source)) != null ? _cloneMap_get : source;
+            case CloneMode.Copy:
+                return CloneUtil._cloneCopyFromValue(source, preset, cloneMap);
+            case CloneMode.Deep:
+                return CloneUtil._cloneObjectByFields(source, preset, cloneMap, deepCloneSubtree);
+        }
+        if (ArrayBuffer.isView(source)) {
+            return CloneUtil._deepCloneArrayBufferView(source, preset, cloneMap);
+        }
+        if (Array.isArray(source)) {
+            return CloneUtil._cloneArray(source, preset, cloneMap, deepCloneSubtree);
+        }
+        if (_instanceof(source, Map)) {
+            return CloneUtil._cloneMap(source, preset, cloneMap, deepCloneSubtree);
+        }
+        if (_instanceof(source, Set)) {
+            return CloneUtil._cloneSet(source, preset, cloneMap, deepCloneSubtree);
+        }
+        if (CloneUtil._isPlainObject(source) || deepCloneSubtree && CloneUtil._hasOrdinaryObjectTag(source)) {
+            return CloneUtil._cloneObjectByFields(source, preset, cloneMap, deepCloneSubtree);
+        }
+        return source;
+    };
+    CloneUtil._cloneCopyFromValue = function _cloneCopyFromValue(source, preset, cloneMap) {
+        var existing = cloneMap.get(source);
+        if (existing) return existing;
+        var dst = CloneUtil._createCloneTarget(source, preset, cloneMap);
+        dst.copyFrom(source);
+        source._onClone == null ? void 0 : source._onClone.call(source, dst, cloneMap);
+        return dst;
+    };
+    CloneUtil._cloneObjectByFields = function _cloneObjectByFields(source, preset, cloneMap, deepCloneSubtree) {
+        if (deepCloneSubtree === void 0) deepCloneSubtree = false;
+        var existing = cloneMap.get(source);
+        if (existing) return existing;
+        var dst = CloneUtil._createCloneTarget(source, preset, cloneMap);
+        CloneUtil._cloneObjectFields(source, dst, cloneMap, deepCloneSubtree);
+        source._onClone == null ? void 0 : source._onClone.call(source, dst, cloneMap);
+        return dst;
+    };
+    CloneUtil._createCloneTarget = function _createCloneTarget(source, preset, cloneMap) {
+        var proto = Object.getPrototypeOf(source);
+        var reusable = preset && preset !== source && Object.getPrototypeOf(preset) === proto && preset;
         var dst;
         if (reusable) {
             dst = reusable;
         } else {
-            if (ctor) {
+            var ctor = proto == null ? void 0 : proto.constructor;
+            if (typeof ctor === "function") {
                 try {
                     dst = new ctor();
-                } catch (e) {
-                    throw new Error('CloneUtil: failed to bare-construct "' + ctor.name + '" — a type cloned deep must support ' + "argument-less construction (the gate creates preset-less instances bare, then populates fields). " + ("Cause: " + e));
+                } catch (error) {
+                    throw new Error('CloneUtil: failed to bare-construct "' + ctor.name + '" — a type cloned deep must support ' + "argument-less construction (the gate creates preset-less instances bare, then populates fields). " + ("Cause: " + error), {
+                        cause: error
+                    });
                 }
             } else {
-                dst = Object.create(null);
+                dst = Object.create(proto);
             }
         }
         cloneMap.set(source, dst);
         return dst;
     };
-    /**
-   * @internal
-   */ CloneUtil._transferSlotOwnership = function _transferSlotOwnership(cloned, source, preset) {
-        if (cloned === preset) return;
-        if (_instanceof(preset, ReferResource)) {
-            var presetRefCount = preset.refCount;
-            presetRefCount !== undefined && presetRefCount <= 0 && Logger.error("CloneUtil: the clone's preset " + preset.constructor.name + " holds no owned reference; " + "a constructor presetting a ref-counted resource must acquire it (assign via its setter or an explicit +1).");
-            preset._addReferCount(-1);
-        }
-        if (cloned === source && _instanceof(cloned, ReferResource)) {
-            cloned._addReferCount(1);
-        }
-    };
-    /**
-   * @internal
-   */ CloneUtil._deepCloneArrayBuffer = function _deepCloneArrayBuffer(source, preset, cloneMap) {
+    CloneUtil._deepCloneArrayBufferView = function _deepCloneArrayBufferView(source, preset, cloneMap) {
         var existing = cloneMap.get(source);
         if (existing) return existing;
         var dst;
@@ -7358,23 +7315,19 @@ var SafeLoopArray = /*#__PURE__*/ function() {
         cloneMap.set(source, dst);
         return dst;
     };
-    /**
-   * @internal
-   */ CloneUtil._deepCloneArray = function _deepCloneArray(source, preset, cloneMap, forceDeepClone) {
-        if (forceDeepClone === void 0) forceDeepClone = false;
+    CloneUtil._cloneArray = function _cloneArray(source, preset, cloneMap, deepCloneSubtree) {
+        if (deepCloneSubtree === void 0) deepCloneSubtree = false;
         var existing = cloneMap.get(source);
         if (existing) return existing;
         var dst = preset !== source && Array.isArray(preset) && preset.constructor === source.constructor && preset.length === source.length ? preset : new Array(source.length);
         cloneMap.set(source, dst);
         for(var i = 0, n = source.length; i < n; i++){
-            dst[i] = CloneUtil._cloneByDefault(source[i], undefined, cloneMap, forceDeepClone);
+            dst[i] = CloneUtil._cloneValueByDefault(source[i], undefined, cloneMap, deepCloneSubtree);
         }
         return dst;
     };
-    /**
-   * @internal
-   */ CloneUtil._deepCloneMap = function _deepCloneMap(source, preset, cloneMap, forceDeepClone) {
-        if (forceDeepClone === void 0) forceDeepClone = false;
+    CloneUtil._cloneMap = function _cloneMap(source, preset, cloneMap, deepCloneSubtree) {
+        if (deepCloneSubtree === void 0) deepCloneSubtree = false;
         var existing = cloneMap.get(source);
         if (existing) return existing;
         var dst;
@@ -7387,14 +7340,12 @@ var SafeLoopArray = /*#__PURE__*/ function() {
         cloneMap.set(source, dst);
         for(var _iterator = _create_for_of_iterator_helper_loose(source), _step; !(_step = _iterator()).done;){
             var entry = _step.value;
-            dst.set(CloneUtil._cloneByDefault(entry[0], undefined, cloneMap, forceDeepClone), CloneUtil._cloneByDefault(entry[1], undefined, cloneMap, forceDeepClone));
+            dst.set(CloneUtil._cloneValueByDefault(entry[0], undefined, cloneMap, deepCloneSubtree), CloneUtil._cloneValueByDefault(entry[1], undefined, cloneMap, deepCloneSubtree));
         }
         return dst;
     };
-    /**
-   * @internal
-   */ CloneUtil._deepCloneSet = function _deepCloneSet(source, preset, cloneMap, forceDeepClone) {
-        if (forceDeepClone === void 0) forceDeepClone = false;
+    CloneUtil._cloneSet = function _cloneSet(source, preset, cloneMap, deepCloneSubtree) {
+        if (deepCloneSubtree === void 0) deepCloneSubtree = false;
         var existing = cloneMap.get(source);
         if (existing) return existing;
         var dst;
@@ -7407,12 +7358,45 @@ var SafeLoopArray = /*#__PURE__*/ function() {
         cloneMap.set(source, dst);
         for(var _iterator = _create_for_of_iterator_helper_loose(source), _step; !(_step = _iterator()).done;){
             var v = _step.value;
-            dst.add(CloneUtil._cloneByDefault(v, undefined, cloneMap, forceDeepClone));
+            dst.add(CloneUtil._cloneValueByDefault(v, undefined, cloneMap, deepCloneSubtree));
         }
         return dst;
     };
+    CloneUtil._isPlainObject = function _isPlainObject(value) {
+        var proto = Object.getPrototypeOf(value);
+        if (proto === null || proto === Object.prototype) return true;
+        var ctor = Object.getPrototypeOf(proto) === null && proto.constructor;
+        return typeof ctor === "function" && ctor.name === "Object";
+    };
+    CloneUtil._hasOrdinaryObjectTag = function _hasOrdinaryObjectTag(value) {
+        return Object.prototype.toString.call(value) === "[object Object]";
+    };
+    CloneUtil._getTypeName = function _getTypeName(value) {
+        var _Object_getPrototypeOf_constructor, _Object_getPrototypeOf;
+        var _Object_getPrototypeOf_constructor_name;
+        return (_Object_getPrototypeOf_constructor_name = (_Object_getPrototypeOf = Object.getPrototypeOf(value)) == null ? void 0 : (_Object_getPrototypeOf_constructor = _Object_getPrototypeOf.constructor) == null ? void 0 : _Object_getPrototypeOf_constructor.name) != null ? _Object_getPrototypeOf_constructor_name : "Object";
+    };
     return CloneUtil;
 }();
+var copyFromCloneTypes = [
+    engineMath.BoundingBox,
+    engineMath.BoundingFrustum,
+    engineMath.BoundingSphere,
+    engineMath.Color,
+    engineMath.Matrix,
+    engineMath.Matrix3x3,
+    engineMath.Plane,
+    engineMath.Quaternion,
+    engineMath.Ray,
+    engineMath.Rect,
+    engineMath.SphericalHarmonics3,
+    engineMath.Vector2,
+    engineMath.Vector3,
+    engineMath.Vector4
+];
+for(var i = 0, n = copyFromCloneTypes.length; i < n; i++){
+    registerDefaultCloneMode(copyFromCloneTypes[i], CloneMode.Copy);
+}
 
 /**
  * Shader data collection,Correspondence includes shader properties data and macros data.
@@ -7584,12 +7568,8 @@ var SafeLoopArray = /*#__PURE__*/ function() {
         return shaderData;
     };
     _proto.cloneTo = function cloneTo(target) {
-        CloneUtil._deepCloneObject(this._macroCollection, target._macroCollection, new Map());
-        var targetMacroMap = target._macroMap;
-        for(var key in targetMacroMap){
-            delete targetMacroMap[key];
-        }
-        Object.assign(targetMacroMap, this._macroMap);
+        CloneUtil._cloneObjectFields(this._macroCollection, target._macroCollection, new Map());
+        Object.assign(target._macroMap, this._macroMap);
         var referCount = target._getReferCount();
         var propertyValueMap = this._propertyValueMap;
         var targetPropertyValueMap = target._propertyValueMap;
@@ -7621,8 +7601,8 @@ var SafeLoopArray = /*#__PURE__*/ function() {
         }
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
         this.cloneTo(target);
     };
     /**
@@ -7867,8 +7847,8 @@ exports.Renderer = /*#__PURE__*/ function(Component) {
         ShaderMacroCollection.unionCollection(context.camera._globalShaderMacro, this.shaderData._macroCollection, this._globalShaderMacro);
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
         var materials = this._materials;
         for(var i = 0, n = materials.length; i < n; i++){
             target._setMaterial(i, materials[i]);
@@ -11129,7 +11109,7 @@ SpriteMaskUtils._u32Buffer4 = new Uint32Array(4);
         };
         /**
      * @internal
-     * Clone mask data to target. Called from subclass _cloneTo.
+     * Clone mask data to target. Called from subclass _onClone.
      */ _proto._cloneMaskData = function _cloneMaskData(target) {
             target.sprite = this._sprite;
         };
@@ -11744,9 +11724,9 @@ __decorate([
         this._updateWorldSpaceTransformShaderData(context, onlyMVP);
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
-        _MaskRenderable.prototype._cloneTo.call(this, target);
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
+        _MaskRenderable.prototype._onClone.call(this, target);
         this._cloneMaskData(target);
     };
     /**
@@ -11890,9 +11870,9 @@ __decorate([
         this._updateWorldSpaceTransformShaderData(context, onlyMVP);
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
-        Renderer.prototype._cloneTo.call(this, target);
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
+        Renderer.prototype._onClone.call(this, target);
         target.sprite = this._sprite;
         target.drawMode = this._drawMode;
     };
@@ -12390,7 +12370,9 @@ __decorate([
         this._textChunks = null;
         this._subFont && (this._subFont = null);
     };
-    _proto._isContainDirtyFlag = function _isContainDirtyFlag(type) {
+    /**
+   * @internal
+   */ _proto._isContainDirtyFlag = function _isContainDirtyFlag(type) {
         return (this._dirtyFlag & type) != 0;
     };
     /**
@@ -15333,9 +15315,9 @@ var BlendShapeFrameDirty = /*#__PURE__*/ function(BlendShapeFrameDirty) {
         Renderer.prototype._onDestroy.call(this);
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
-        Renderer.prototype._cloneTo.call(this, target);
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
+        Renderer.prototype._onClone.call(this, target);
         target.mesh = this._mesh;
     };
     /**
@@ -18357,9 +18339,9 @@ var SkinUpdateFlag = /*#__PURE__*/ function(SkinUpdateFlag) {
         this._jointTexture = null;
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
-        MeshRenderer.prototype._cloneTo.call(this, target);
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
+        MeshRenderer.prototype._onClone.call(this, target);
         if (this._jointTexture) {
             target.shaderData.setTexture(SkinnedMeshRenderer._jointSamplerProperty, null);
         }
@@ -19410,6 +19392,87 @@ RenderContext._flipYViewProjectionMatrix = new engineMath.Matrix();
     return AssetType;
 }({});
 
+var SafeLoopArray = /*#__PURE__*/ function() {
+    function SafeLoopArray() {
+        this._array = [];
+        this._loopArray = [];
+        this._loopArrayDirty = false;
+    }
+    var _proto = SafeLoopArray.prototype;
+    /**
+   * Push item to the array.
+   * @param item - The item which want to be pushed
+   */ _proto.push = function push(item) {
+        this._array.push(item);
+        this._loopArrayDirty = true;
+    };
+    /**
+   * Add item to the array.
+   * @param index - The index of the array
+   * @param item - The item which want to be added
+   */ _proto.add = function add(index, item) {
+        this._array.splice(index, 0, item);
+        this._loopArrayDirty = true;
+    };
+    /**
+   * Remove item from the array.
+   * @param index - The index of the array
+   */ _proto.removeByIndex = function removeByIndex(index) {
+        this._array.splice(index, 1);
+        this._loopArrayDirty = true;
+    };
+    /**
+   * Remove item from array that pass the specified comparison function.
+   * @param filter - The comparison function
+   */ _proto.findAndRemove = function findAndRemove(filter) {
+        var array = this._array;
+        for(var i = array.length - 1; i >= 0; i--){
+            filter(array[i]) && this.removeByIndex(i);
+        }
+    };
+    /**
+   * The index of the item.
+   * @param item - The item which want to get the index
+   * @returns Index of the item
+   */ _proto.indexOf = function indexOf(item) {
+        return this._array.indexOf(item);
+    };
+    /**
+   * Get the array.
+   * @returns The array
+   */ _proto.getArray = function getArray() {
+        return this._array;
+    };
+    /**
+   * Get the array use for loop.
+   * @returns The array use for loop
+   */ _proto.getLoopArray = function getLoopArray() {
+        var loopArray = this._loopArray;
+        if (this._loopArrayDirty) {
+            var array = this._array;
+            var count = array.length;
+            loopArray.length = count;
+            for(var i = 0; i < count; i++){
+                loopArray[i] = array[i];
+            }
+            this._loopArrayDirty = false;
+        }
+        return loopArray;
+    };
+    _create_class(SafeLoopArray, [
+        {
+            key: "length",
+            get: /**
+   * Get the length of the array.
+   */ function get() {
+                return this._array.length;
+            }
+        }
+    ]);
+    return SafeLoopArray;
+}();
+registerDefaultCloneMode(SafeLoopArray, CloneMode.Ignore);
+
 /**
  * Scene manager.
  */ var SceneManager = /*#__PURE__*/ function() {
@@ -19742,7 +19805,7 @@ var MultiExecutor = /*#__PURE__*/ function() {
         this._graphicResourcePool = Object.create(null);
         this._contentRestorerPool = Object.create(null);
         this._subAssetPromiseCallbacks = {};
-        this.//-----------------Editor temp solution-----------------
+        this.// Virtual resource mapping
         /** @internal */ _objectPool = Object.create(null);
         this./** @internal */ _virtualPathResourceMap = Object.create(null);
     }
@@ -19856,21 +19919,6 @@ var MultiExecutor = /*#__PURE__*/ function() {
     };
     /**
    * @internal
-   */ _proto._onSubAssetFail = function _onSubAssetFail(assetBaseURL, assetSubPath, value) {
-        var _this__subAssetPromiseCallbacks_assetBaseURL;
-        var subPromiseCallback = (_this__subAssetPromiseCallbacks_assetBaseURL = this._subAssetPromiseCallbacks[assetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetBaseURL[assetSubPath];
-        if (subPromiseCallback) {
-            subPromiseCallback.reject(value);
-        } else {
-            var // Pending
-            _this__subAssetPromiseCallbacks, _assetBaseURL;
-            ((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
-                rejectedValue: value
-            };
-        }
-    };
-    /**
-   * @internal
    */ _proto._addAsset = function _addAsset(path, asset) {
         this._assetPool[asset.instanceId] = path;
         this._assetUrlPool[path] = asset;
@@ -19979,11 +20027,13 @@ var MultiExecutor = /*#__PURE__*/ function() {
         // Get remote asset base url
         var virtualResourceEntry = this._virtualPathResourceMap[assetBaseURL];
         this._resolveLoadItemOptions(item, virtualResourceEntry);
-        // Not absolute and base url is set
-        item.url = !Utils.isAbsoluteUrl(assetBaseURL) && this.baseUrl ? Utils.resolveAbsoluteUrl(this.baseUrl, assetBaseURL) : assetBaseURL;
+        // Keep a virtual resource's logical identity so loaders can resolve its
+        // sibling resources through the virtual-resource map. `baseUrl` only
+        // resolves ordinary relative transport URLs
+        var loadItemUrl = virtualResourceEntry !== undefined || Utils.isAbsoluteUrl(assetBaseURL) || !this.baseUrl ? assetBaseURL : Utils.resolveAbsoluteUrl(this.baseUrl, assetBaseURL);
+        item.url = loadItemUrl;
         var _virtualResourceEntry_path;
-        var remoteAssetBaseURL = (_virtualResourceEntry_path = virtualResourceEntry == null ? void 0 : virtualResourceEntry.path) != null ? _virtualResourceEntry_path : item.url;
-        item.resolvedUrl = remoteAssetBaseURL;
+        var remoteAssetBaseURL = (_virtualResourceEntry_path = virtualResourceEntry == null ? void 0 : virtualResourceEntry.path) != null ? _virtualResourceEntry_path : loadItemUrl;
         // Check cache
         var cacheObject = this._assetUrlPool[remoteAssetBaseURL];
         if (cacheObject) {
@@ -20022,10 +20072,7 @@ var MultiExecutor = /*#__PURE__*/ function() {
         if (queryPath) {
             // Check whether load main asset
             var mainPromise = loadingPromises[remoteAssetBaseURL] || this._loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, subpackageName);
-            mainPromise.catch(function(e) {
-                _this._onSubAssetFail(remoteAssetBaseURL, queryPath, e);
-            });
-            return this._createSubAssetPromiseCallback(remoteAssetBaseURL, remoteAssetURL, queryPath);
+            return this._createSubAssetPromiseCallback(remoteAssetBaseURL, remoteAssetURL, queryPath, mainPromise);
         }
         return this._loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, subpackageName);
     };
@@ -20050,30 +20097,33 @@ var MultiExecutor = /*#__PURE__*/ function() {
         });
         return promise;
     };
-    _proto._createSubAssetPromiseCallback = function _createSubAssetPromiseCallback(remoteAssetBaseURL, remoteAssetURL, assetSubPath) {
+    _proto._createSubAssetPromiseCallback = function _createSubAssetPromiseCallback(remoteAssetBaseURL, remoteAssetURL, assetSubPath, mainPromise) {
         var _this = this;
         var _this__subAssetPromiseCallbacks_remoteAssetBaseURL;
         var loadingPromises = this._loadingPromises;
         var subPromiseCallback = (_this__subAssetPromiseCallbacks_remoteAssetBaseURL = this._subAssetPromiseCallbacks[remoteAssetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_remoteAssetBaseURL[assetSubPath];
         var resolvedValue = subPromiseCallback == null ? void 0 : subPromiseCallback.resolvedValue;
-        var rejectedValue = subPromiseCallback == null ? void 0 : subPromiseCallback.rejectedValue;
-        // Already resolved or rejected
-        if (resolvedValue || rejectedValue) {
-            return new AssetPromise(function(resolve, reject) {
-                if (resolvedValue) {
-                    resolve(resolvedValue);
-                } else if (rejectedValue) {
-                    reject(rejectedValue);
-                }
-            });
+        // Already resolved
+        if (resolvedValue) {
+            return AssetPromise.resolve(resolvedValue);
         }
         // Pending
-        var promise = new AssetPromise(function(resolve, reject) {
+        var promise = new AssetPromise(function(resolve, reject, setTaskCompleteProgress, setTaskDetailProgress) {
             var _this__subAssetPromiseCallbacks, _remoteAssetBaseURL;
             ((_this__subAssetPromiseCallbacks = _this._subAssetPromiseCallbacks)[_remoteAssetBaseURL = remoteAssetBaseURL] || (_this__subAssetPromiseCallbacks[_remoteAssetBaseURL] = {}))[assetSubPath] = {
                 resolve: resolve,
                 reject: reject
             };
+            // A loader may finish the main asset before its eager sub-asset notification reaches this callback.
+            // Always resolve from the completed main asset as the authoritative fallback so callback cleanup cannot
+            // strand a sub-asset request.
+            mainPromise.onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(resource) {
+                try {
+                    resolve(_this._getResolveResource(resource, _this._parseQueryPath(assetSubPath)));
+                } catch (error) {
+                    reject(error);
+                }
+            }, reject);
         });
         loadingPromises[remoteAssetURL] = promise;
         promise.then(function() {
@@ -20097,7 +20147,10 @@ var MultiExecutor = /*#__PURE__*/ function() {
         if (paths) {
             for(var i = 0, n = paths.length; i < n; i++){
                 var path = paths[i];
-                subResource = subResource[path];
+                subResource = subResource == null ? void 0 : subResource[path];
+                if (subResource === undefined) {
+                    throw new Error("Sub-asset path does not exist: " + paths.join("."));
+                }
             }
         }
         return subResource;
@@ -20143,6 +20196,16 @@ var MultiExecutor = /*#__PURE__*/ function() {
         delete this._subAssetPromiseCallbacks[assetBaseURL];
     };
     /**
+   * Register virtual asset paths and their load descriptors.
+   * @remarks References inside runtime scenes and Prefabs can keep stable virtual paths while the backing URLs
+   * are generated dynamically, such as object URLs created from a resource package.
+   */ _proto.registerVirtualResources = function registerVirtualResources(resources) {
+        var _this = this;
+        resources.forEach(function(resource) {
+            _this._virtualPathResourceMap[resource.virtualPath] = resource;
+        });
+    };
+    /**
    * @internal
    * @beta Just for internal editor, not recommended for developers.
    */ _proto.getResourceByRef = function getResourceByRef(ref) {
@@ -20171,18 +20234,6 @@ var MultiExecutor = /*#__PURE__*/ function() {
     };
     /**
    * @internal
-   * @beta Just for internal editor, not recommended for developers.
-   */ _proto.initVirtualResources = function initVirtualResources(config) {
-        var _this = this;
-        config.forEach(function(element) {
-            _this._virtualPathResourceMap[element.virtualPath] = element;
-            if (element.dependentAssetMap) {
-                _this._virtualPathResourceMap[element.virtualPath].dependentAssetMap = element.dependentAssetMap;
-            }
-        });
-    };
-    /**
-   * @internal
    */ ResourceManager._addLoader = function _addLoader(type, loader, extNames) {
         this._loaders[type] = loader;
         for(var i = 0, len = extNames.length; i < len; i++){
@@ -20757,8 +20808,8 @@ exports.Collider = /*#__PURE__*/ function(Component) {
             if (oldCollider) {
                 oldCollider.removeShape(shape);
             }
-            this._shapes.push(shape);
             this._addNativeShape(shape);
+            this._shapes.push(shape);
             this._handleShapesChanged(ColliderShapeChangeFlag.Count);
         }
     };
@@ -20821,8 +20872,8 @@ exports.Collider = /*#__PURE__*/ function(Component) {
         this.scene.physics._removeCollider(this);
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
         target._syncNative();
         target._pendingReenterTeleport = true;
     };
@@ -20833,6 +20884,20 @@ exports.Collider = /*#__PURE__*/ function(Component) {
             this._setCollisionLayer();
         }
     };
+    /**
+   * @internal
+   */ _proto._setNativeShapeAttached = function _setNativeShapeAttached(shape, attached) {
+        var nativeShape = shape._nativeShape;
+        if (nativeShape && shape._isShapeAttached !== attached) {
+            if (attached) {
+                nativeShape.setWorldScale(this.entity.transform.lossyWorldScale);
+                this._nativeCollider.addShape(nativeShape);
+            } else {
+                this._nativeCollider.removeShape(nativeShape);
+            }
+            shape._isShapeAttached = attached;
+        }
+    };
     _proto._syncNative = function _syncNative() {
         for(var i = 0, n = this.shapes.length; i < n; i++){
             this._addNativeShape(this.shapes[i]);
@@ -20875,24 +20940,13 @@ exports.Collider = /*#__PURE__*/ function(Component) {
         this._nativeCollider.destroy();
     };
     _proto._addNativeShape = function _addNativeShape(shape) {
+        this._setNativeShapeAttached(shape, true);
         shape._collider = this;
-        this._attachNativeShape(shape);
     };
     _proto._removeNativeShape = function _removeNativeShape(shape) {
-        this._detachNativeShape(shape);
+        this._setNativeShapeAttached(shape, false);
         shape._collider = null;
     };
-    /** @internal */ _proto._attachNativeShape = function _attachNativeShape(shape) {
-        if (shape._nativeShape && !shape._isShapeAttached) {
-            shape._nativeShape.setWorldScale(this.entity.transform.lossyWorldScale);
-            shape._attachToCollider();
-        }
-    };
-    /** @internal */ _proto._detachNativeShape = function _detachNativeShape(shape) {
-        if (shape._nativeShape && shape._isShapeAttached) {
-            shape._detachFromCollider();
-        }
-    };
     _proto._setCollisionLayer = function _setCollisionLayer() {
         this._nativeCollider.setCollisionLayer(this._collisionLayerIndex);
     };
@@ -21138,7 +21192,7 @@ __decorate([
     };
     /**
    * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
+   */ _proto._onClone = function _onClone(target) {
         target._syncNative();
     };
     /**
@@ -21273,8 +21327,8 @@ __decorate([
         return Math.sqrt(distance);
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
         target._syncNative();
     };
     /**
@@ -21286,18 +21340,6 @@ __decorate([
         }
         delete Engine._physicalObjectsMap[this._id];
     };
-    /**
-   * @internal
-   */ _proto._attachToCollider = function _attachToCollider() {
-        this._collider._nativeCollider.addShape(this._nativeShape);
-        this._isShapeAttached = true;
-    };
-    /**
-   * @internal
-   */ _proto._detachFromCollider = function _detachFromCollider() {
-        this._collider._nativeCollider.removeShape(this._nativeShape);
-        this._isShapeAttached = false;
-    };
     _proto._syncNative = function _syncNative() {
         var _this__collider;
         if (!this._nativeShape) return;
@@ -21419,6 +21461,9 @@ __decorate([
     return ColliderShape;
 }(DataObject);
 ColliderShape._idGenerator = 0;
+__decorate([
+    ignoreClone
+], ColliderShape.prototype, "_collider", void 0);
 __decorate([
     ignoreClone
 ], ColliderShape.prototype, "_isShapeAttached", void 0);
@@ -21455,10 +21500,10 @@ __decorate([
         return ColliderShape.prototype.getClosestPoint.call(this, point, outClosestPoint);
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
         target.mesh = this._mesh;
-        ColliderShape.prototype._cloneTo.call(this, target);
+        ColliderShape.prototype._onClone.call(this, target);
     };
     /**
    * @internal
@@ -21477,7 +21522,7 @@ __decorate([
     _proto._destroyNativeShape = function _destroyNativeShape() {
         if (this._nativeShape) {
             var _this__collider;
-            (_this__collider = this._collider) == null ? void 0 : _this__collider._detachNativeShape(this);
+            (_this__collider = this._collider) == null ? void 0 : _this__collider._setNativeShapeAttached(this, false);
             this._nativeShape.destroy();
             this._nativeShape = null;
         }
@@ -21505,17 +21550,17 @@ __decorate([
         return true;
     };
     _proto._updateNativeShapeData = function _updateNativeShapeData() {
-        if (this._nativeShape.setMeshData(this._positions, this._indices, this._isConvex, this._cookingFlags)) {
+        var succeeded = this._nativeShape.setMeshData(this._positions, this._indices, this._isConvex, this._cookingFlags);
+        if (succeeded) {
             var _this__collider;
-            (_this__collider = this._collider) == null ? void 0 : _this__collider._attachNativeShape(this);
-            return true;
+            (_this__collider = this._collider) == null ? void 0 : _this__collider._setNativeShapeAttached(this, true);
         }
-        return false;
+        return succeeded;
     };
-    _proto._createNativeShape = function _createNativeShape(attachToCollider) {
-        if (attachToCollider === void 0) attachToCollider = true;
+    _proto._createNativeShape = function _createNativeShape() {
+        var _this__collider;
         // Non-convex MeshColliderShape is only supported on StaticCollider or kinematic DynamicCollider
-        if (attachToCollider && !this._isConvex && _instanceof(this._collider, DynamicCollider) && !this._collider.isKinematic) {
+        if (!this._isConvex && _instanceof(this._collider, DynamicCollider) && !this._collider.isKinematic) {
             console.error("MeshColliderShape: Non-convex mesh is not supported on non-kinematic DynamicCollider.");
             return false;
         }
@@ -21526,10 +21571,7 @@ __decorate([
         this._nativeShape = nativeShape;
         // Sync base class properties (position, rotation, contactOffset, isTrigger, material)
         ColliderShape.prototype._syncNative.call(this);
-        // If already attached to a collider, add the newly created native shape to it
-        if (attachToCollider && this._collider) {
-            this._collider._attachNativeShape(this);
-        }
+        (_this__collider = this._collider) == null ? void 0 : _this__collider._setNativeShapeAttached(this, true);
         return true;
     };
     _create_class(MeshColliderShape, [
@@ -21760,8 +21802,8 @@ __decorate([
         this._updateFlag.flag = false;
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
         target._linearVelocity.copyFrom(this.linearVelocity);
         target._angularVelocity.copyFrom(this.angularVelocity);
         if (!this._automaticCenterOfMass) {
@@ -21770,8 +21812,7 @@ __decorate([
         if (!this._automaticInertiaTensor) {
             target._inertiaTensor.copyFrom(this.inertiaTensor);
         }
-        target._kinematicTransformSyncMode = this._kinematicTransformSyncMode;
-        Collider.prototype._cloneTo.call(this, target);
+        Collider.prototype._onClone.call(this, target);
     };
     /**
    * @internal
@@ -21782,6 +21823,8 @@ __decorate([
         }
     };
     _proto._syncNative = function _syncNative() {
+        // Non-convex triangle meshes require a kinematic native actor before attachment
+        this._nativeCollider.setIsKinematic(this._isKinematic);
         Collider.prototype._syncNative.call(this);
         this._nativeCollider.setLinearDamping(this._linearDamping);
         this._nativeCollider.setAngularDamping(this._angularDamping);
@@ -21801,7 +21844,6 @@ __decorate([
         }
         this._nativeCollider.setSolverIterations(this._solverIterations);
         this._nativeCollider.setUseGravity(this._useGravity);
-        this._nativeCollider.setIsKinematic(this._isKinematic);
         this._nativeCollider.setConstraints(this._constraints);
         this._nativeCollider.setCollisionDetectionMode(this._collisionDetectionMode);
     };
@@ -30998,7 +31040,7 @@ Scene._prefilterdDFGProperty = ShaderProperty.getByName("scene_PrefilteredDFG");
     _inherits(Signal, DataObject);
     function Signal() {
         var _this;
-        _this = DataObject.apply(this, arguments) || this, // Rebuilt by `_cloneTo`; must survive even a propagated @deepClone.
+        _this = DataObject.apply(this, arguments) || this, // Rebuilt by `_onClone`; must survive even a propagated @deepClone.
         _this._listeners = new SafeLoopArray();
         return _this;
     }
@@ -31091,8 +31133,8 @@ Scene._prefilterdDFGProperty = ShaderProperty.getByName("scene_PrefilteredDFG");
         for(var i = 0, n = listeners.length; i < n; i++)_this = this, _loop(i);
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target, cloneMap) {
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target, cloneMap) {
         var listeners = this._listeners.getLoopArray();
         for(var i = 0, n = listeners.length; i < n; i++){
             var listener = listeners[i];
@@ -33399,8 +33441,8 @@ var AnimatorLayerBlendingMode = /*#__PURE__*/ function(AnimatorLayerBlendingMode
         }
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
         var animatorController = target._animatorController;
         if (animatorController) {
             target._controllerUpdateFlag = animatorController._registerChangeFlag();
@@ -35469,9 +35511,9 @@ var ParticleStopMode = /*#__PURE__*/ function(ParticleStopMode) {
         this.generator._destroy();
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
-        Renderer.prototype._cloneTo.call(this, target);
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
+        Renderer.prototype._onClone.call(this, target);
         target.mesh = this._mesh;
         target.renderMode = this._renderMode;
     };
@@ -36892,6 +36934,11 @@ CustomDataModule._zeroVector4 = new engineMath.Vector4(0, 0, 0, 0);
     };
     /**
    * @internal
+   */ _proto._isRandomCurveMode = function _isRandomCurveMode() {
+        return this._mode === ParticleCurveMode.TwoCurves;
+    };
+    /**
+   * @internal
    */ _proto._registerOnValueChanged = function _registerOnValueChanged(listener) {
         this._updateManager.addListener(listener);
     };
@@ -37946,8 +37993,8 @@ var MainModule = /*#__PURE__*/ function(DataObject) {
         shaderData.setInt(MainModule._scaleMode, this.scalingMode);
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
         if (target._simulationSpace === ParticleSimulationSpace.World) {
             target._generator._generateTransformedBounds();
         }
@@ -38454,7 +38501,7 @@ __decorate([
     _inherits(SizeOverLifetimeModule, ParticleGeneratorModule);
     function SizeOverLifetimeModule(generator) {
         var _this;
-        _this = ParticleGeneratorModule.call(this, generator) || this, _this._separateAxes = false;
+        _this = ParticleGeneratorModule.call(this, generator) || this, /** @internal */ _this._sizeRand = new engineMath.Rand(0, ParticleRandomSubSeeds.SizeOverLifetime), _this._separateAxes = false;
         _this.sizeX = new ParticleCompositeCurve(new ParticleCurve(new CurveKey(0, 0), new CurveKey(1, 1)));
         _this.sizeY = new ParticleCompositeCurve(new ParticleCurve(new CurveKey(0, 0), new CurveKey(1, 1)));
         _this.sizeZ = new ParticleCompositeCurve(new ParticleCurve(new CurveKey(0, 0), new CurveKey(1, 1)));
@@ -38472,8 +38519,8 @@ __decorate([
             var sizeY = this.sizeY;
             var sizeZ = this.sizeZ;
             var separateAxes = this.separateAxes;
-            var isRandomCurveMode = separateAxes ? sizeX.mode === ParticleCurveMode.TwoCurves && sizeY.mode === ParticleCurveMode.TwoCurves && sizeZ.mode === ParticleCurveMode.TwoCurves : sizeX.mode === ParticleCurveMode.TwoCurves;
-            var isCurveMode = isRandomCurveMode || separateAxes ? sizeX.mode === ParticleCurveMode.Curve && sizeY.mode === ParticleCurveMode.Curve && sizeZ.mode === ParticleCurveMode.Curve : sizeX.mode === ParticleCurveMode.Curve;
+            var isRandomCurveMode = this._isRandomCurveMode();
+            var isCurveMode = isRandomCurveMode || (separateAxes ? sizeX.mode === ParticleCurveMode.Curve && sizeY.mode === ParticleCurveMode.Curve && sizeZ.mode === ParticleCurveMode.Curve : sizeX.mode === ParticleCurveMode.Curve);
             if (isCurveMode) {
                 shaderData.setFloatArray(SizeOverLifetimeModule._maxCurveXProperty, sizeX.curveMax._getTypeArray());
                 if (separateAxes) {
@@ -38498,6 +38545,17 @@ __decorate([
         this._isCurveMacro = this._enableMacro(shaderData, this._isCurveMacro, isCurveMacro);
         this._isRandomTwoMacro = this._enableMacro(shaderData, this._isRandomTwoMacro, isRandomTwoMacro);
     };
+    /**
+   * @internal
+   */ _proto._isRandomCurveMode = function _isRandomCurveMode() {
+        var _this = this, sizeX = _this.sizeX, sizeY = _this.sizeY, sizeZ = _this.sizeZ, separateAxes = _this.separateAxes;
+        return separateAxes ? sizeX._isRandomCurveMode() && sizeY._isRandomCurveMode() && sizeZ._isRandomCurveMode() : sizeX._isRandomCurveMode();
+    };
+    /**
+   * @internal
+   */ _proto._resetRandomSeed = function _resetRandomSeed(seed) {
+        this._sizeRand.reset(seed, ParticleRandomSubSeeds.SizeOverLifetime);
+    };
     _create_class(SizeOverLifetimeModule, [
         {
             key: "separateAxes",
@@ -38581,6 +38639,9 @@ SizeOverLifetimeModule._minCurveZProperty = ShaderProperty.getByName("renderer_S
 SizeOverLifetimeModule._maxCurveXProperty = ShaderProperty.getByName("renderer_SOLMaxCurveX");
 SizeOverLifetimeModule._maxCurveYProperty = ShaderProperty.getByName("renderer_SOLMaxCurveY");
 SizeOverLifetimeModule._maxCurveZProperty = ShaderProperty.getByName("renderer_SOLMaxCurveZ");
+__decorate([
+    ignoreClone
+], SizeOverLifetimeModule.prototype, "_sizeRand", void 0);
 __decorate([
     ignoreClone
 ], SizeOverLifetimeModule.prototype, "_enableSeparateMacro", void 0);
@@ -39883,6 +39944,7 @@ __decorate([
         this.velocityOverLifetime._resetRandomSeed(seed);
         this.forceOverLifetime._resetRandomSeed(seed);
         this.limitVelocityOverLifetime._resetRandomSeed(seed);
+        this.sizeOverLifetime._resetRandomSeed(seed);
         this.rotationOverLifetime._resetRandomSeed(seed);
         this.colorOverLifetime._resetRandomSeed(seed);
         this.noise._resetRandomSeed(seed);
@@ -39944,8 +40006,8 @@ __decorate([
         }
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
         target._setTransformFeedback();
     };
     /**
@@ -40140,8 +40202,13 @@ __decorate([
         if (colorOverLifetime.enabled && colorOverLifetime.color.mode === ParticleGradientMode.TwoGradients) {
             instanceVertices[offset + 20] = colorOverLifetime._colorGradientRand.random();
         }
+        // Noise and size-over-lifetime temporarily share slot 21 (a_Random0.z), so noise takes precedence
+        // Track independent module randomness and instance layout optimization in #3075
+        var sizeOverLifetime = this.sizeOverLifetime;
         if (this.noise.enabled) {
             instanceVertices[offset + 21] = this.noise._noiseRand.random();
+        } else if (sizeOverLifetime.enabled && sizeOverLifetime._isRandomCurveMode()) {
+            instanceVertices[offset + 21] = sizeOverLifetime._sizeRand.random();
         }
         var rotationOverLifetime = this.rotationOverLifetime;
         if (rotationOverLifetime.enabled && rotationOverLifetime.rotationZ.mode === ParticleCurveMode.TwoConstants) {
@@ -41700,8 +41767,8 @@ __decorate([
         }
     };
     /**
-   * @internal
-   */ _proto._cloneTo = function _cloneTo(target) {
+   * @inheritdoc
+   */ _proto._onClone = function _onClone(target) {
         target.mesh = this._mesh;
     };
     _create_class(MeshShape, [