Skip to content

Update label.ts , 直接使用this._renderData #19037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: v3.8.8
Choose a base branch
from
Open

Update label.ts , 直接使用this._renderData #19037

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cocos/2d/components/label.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
* @zh
* 文本字符之间的间距。仅在使用 BMFont 位图字体时生效。
*/
@visible(function (this: Label) {

Check warning on line 340 in cocos/2d/components/label.ts

View workflow job for this annotation

GitHub Actions / Run ESLint 

Unexpected unnamed function
return !this._isSystemFontUsed && this._font instanceof BitmapFont;
})
@displayOrder(9)
Expand Down Expand Up @@ -436,7 +436,7 @@
* 文本字体名称, 只在 useSystemFont 属性为 true 的时候生效。
*/
@displayOrder(13)
@visible(function (this: Label) { return this._isSystemFontUsed; })

Check warning on line 439 in cocos/2d/components/label.ts

View workflow job for this annotation

GitHub Actions / Run ESLint 

Unexpected unnamed function
get fontFamily (): string {
return this._fontFamily;
}
Expand All @@ -458,7 +458,7 @@
*/
@type(Font)
@displayOrder(13)
@visible(function (this: Label) { return !this._isSystemFontUsed; })

Check warning on line 461 in cocos/2d/components/label.ts

View workflow job for this annotation

GitHub Actions / Run ESLint 

Unexpected unnamed function
get font (): Font | null {
// return this._N$file;
return this._font;
Expand Down Expand Up @@ -580,7 +580,7 @@
* @en The height of underline.
* @zh 下划线高度。
*/
@visible(function (this: Label) { return this._isUnderline; })

Check warning on line 583 in cocos/2d/components/label.ts

View workflow job for this annotation

GitHub Actions / Run ESLint 

Unexpected unnamed function
@editable
@displayOrder(18)
get underlineHeight (): number {
Expand All @@ -600,7 +600,7 @@
** 描边效果组件,用于字体描边,只能用于系统字体或 ttf 字体。
**/
@editable
@visible(function (this: Label) { return !(this._font instanceof BitmapFont); })

Check warning on line 603 in cocos/2d/components/label.ts

View workflow job for this annotation

GitHub Actions / Run ESLint 

Unexpected unnamed function
@displayOrder(19)
get enableOutline (): boolean {
return this._enableOutline;
Expand All @@ -619,7 +619,7 @@
* 改变描边的颜色。
*/
@editable
@visible(function (this: Label) { return this._enableOutline && !(this._font instanceof BitmapFont); })

Check warning on line 622 in cocos/2d/components/label.ts

View workflow job for this annotation

GitHub Actions / Run ESLint 

Unexpected unnamed function
@displayOrder(20)
get outlineColor (): Color {
return this._outlineColor;
Expand All @@ -638,7 +638,7 @@
* 改变描边的宽度。
*/
@editable
@visible(function (this: Label) { return this._enableOutline && !(this._font instanceof BitmapFont); })

Check warning on line 641 in cocos/2d/components/label.ts

View workflow job for this annotation

GitHub Actions / Run ESLint 

Unexpected unnamed function
@displayOrder(21)
get outlineWidth (): number {
return this._outlineWidth;
Expand All @@ -654,7 +654,7 @@
* @zh 用于给 Label 组件添加阴影效果，只能用于系统字体或 ttf 字体。在缓存模式为 char 时不可用。
*/
@editable
@visible(function (this: Label) { return !(this._font instanceof BitmapFont) && (this.cacheMode !== CacheMode.CHAR); })

Check warning on line 657 in cocos/2d/components/label.ts

View workflow job for this annotation

GitHub Actions / Run ESLint 

Unexpected unnamed function
@displayOrder(22)
get enableShadow (): boolean {
return this._enableShadow;
Expand All @@ -673,7 +673,7 @@
* 阴影的颜色。
*/
@editable
@visible(function (this: Label) { return this._enableShadow && !(this._font instanceof BitmapFont) && (this.cacheMode !== CacheMode.CHAR); })

Check warning on line 676 in cocos/2d/components/label.ts

View workflow job for this annotation

GitHub Actions / Run ESLint 

Unexpected unnamed function
@displayOrder(23)
get shadowColor (): Color {
return this._shadowColor;
Expand All @@ -692,7 +692,7 @@
* 字体与阴影的偏移。
*/
@editable
@visible(function (this: Label) { return this._enableShadow && !(this._font instanceof BitmapFont) && (this.cacheMode !== CacheMode.CHAR); })

Check warning on line 695 in cocos/2d/components/label.ts

View workflow job for this annotation

GitHub Actions / Run ESLint 

Unexpected unnamed function
@displayOrder(24)
get shadowOffset (): Vec2 {
return this._shadowOffset;
Expand Down Expand Up @@ -1027,7 +1027,7 @@
if (!this.renderData) {
if (this._assembler && this._assembler.createData) {
this._renderData = this._assembler.createData(this) as RenderData;
this.renderData!.material = this.getRenderMaterial(0);
this._renderData.material = this.getRenderMaterial(0);
this._updateColor();
}
}
Expand Down
Loading