diff --git a/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts index 9f19d390..3ec757d3 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlListPopupPanel.ts @@ -70,10 +70,13 @@ export class GirlListPopupPanel extends li_BaseView { this.girlName.string = LanguageUtils.getText( girlData.getGrilName(this.category.toString(), this.girlId) ); - this.girlTag.string = LanguageUtils.getText( - girlData.getGrilTagKey(this.category.toString(), this.girlId) + const tagContent = girlData.getGrilTagKey( + this.category.toString(), + this.girlId ); + this.girlTag.string = LanguageUtils.getText(tagContent.replace("|", "\n")); + const path = girlData.getGrilAvatar(this.category.toString(), this.girlId); this.refreshCoinNum(); //console.log(path); diff --git a/assets/bundles/Chat18x/GirlListPopupPanel.prefab b/assets/bundles/Chat18x/GirlListPopupPanel.prefab index 6ac440cd..2f46cd58 100644 --- a/assets/bundles/Chat18x/GirlListPopupPanel.prefab +++ b/assets/bundles/Chat18x/GirlListPopupPanel.prefab @@ -1624,8 +1624,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 188.31899999999996, - "y": 108.42700000000002, + "x": 200.56799999999996, + "y": 109.65699999999993, "z": 0 }, "_lrot": { @@ -1665,8 +1665,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 414.234375, - "height": 83.6 + "width": 389.736375, + "height": 150.212 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1766,7 +1766,7 @@ "_target": null, "_left": 553.9668125000001, "_right": 37.06381250000004, - "_top": 60.272999999999996, + "_top": 25.737000000000087, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -3745,6 +3745,7 @@ "__id__": 0 }, "fileId": "a56vp8DEdDloy+JjDTTm7J", + "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/bundles/DataTable/tblanguage.bin b/assets/bundles/DataTable/tblanguage.bin index 6e367e01..99b6d5c3 100644 Binary files a/assets/bundles/DataTable/tblanguage.bin and b/assets/bundles/DataTable/tblanguage.bin differ