xionglijia/18xchat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
xionglijia
2025-10-14 15:19:12 +08:00
parent 7999c0b9ad
commit a389733596
7 changed files with 398 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/Scripts/Main/Common/Utils.ts
+7 -23
View File
@@ -408,37 +408,21 @@ export default class Utils {
* 格式化聊天时间显示
* @param timestamp 时间戳（毫秒），如果为null则显示"暂无聊天记录"
* @returns 格式化的时间字符串
* 格式规则：
* - 一日内：显示时和分（HH:mm）
* - 一周内：显示x天前
* - 一个月内：显示x周前
* - 一个月以上：显示"一个月以上"
* 格式规则：显示完整的年月日时分秒（例如：2025-9-17 20:40:50）
*/
public static formatChatTime(timestamp: number | null): string {
if (!timestamp) {
return LanguageUtils.getText("pastgirllistpanel.nomemory");
}
const now = new Date();
const chatDate = new Date(timestamp);
const diffMs = now.getTime() - chatDate.getTime();
const diffDays = Math.floor(diffMs / (1000 * 60 * 60 * 24));
if (diffDays === 0) {
// 一日内：显示时和分
const year = chatDate.getFullYear();
const month = chatDate.getMonth() + 1;
const day = chatDate.getDate();
const hours = Utils.padStart(chatDate.getHours().toString(), 2);
const minutes = Utils.padStart(chatDate.getMinutes().toString(), 2);
return `${hours}:${minutes}`;
} else if (diffDays < 7) {
// 一周内：显示x天前
return `${diffDays}${LanguageUtils.getText("purchasepanel.day")}`;
} else if (diffDays < 30) {
// 一个月内：显示x周前
const weeks = Math.floor(diffDays / 7);
return `${weeks}${LanguageUtils.getText("purchasepanel.week")}`;
} else {
// 一个月以上：显示"一个月以上"
return LanguageUtils.getText("purchasepanel.months");
}
const seconds = Utils.padStart(chatDate.getSeconds().toString(), 2);
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
}
assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts
+8 -5
View File
@@ -232,8 +232,7 @@ export class GirlDetailPanel extends li_BaseView {
}
let age = girlData.getGrilAge(this.category.toString(), this.id);
this.descAge.string =
LanguageUtils.getText("girldetailpanel.age") + age.toString();
this.descAge.string = age.toString();
const firstPath = girlData.getFirstGrilVideoPath(
this.category.toString(),
@@ -326,17 +325,21 @@ export class GirlDetailPanel extends li_BaseView {
OnClickChatBtn() {
const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
//if (isRelease || isFree) {
// 直接在当前页面打开ChatPanel作为子页面
const currentPanel = NavigationManager.Instance.getCurrentActivePanelNode();
if (currentPanel) {
const chatData = { girlId: this.id, base: currentPanel };
NavigationManager.Instance.openSubPanel("ChatPanel", currentPanel, chatData, {
NavigationManager.Instance.openSubPanel(
"ChatPanel",
currentPanel,
chatData,
{
openAnimation: PageTransitionType.SLIDE_LEFT,
closeAnimation: PageTransitionType.SLIDE_RIGHT,
hideBasePanel: true,
});
}
);
} else {
logger.warn("[GirlDetailPanel] 无法获取当前激活的主页面");
}
assets/Scripts/chat18x/ui/panels/ShowPanel.ts
+20
View File
@@ -56,6 +56,26 @@ export class ShowPanel extends li_BaseView {
start() {
//this.splash.node.on(Node.EventType.TOUCH_START,this.onclickback);
GButton.BandClick(this.splash.node, this.onClose, this);
// 监听视频点击事件（Web平台上视频会覆盖UI，需要直接监听视频点击）
if (this.videoPlayer) {
this.videoPlayer.node.on(
VideoPlayer.EventType.CLICKED,
this.onClose,
this
);
}
}
onDestroy() {
// 清理视频点击事件监听
if (this.videoPlayer && this.videoPlayer.node) {
this.videoPlayer.node.off(
VideoPlayer.EventType.CLICKED,
this.onClose,
this
);
}
}
protected onClose() {
assets/Scripts/chat18x/uiitems/DetailImageItem.ts
+11
View File
@@ -28,6 +28,8 @@ export class DetailImageItem extends Component {
@property(Sprite)
video: Sprite;
@property(Sprite)
videoReady: Sprite;
@property(Node)
priceFrame: Node;
@@ -166,6 +168,8 @@ export class DetailImageItem extends Component {
const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
let imgPath = "";
this.video.enabled = type === proto.cs.EnmResType.ERT_Video;
this.videoReady.enabled = false;
this.priceFrame.active = type === proto.cs.EnmResType.ERT_Video;
let price = 0;
// 是否可见，不可见代表需要解锁
@@ -183,6 +187,13 @@ export class DetailImageItem extends Component {
this.girlId,
this.resId
);
if (this.isVisible) {
this.video.enabled = false;
this.videoReady.enabled = true;
} else {
this.video.enabled = true;
this.videoReady.enabled = false;
}
}
if (type === proto.cs.EnmResType.ERT_Image) {
// 图片
assets/bundles/Chat18x/GirlDetailPanel.prefab
+267 -84
View File
@@ -25,26 +25,26 @@
"__id__": 24
},
{
"__id__": 347
"__id__": 355
}
],
"_active": true,
"_components": [
{
"__id__": 358
"__id__": 366
},
{
"__id__": 360
"__id__": 368
},
{
"__id__": 362
"__id__": 370
},
{
"__id__": 364
"__id__": 372
}
],
"_prefab": {
"__id__": 366
"__id__": 374
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -564,17 +564,17 @@
"_active": true,
"_components": [
{
"__id__": 340
"__id__": 348
},
{
"__id__": 342
"__id__": 350
},
{
"__id__": 344
"__id__": 352
}
],
"_prefab": {
"__id__": 346
"__id__": 354
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -4962,6 +4962,8 @@
"__id__": 0
},
"fileId": "dd+C9/bl9G+pTVWtxpnwWs",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
@@ -6760,28 +6762,31 @@
},
{
"__id__": 307
},
{
"__id__": 315
}
],
"_active": true,
"_components": [
{
"__id__": 329
},
{
"__id__": 331
},
{
"__id__": 333
},
{
"__id__": 335
},
{
"__id__": 337
},
{
"__id__": 339
},
{
"__id__": 341
},
{
"__id__": 343
},
{
"__id__": 345
}
],
"_prefab": {
"__id__": 339
"__id__": 347
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -7084,6 +7089,181 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "video-ready",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 294
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 308
},
{
"__id__": 310
},
{
"__id__": 312
}
],
"_prefab": {
"__id__": 314
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 65.756,
"y": -97.006,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 0.5,
"y": 0.5,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 307
},
"_enabled": true,
"__prefab": {
"__id__": 309
},
"_contentSize": {
"__type__": "cc.Size",
"width": 88,
"height": 68
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "e5bax2uBlKvYEZOsjFkpq/"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 307
},
"_enabled": true,
"__prefab": {
"__id__": 311
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "cf97ed36-f317-48a4-a2a8-ef255cce07f8@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "00ttZxw0NPKZj2qcnsI3Zx"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 307
},
"_enabled": true,
"__prefab": {
"__id__": 313
},
"_alignFlags": 36,
"_target": null,
"_left": 0,
"_right": 17.244,
"_top": 0,
"_bottom": 17.244,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "80rUdjom9NIL4kS0+8Cd+M"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "42bLQNSytJ1rQ34rnO0R96",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "priceFrame",
@@ -7094,29 +7274,29 @@
},
"_children": [
{
"__id__": 308
"__id__": 316
},
{
"__id__": 314
"__id__": 322
}
],
"_active": true,
"_components": [
{
"__id__": 320
"__id__": 328
},
{
"__id__": 322
"__id__": 330
},
{
"__id__": 324
"__id__": 332
},
{
"__id__": 326
"__id__": 334
}
],
"_prefab": {
"__id__": 328
"__id__": 336
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -7153,20 +7333,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 307
"__id__": 315
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 309
"__id__": 317
},
{
"__id__": 311
"__id__": 319
}
],
"_prefab": {
"__id__": 313
"__id__": 321
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -7203,11 +7383,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 308
"__id__": 316
},
"_enabled": true,
"__prefab": {
"__id__": 310
"__id__": 318
},
"_contentSize": {
"__type__": "cc.Size",
@@ -7231,11 +7411,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 308
"__id__": 316
},
"_enabled": true,
"__prefab": {
"__id__": 312
"__id__": 320
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -7289,20 +7469,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 307
"__id__": 315
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 315
"__id__": 323
},
{
"__id__": 317
"__id__": 325
}
],
"_prefab": {
"__id__": 319
"__id__": 327
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -7339,11 +7519,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 314
"__id__": 322
},
"_enabled": true,
"__prefab": {
"__id__": 316
"__id__": 324
},
"_contentSize": {
"__type__": "cc.Size",
@@ -7367,11 +7547,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 314
"__id__": 322
},
"_enabled": true,
"__prefab": {
"__id__": 318
"__id__": 326
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -7448,11 +7628,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 307
"__id__": 315
},
"_enabled": true,
"__prefab": {
"__id__": 321
"__id__": 329
},
"_contentSize": {
"__type__": "cc.Size",
@@ -7476,11 +7656,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 307
"__id__": 315
},
"_enabled": true,
"__prefab": {
"__id__": 323
"__id__": 331
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -7521,11 +7701,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 307
"__id__": 315
},
"_enabled": true,
"__prefab": {
"__id__": 325
"__id__": 333
},
"_alignFlags": 12,
"_target": null,
@@ -7557,11 +7737,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 307
"__id__": 315
},
"_enabled": false,
"__prefab": {
"__id__": 327
"__id__": 335
},
"_resizeMode": 0,
"_layoutType": 1,
@@ -7612,7 +7792,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 330
"__id__": 338
},
"_contentSize": {
"__type__": "cc.Size",
@@ -7640,7 +7820,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 332
"__id__": 340
},
"clickEvents": [],
"_interactable": true,
@@ -7698,7 +7878,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 334
"__id__": 342
},
"img": {
"__id__": 298
@@ -7706,11 +7886,14 @@
"video": {
"__id__": 304
},
"videoReady": {
"__id__": 310
},
"priceFrame": {
"__id__": 307
"__id__": 315
},
"videoPrice": {
"__id__": 317
"__id__": 325
},
"_id": ""
},
@@ -7728,7 +7911,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 336
"__id__": 344
},
"_type": 3,
"_inverted": false,
@@ -7750,7 +7933,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 338
"__id__": 346
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -7808,7 +7991,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 341
"__id__": 349
},
"_contentSize": {
"__type__": "cc.Size",
@@ -7836,7 +8019,7 @@
},
"_enabled": false,
"__prefab": {
"__id__": 343
"__id__": 351
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -7881,7 +8064,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 345
"__id__": 353
},
"_alignFlags": 45,
"_target": null,
@@ -7932,20 +8115,20 @@
"_active": true,
"_components": [
{
"__id__": 348
"__id__": 356
},
{
"__id__": 350
"__id__": 358
},
{
"__id__": 352
"__id__": 360
},
{
"__id__": 355
"__id__": 363
}
],
"_prefab": {
"__id__": 357
"__id__": 365
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -7982,11 +8165,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 347
"__id__": 355
},
"_enabled": true,
"__prefab": {
"__id__": 349
"__id__": 357
},
"_contentSize": {
"__type__": "cc.Size",
@@ -8010,11 +8193,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 347
"__id__": 355
},
"_enabled": true,
"__prefab": {
"__id__": 351
"__id__": 359
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -8055,15 +8238,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 347
"__id__": 355
},
"_enabled": true,
"__prefab": {
"__id__": 353
"__id__": 361
},
"clickEvents": [
{
"__id__": 354
"__id__": 362
}
],
"_interactable": true,
@@ -8103,7 +8286,7 @@
"_duration": 0.1,
"_zoomScale": 0.9,
"_target": {
"__id__": 347
"__id__": 355
},
"_id": ""
},
@@ -8127,11 +8310,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 347
"__id__": 355
},
"_enabled": true,
"__prefab": {
"__id__": 356
"__id__": 364
},
"_alignFlags": 9,
"_target": null,
@@ -8180,7 +8363,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 359
"__id__": 367
},
"_contentSize": {
"__type__": "cc.Size",
@@ -8208,7 +8391,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 361
"__id__": 369
},
"_alignFlags": 45,
"_target": null,
@@ -8244,7 +8427,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 363
"__id__": 371
},
"_id": ""
},
@@ -8262,7 +8445,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 365
"__id__": 373
},
"m_rootNode": null,
"videoArea": {
@@ -8296,7 +8479,7 @@
"__id__": 24
},
"imgItemInst": {
"__id__": 333
"__id__": 341
},
"imgsLayout": {
"__id__": 254
assets/bundles/Chat18x/SettingPanel.prefab
+6 -6
View File
@@ -136,8 +136,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 750,
"height": 1600
"width": 950,
"height": 1800
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -279,10 +279,10 @@
},
"_alignFlags": 45,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_left": -100,
"_right": -100,
"_top": -100,
"_bottom": -100,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
assets/bundles/Chat18x/ShowPanel.prefab
+69 -27
View File
@@ -28,23 +28,23 @@
"__id__": 18
},
{
"__id__": 28
"__id__": 30
}
],
"_active": true,
"_components": [
{
"__id__": 38
},
{
"__id__": 40
},
{
"__id__": 42
},
{
"__id__": 44
}
],
"_prefab": {
"__id__": 44
"__id__": 46
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -307,6 +307,8 @@
"__id__": 0
},
"fileId": "d2SK42VpNELrobGtwLgDKQ",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
@@ -459,10 +461,13 @@
"_components": [
{
"__id__": 25
},
{
"__id__": 27
}
],
"_prefab": {
"__id__": 27
"__id__": 29
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -479,8 +484,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 2.4,
"y": 2.4,
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
@@ -628,8 +633,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 450,
"height": 695.5
"width": 750,
"height": 1600
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -642,6 +647,42 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "adE8tlqHhN2YnsHttPJDRn"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 18
},
"_enabled": true,
"__prefab": {
"__id__": 28
},
"_alignFlags": 45,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 450,
"_originalHeight": 695.5,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2fYnJZoSlGEKpsoIfslp22"
},
{
"__type__": "cc.PrefabInfo",
"root": {
@@ -666,9 +707,6 @@
"_children": [],
"_active": true,
"_components": [
{
"__id__": 29
},
{
"__id__": 31
},
@@ -677,10 +715,13 @@
},
{
"__id__": 35
},
{
"__id__": 37
}
],
"_prefab": {
"__id__": 37
"__id__": 39
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -717,11 +758,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 28
"__id__": 30
},
"_enabled": true,
"__prefab": {
"__id__": 30
"__id__": 32
},
"_contentSize": {
"__type__": "cc.Size",
@@ -745,11 +786,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 28
"__id__": 30
},
"_enabled": false,
"__prefab": {
"__id__": 32
"__id__": 34
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -790,11 +831,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 28
"__id__": 30
},
"_enabled": true,
"__prefab": {
"__id__": 34
"__id__": 36
},
"_alignFlags": 45,
"_target": null,
@@ -826,11 +867,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 28
"__id__": 30
},
"_enabled": true,
"__prefab": {
"__id__": 36
"__id__": 38
},
"clickEvents": [],
"_interactable": true,
@@ -899,7 +940,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 39
"__id__": 41
},
"_contentSize": {
"__type__": "cc.Size",
@@ -927,7 +968,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 41
"__id__": 43
},
"_alignFlags": 45,
"_target": null,
@@ -963,14 +1004,14 @@
},
"_enabled": true,
"__prefab": {
"__id__": 43
"__id__": 45
},
"m_rootNode": null,
"image": {
"__id__": 15
},
"splash": {
"__id__": 31
"__id__": 33
},
"videoArea": {
"__id__": 25
@@ -993,6 +1034,7 @@
"__id__": 0
},
"fileId": "18xipwdnNNI6CKhTGcIHEq",
"instance": null
"instance": null,
"targetOverrides": null
}
]