From 0d94f895a3820226da5166b90f6610a5b5f3f132 Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Wed, 15 Oct 2025 15:28:21 +0800 Subject: [PATCH] fix --- .../chat18x/ui/panels/PastGirlListPanel.ts | 3 +- assets/Scripts/chat18x/ui/panels/ShowPanel.ts | 23 +++++++++++++ .../chat18x/uiitems/DetailImageItem.ts | 23 ++++--------- assets/bundles/Chat18x/GirlDetailPanel.prefab | 32 ++++++++---------- .../bundles/Chat18x/PastGirlListPanel.prefab | 8 +++-- assets/bundles/Chat18x/ShowPanel.prefab | 23 ++++++++++++- assets/bundles/Chat18x/ThemePanel.prefab | 16 ++++----- assets/bundles/DataTable/tblanguage.bin | Bin 33804 -> 33804 bytes xchat_cfg | 2 +- 9 files changed, 80 insertions(+), 50 deletions(-) diff --git a/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts b/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts index f7212eb6..165bc061 100644 --- a/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PastGirlListPanel.ts @@ -86,8 +86,7 @@ export class PastGirlListPanel extends li_BaseView { // 获取已解锁女孩列表 const ids = await this.getUnlockedGirls(); - if (true) { - //!ids || ids.length === 0) { + if (!ids || ids.length === 0) { this._nodeTab.cleanBg.active = true; } else { this._nodeTab.cleanBg.active = false; diff --git a/assets/Scripts/chat18x/ui/panels/ShowPanel.ts b/assets/Scripts/chat18x/ui/panels/ShowPanel.ts index 1b6f2d3d..4ef8c80b 100644 --- a/assets/Scripts/chat18x/ui/panels/ShowPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/ShowPanel.ts @@ -9,6 +9,7 @@ import { view, Size, Vec3, + EventTouch, } from "cc"; import li_BaseView from "db://assets/Scripts/Main/Common/li_BaseView"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; @@ -65,6 +66,12 @@ export class ShowPanel extends li_BaseView { this ); } + + // 阻止触摸事件传递，防止拖动画面（特别是Web平台视频超出屏幕时） + this.node.on(Node.EventType.TOUCH_START, this.onTouchBlock, this); + this.node.on(Node.EventType.TOUCH_MOVE, this.onTouchBlock, this); + this.node.on(Node.EventType.TOUCH_END, this.onTouchBlock, this); + this.node.on(Node.EventType.TOUCH_CANCEL, this.onTouchBlock, this); } onDestroy() { @@ -76,6 +83,22 @@ export class ShowPanel extends li_BaseView { this ); } + + // 清理触摸事件监听 + this.node.off(Node.EventType.TOUCH_START, this.onTouchBlock, this); + this.node.off(Node.EventType.TOUCH_MOVE, this.onTouchBlock, this); + this.node.off(Node.EventType.TOUCH_END, this.onTouchBlock, this); + this.node.off(Node.EventType.TOUCH_CANCEL, this.onTouchBlock, this); + } + + /** + * 阻止触摸事件传递，防止拖动画面 + */ + private onTouchBlock(event: EventTouch) { + // 阻止事件冒泡 + event.propagationStopped = true; + // 阻止浏览器默认行为（如拖动、滚动） + event.preventDefault(); } protected onClose() { diff --git a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts index d38a62a7..57d51e60 100644 --- a/assets/Scripts/chat18x/uiitems/DetailImageItem.ts +++ b/assets/Scripts/chat18x/uiitems/DetailImageItem.ts @@ -78,23 +78,7 @@ export class DetailImageItem extends Component { base: this, type: this.type, }); - - // ViewManager.I.openBundlesView("PopupGirlDetailPanel", { - // category: this.category, - // resId: this.resId, - // girlId: this.girlId, - // base: this, - // type: this.type, - // }); } - // if (!this.isImage) { - // //判断是否已经解锁此资源 - // } else { - // if (this.url) { - // ViewManager.I.openBundlesView("ShowPanel", data); - // this.base.setVideEnable(false); - // } - // } } /** @@ -251,6 +235,13 @@ export class DetailImageItem extends Component { ResManager.I.changeRemoteSpriteFrame(this.img, newPath, () => { this.scaleToFillItem(); }); + if (this.isVisible) { + this.video.enabled = false; + this.videoReady.enabled = true; + } else { + this.video.enabled = true; + this.videoReady.enabled = false; + } } } diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index 2dd232ac..3916e2c7 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -49,7 +49,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 70, "z": 0 }, "_lrot": { @@ -112,7 +112,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 71.40300000000002, + "y": 1.40300000000002, "z": 0 }, "_lrot": { @@ -639,7 +639,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 81.17100000000005, + "y": 10.248000000000047, "z": 0 }, "_lrot": { @@ -759,7 +759,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 659.375, + "y": 660.298, "z": 0 }, "_lrot": { @@ -6377,7 +6377,7 @@ "_left": 0, "_right": 0, "_top": 0, - "_bottom": -980.7719999999999, + "_bottom": 24.695999999999913, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -6387,7 +6387,7 @@ "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, "_originalWidth": 220, - "_originalHeight": 769, + "_originalHeight": 1295.9, "_alignMode": 2, "_lockFlags": 1, "_id": "" @@ -6462,7 +6462,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 750, - "height": 1318.75 + "height": 1320.596 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6607,7 +6607,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 750, - "height": 1318.75 + "height": 1320.596 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6713,7 +6713,7 @@ "_left": 0, "_right": 0, "_top": -20.49600000000018, - "_bottom": 141.846, + "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -7996,7 +7996,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 750, - "height": 1440.1 + "height": 1300.1 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8133,7 +8133,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -333.571, - "y": 728.5709999999999, + "y": 658.5709999999999, "z": 0 }, "_lrot": { @@ -8368,7 +8368,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 750, - "height": 1600 + "height": 1460 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8398,7 +8398,7 @@ "_left": 0, "_right": 0, "_top": 0, - "_bottom": 0, + "_bottom": 140, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -8410,7 +8410,7 @@ "_originalWidth": 100, "_originalHeight": 100, "_alignMode": 2, - "_lockFlags": 0, + "_lockFlags": 5, "_id": "" }, { @@ -8501,8 +8501,6 @@ "asset": { "__id__": 0 }, - "fileId": "24mSBg+Z9OS5KNS5Yscqr0", - "instance": null, - "targetOverrides": null + "fileId": "24mSBg+Z9OS5KNS5Yscqr0" } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/PastGirlListPanel.prefab b/assets/bundles/Chat18x/PastGirlListPanel.prefab index 01e7bd7c..e7f8b14b 100644 --- a/assets/bundles/Chat18x/PastGirlListPanel.prefab +++ b/assets/bundles/Chat18x/PastGirlListPanel.prefab @@ -3798,7 +3798,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -1.3539999999999992, + "x": 39.04400000000001, "y": 6.597000000000207, "z": 0 }, @@ -3986,7 +3986,7 @@ "__prefab": { "__id__": 166 }, - "languageKey": "themepanel.more", + "languageKey": "pastgirllistpanel.title", "defaultText": "", "autoUpdate": true, "_id": "" @@ -4291,7 +4291,7 @@ "__prefab": { "__id__": 181 }, - "languageKey": "themepanel.more", + "languageKey": "pastgirllistpanel.title", "defaultText": "", "autoUpdate": true, "_id": "" @@ -4712,6 +4712,8 @@ "__id__": 0 }, "fileId": "a7b/5ywUtCk5yRlgjJ+5Is", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/bundles/Chat18x/ShowPanel.prefab b/assets/bundles/Chat18x/ShowPanel.prefab index 967c395a..38982519 100644 --- a/assets/bundles/Chat18x/ShowPanel.prefab +++ b/assets/bundles/Chat18x/ShowPanel.prefab @@ -41,10 +41,13 @@ }, { "__id__": 44 + }, + { + "__id__": 46 } ], "_prefab": { - "__id__": 46 + "__id__": 48 }, "_lpos": { "__type__": "cc.Vec3", @@ -1025,6 +1028,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "40lQ0ZnINAdq8QH3yyaj4k" }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 47 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5cxZdiKi9C6JxdUbLTL2TM" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/bundles/Chat18x/ThemePanel.prefab b/assets/bundles/Chat18x/ThemePanel.prefab index a38aeaf2..bf075e3a 100644 --- a/assets/bundles/Chat18x/ThemePanel.prefab +++ b/assets/bundles/Chat18x/ThemePanel.prefab @@ -1899,7 +1899,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -266.118, + "x": -237.437, "y": -85.97600000000011, "z": 0 }, @@ -2236,7 +2236,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 158.681979, + "width": 185.781979, "height": 50.4 }, "_anchorPoint": { @@ -2348,8 +2348,6 @@ "__id__": 0 }, "fileId": "1fB4ecWkhGQ4x6XhJQdNjH", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -2541,7 +2539,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 158.681979, + "width": 185.781979, "height": 50.4 }, "_anchorPoint": { @@ -2653,8 +2651,6 @@ "__id__": 0 }, "fileId": "e8hjJGK2JGVLqu8oxh8EVf", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -2725,7 +2721,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -96.91199999999998, + "x": -26.052999999999997, "y": -85.97600000000011, "z": 0 }, @@ -3062,7 +3058,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 158.681979, + "width": 185.781979, "height": 50.4 }, "_anchorPoint": { @@ -3367,7 +3363,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 158.681979, + "width": 185.781979, "height": 50.4 }, "_anchorPoint": { diff --git a/assets/bundles/DataTable/tblanguage.bin b/assets/bundles/DataTable/tblanguage.bin index 2b1cca1ed888f747f9f3c4ed84b5da3a4b6fdd11..9fa12bb660ac20e18bab7fdb39845a2144b56188 100644 GIT binary patch delta 21 ccmeC_VCv~$+91x$=A4mOqTsPvmiK)b08G*cF#rGn delta 21 ccmeC_VCv~$+91x$mYk7TqL8s!miK)b08a7;aR2}S diff --git a/xchat_cfg b/xchat_cfg index 81182e0b..cee552a1 160000 --- a/xchat_cfg +++ b/xchat_cfg @@ -1 +1 @@ -Subproject commit 81182e0bb458735e325c226c215c78c1969fa060 +Subproject commit cee552a12861a0604b6b5e032cd591913c5f75d5