From 58f094e40a0df4e8ce1ad396bbe5632fcaca339d Mon Sep 17 00:00:00 2001 From: ChiaNing Date: Thu, 21 Jan 2021 17:58:26 +0800 Subject: [PATCH] richText layer change bug fix (#8175) --- cocos/2d/components/rich-text.ts | 15 ++++++++++++++- editor/assets/default_prefab/ui/RichText.prefab | 4 ++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/cocos/2d/components/rich-text.ts b/cocos/2d/components/rich-text.ts index f63206d666..07e983d1da 100644 --- a/cocos/2d/components/rich-text.ts +++ b/cocos/2d/components/rich-text.ts @@ -32,7 +32,7 @@ import { ccclass, executeInEditMode, executionOrder, help, menu, tooltip, multiline, type, serializable } from 'cc.decorator'; import { DEV, EDITOR } from 'internal:constants'; import { Font, SpriteAtlas, TTFFont, SpriteFrame } from '../assets'; -import { assert, EventTouch, warnID } from '../../core/platform'; +import { assert, EventTouch, SystemEventType, warnID } from '../../core/platform'; import { BASELINE_RATIO, fragmentText, isUnicodeCJK, isUnicodeSpace } from '../utils/text-utils'; import { HtmlTextParser, IHtmlTextParserResultObj, IHtmlTextParserStack } from '../utils/html-text-parser'; import Pool from '../../core/utils/pool'; @@ -455,6 +455,10 @@ export class RichText extends UIComponent { this._updateRichTextStatus = this._updateRichText; } + public onLoad () { + this.node.on(SystemEventType.LAYER_CHANGED, this._applyLayer, this); + } + public onEnable () { if (this.handleTouchEvent) { this._addEventListeners(); @@ -503,6 +507,7 @@ export class RichText extends UIComponent { } this.node.off(Node.EventType.ANCHOR_CHANGED, this._updateRichTextPosition, this); + this.node.off(SystemEventType.LAYER_CHANGED, this._applyLayer, this); } protected _addEventListeners () { @@ -657,6 +662,7 @@ export class RichText extends UIComponent { labelSegment.styleIndex = styleIndex; labelSegment.lineCount = this._lineCount; labelSegment.node._uiProps.uiTransformComp!.setAnchorPoint(0, 0); + labelSegment.node.layer = this.node.layer; this._applyTextAttribute(labelSegment); this.node.addChild(labelSegment.node); this._segments.push(labelSegment); @@ -789,6 +795,7 @@ export class RichText extends UIComponent { break; } + segment.node.layer = this.node.layer; this.node.addChild(segment.node); this._segments.push(segment); @@ -1101,4 +1108,10 @@ export class RichText extends UIComponent { assembler.updateRenderData(label); } } + + protected _applyLayer () { + for (const seg of this._segments) { + seg.node.layer = this.node.layer; + } + } } diff --git a/editor/assets/default_prefab/ui/RichText.prefab b/editor/assets/default_prefab/ui/RichText.prefab index 9ac127ba2b..6d5ad0c4af 100644 --- a/editor/assets/default_prefab/ui/RichText.prefab +++ b/editor/assets/default_prefab/ui/RichText.prefab @@ -102,7 +102,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 33554432, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -232,7 +232,7 @@ "y": 1, "z": 1 }, - "_layer": 1073741824, + "_layer": 33554432, "_euler": { "__type__": "cc.Vec3", "x": 0,