From 0f6a9fcc475918e4e5ad8c62ede48232947bd36a Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Mon, 13 Oct 2025 17:40:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Dfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/Scripts/chat18x/data/ChatModel.ts | 3 + .../chat18x/ui/components/DialogBubble.ts | 9 ++- assets/bundles/Chat18x/ChatPanel.prefab | 64 +++++++++---------- 3 files changed, 41 insertions(+), 35 deletions(-) diff --git a/assets/Scripts/chat18x/data/ChatModel.ts b/assets/Scripts/chat18x/data/ChatModel.ts index 3f4931b3..47980060 100644 --- a/assets/Scripts/chat18x/data/ChatModel.ts +++ b/assets/Scripts/chat18x/data/ChatModel.ts @@ -4,6 +4,7 @@ import { ConfigManager } from "../manager/ConfigManager"; import { DataId, DataManager } from "./DataManager"; import { GirlData } from "./GirlData"; import { logger } from "db://assets/Scripts/Main/Common/Logger"; +import { WalletData } from "./WalletData"; /** * 单个角色的聊天数据结构 @@ -523,6 +524,8 @@ export class ChatModel { * @returns 是否可以继续聊天 */ public canChat(roleId?: number): boolean { + const walletData = DataManager.I.getDataById(DataId.Wallet); + if (walletData.isVip) return true; //return false; const girlData = DataManager.I.getDataById(DataId.Girl); const roleData = this.rolesData.get(this.currentGirlId); diff --git a/assets/Scripts/chat18x/ui/components/DialogBubble.ts b/assets/Scripts/chat18x/ui/components/DialogBubble.ts index 3837cb96..df13ee90 100644 --- a/assets/Scripts/chat18x/ui/components/DialogBubble.ts +++ b/assets/Scripts/chat18x/ui/components/DialogBubble.ts @@ -137,17 +137,20 @@ export class DialogBubble extends Component { //const bgHeight = actualHeight + 17; this.bg.setContentSize(new Size(actualSize.x + 40, actualSize.y + 30)); this.uiTransform.setContentSize( - new Size(actualSize.x + 40, actualSize.y + 30) + new Size( + actualSize.x + 40, + actualSize.y + 30 > 110 ? actualSize.y + 30 : 110 + ) ); // 回调通知实际高度 if (callback) { - callback(actualSize.y); + callback(actualSize.y > 110 ? actualSize.y : 110); } }, 0); // 返回预估的背景高度（用于同步计算） - const estimatedHeight = Math.max(lines.length * 35 + 20, 60); // 最小高度60 + const estimatedHeight = Math.max(lines.length * 35 + 20, 110); // 最小高度60 return estimatedHeight; } diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab index cbffab02..e71cafb5 100644 --- a/assets/bundles/Chat18x/ChatPanel.prefab +++ b/assets/bundles/Chat18x/ChatPanel.prefab @@ -25,10 +25,10 @@ "__id__": 305 }, { - "__id__": 70 + "__id__": 110 }, { - "__id__": 110 + "__id__": 70 }, { "__id__": 391 @@ -1762,8 +1762,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -215, - "y": -43.837999999999965, + "x": -81.42899999999997, + "y": -303.626, "z": 0 }, "_lrot": { @@ -1879,7 +1879,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -315.97230713246, + "x": -301.17230713246, "y": 34.515499999999975, "z": 0 }, @@ -2129,7 +2129,7 @@ }, "_alignFlags": 9, "_target": null, - "_left": -112.3, + "_left": -97.5, "_right": 0, "_top": 0, "_bottom": 0, @@ -2523,8 +2523,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 182.20000000000005, - "height": 82.5 + "width": 197.26300000000003, + "height": 110 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2551,8 +2551,8 @@ }, "_alignFlags": 40, "_target": null, - "_left": 160, - "_right": 407.79999999999995, + "_left": 293.571, + "_right": 259.16599999999994, "_top": 0, "_bottom": 0, "_horizontalCenter": 0, @@ -2652,8 +2652,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 215, - "y": 402.971, + "x": 69.286, + "y": -33.625999999999976, "z": 0 }, "_lrot": { @@ -2713,7 +2713,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -267.2, - "y": 88.268, + "y": 21.732, "z": 0 }, "_lrot": { @@ -2772,8 +2772,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 329.5, - "y": 43.268, + "x": 321.306, + "y": 37.968, "z": 0 }, "_lrot": { @@ -3045,8 +3045,8 @@ "_alignFlags": 33, "_target": null, "_left": -112.3, - "_right": -107.3, - "_top": 0, + "_right": -99.10599999999998, + "_top": 5.3, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -3105,8 +3105,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 331.08299999999997, - "y": 48.168000000000006, + "x": 322.889, + "y": 41.968, "z": 0 }, "_lrot": { @@ -3183,7 +3183,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "34df2326-52d3-4164-9be7-4d2cd33563a3@f9941", + "__uuid__": "55cf8250-a826-49ec-98bf-3ec397ac9481@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -3220,8 +3220,8 @@ "_alignFlags": 33, "_target": null, "_left": -112.3, - "_right": -118.883, - "_top": -14.9, + "_right": -110.68900000000004, + "_top": -8.7, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -3294,7 +3294,7 @@ "__prefab": { "__id__": 139 }, - "_alignFlags": 36, + "_alignFlags": 33, "_target": null, "_left": 0, "_right": 0, @@ -3309,7 +3309,7 @@ "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, "_originalWidth": 500, - "_originalHeight": 153.8, + "_originalHeight": 176.536, "_alignMode": 1, "_lockFlags": 45, "_id": "" @@ -3402,8 +3402,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -37, - "y": 89.169, + "x": -28.8, + "y": 25.23100000000001, "z": 0 }, "_lrot": { @@ -3540,11 +3540,11 @@ "__prefab": { "__id__": 149 }, - "_alignFlags": 36, + "_alignFlags": 33, "_target": null, "_left": 20, - "_right": 37, - "_top": 10, + "_right": 28.8, + "_top": 15.6, "_bottom": 20, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -3555,7 +3555,7 @@ "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, "_originalWidth": 0, - "_originalHeight": 0, + "_originalHeight": 138.338, "_alignMode": 1, "_lockFlags": 45, "_id": "" @@ -3592,7 +3592,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 100, - "height": 100 + "height": 110 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3620,7 +3620,7 @@ "_alignFlags": 32, "_target": null, "_left": 0, - "_right": 160, + "_right": 305.714, "_top": 0, "_bottom": 0, "_horizontalCenter": 0,