diff --git a/cocos/core/components/ui-base/ui-renderable.ts b/cocos/core/components/ui-base/ui-renderable.ts index 904a20f79b..aa9becb947 100644 --- a/cocos/core/components/ui-base/ui-renderable.ts +++ b/cocos/core/components/ui-base/ui-renderable.ts @@ -474,7 +474,8 @@ export class UIRenderable extends RenderableComponent { this.markForUpdateRenderData(); } - for (const child of this.node.children) { + for (let i = 0; i < this.node.children.length; ++i) { + let child = this.node.children[i]; const renderComp = child.getComponent(UIRenderable); if (renderComp) { renderComp.markForUpdateRenderData(); diff --git a/cocos/core/load-pipeline/pack-downloader.ts b/cocos/core/load-pipeline/pack-downloader.ts index 9b834be06f..9963f79d8b 100644 --- a/cocos/core/load-pipeline/pack-downloader.ts +++ b/cocos/core/load-pipeline/pack-downloader.ts @@ -75,6 +75,7 @@ function error (uuid, packUuid) { export function initPacks (packs) { packIndices = packs; + uuidToPack = {}; for (var packUuid in packs) { var uuids = packs[packUuid]; for (var i = 0; i < uuids.length; i++) { diff --git a/cocos/core/platform/sys.ts b/cocos/core/platform/sys.ts index 30aa889d5f..d8e0031cc3 100644 --- a/cocos/core/platform/sys.ts +++ b/cocos/core/platform/sys.ts @@ -789,14 +789,6 @@ export const sys: { [x: string]: any; } = { } }, - /** - * Dumps rooted objects, only available in native platforms - * @private - */ - dumpRoot () { - // N/A in web - }, - /** * Restart the JS VM, only available in native platforms * @private @@ -805,14 +797,6 @@ export const sys: { [x: string]: any; } = { // N/A in web }, - /** - * Clean a script in the JS VM, only available in native platforms - * @private - */ - cleanScript (jsfile) { - // N/A in web - }, - /** * @en * Returns the safe area of the screen. If the screen is not notched, the design resolution will be returned by default. diff --git a/cocos/ui/components/rich-text.ts b/cocos/ui/components/rich-text.ts index 616b06b681..d32e5f8ec1 100644 --- a/cocos/ui/components/rich-text.ts +++ b/cocos/ui/components/rich-text.ts @@ -611,6 +611,8 @@ export class RichText extends UIComponent { } } } + // Tolerate null parent child (upgrade issue may cause this special case) + children.length = 0; this._labelSegments.length = 0; this._labelSegmentsCache.length = 0;