From f0069c27453408b04a9d70f5a432b6b133d5051b Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Sat, 11 Oct 2025 17:16:59 +0800 Subject: [PATCH] fix --- assets/Scenes/MainScene.scene | 24 +- .../chat18x/ui/panels/PopupGirlDetailPanel.ts | 2 +- assets/bundles/Chat18x/ChatPanel.prefab | 8 +- .../Chat18x/PopupGirlDetailPanel.prefab | 53 +++- assets/bundles/Chat18x/ShowPanel.prefab | 288 ++++++++++++++++-- assets/bundles/Chat18x/ThemePanel.prefab | 8 +- assets/bundles/Chat18x/releasePanel.prefab | 57 +++- 7 files changed, 377 insertions(+), 63 deletions(-) diff --git a/assets/Scenes/MainScene.scene b/assets/Scenes/MainScene.scene index cead2628..aeb08d48 100644 --- a/assets/Scenes/MainScene.scene +++ b/assets/Scenes/MainScene.scene @@ -1121,7 +1121,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -394.99300000000005, + "y": -378.161, "z": 0 }, "_lrot": { @@ -1467,7 +1467,7 @@ "_left": 0, "_right": 0, "_top": 0, - "_bottom": -399.99300000000005, + "_bottom": 366.839, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -1546,8 +1546,8 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 100 + "width": 750, + "height": 1600 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1566,12 +1566,12 @@ }, "_enabled": true, "__prefab": null, - "_alignFlags": 18, + "_alignFlags": 45, "_target": null, - "_left": 490, - "_right": 490, - "_top": 1120, - "_bottom": 1120, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2060,7 +2060,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -546.473, + "y": -593.616, "z": 0 }, "_lrot": { @@ -2183,12 +2183,12 @@ }, "_enabled": true, "__prefab": null, - "_alignFlags": 16, + "_alignFlags": 20, "_target": null, "_left": 0, "_right": 0, "_top": 0, - "_bottom": 0, + "_bottom": 181.18399999999997, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, diff --git a/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts index 327b6758..8299faed 100644 --- a/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PopupGirlDetailPanel.ts @@ -177,7 +177,7 @@ export class PopupGirlDetailPanel extends li_BaseView { const scaleX = itemSize.width / imageSize.width; const scaleY = itemSize.height / imageSize.height; - const scale = Math.max(scaleY, scaleY); + const scale = Math.max(scaleX, scaleX); // 设置Sprite的sizeMode为CUSTOM,允许自定义大小 this.img.sizeMode = Sprite.SizeMode.CUSTOM; diff --git a/assets/bundles/Chat18x/ChatPanel.prefab b/assets/bundles/Chat18x/ChatPanel.prefab index c558c945..63469da6 100644 --- a/assets/bundles/Chat18x/ChatPanel.prefab +++ b/assets/bundles/Chat18x/ChatPanel.prefab @@ -2712,7 +2712,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -283.5, + "x": -267.2, "y": 88.268, "z": 0 }, @@ -2772,7 +2772,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 345.8, + "x": 329.5, "y": 43.268, "z": 0 }, @@ -3105,7 +3105,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 347.383, + "x": 331.08299999999997, "y": 48.168000000000006, "z": 0 }, @@ -3268,7 +3268,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 567, + "width": 534.4, "height": 176.536 }, "_anchorPoint": { diff --git a/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab b/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab index 366d1508..7c6dc319 100644 --- a/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/PopupGirlDetailPanel.prefab @@ -28,14 +28,14 @@ "_active": true, "_components": [ { - "__id__": 92 + "__id__": 94 }, { - "__id__": 94 + "__id__": 96 } ], "_prefab": { - "__id__": 96 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -294,15 +294,18 @@ }, { "__id__": 89 + }, + { + "__id__": 91 } ], "_prefab": { - "__id__": 91 + "__id__": 93 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 203.29999999999995, + "y": 122.74400000000003, "z": 0 }, "_lrot": { @@ -2109,6 +2112,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "9dJkBmbEVFoYWm5lNueS6V" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 12 + }, + "_enabled": true, + "__prefab": { + "__id__": 92 + }, + "_alignFlags": 18, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 122.74400000000003, + "_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": "51qQ2V5atHrpLvst3uW65i" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2132,7 +2171,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 95 }, "_contentSize": { "__type__": "cc.Size", @@ -2160,7 +2199,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 97 }, "m_rootNode": null, "_id": "" diff --git a/assets/bundles/Chat18x/ShowPanel.prefab b/assets/bundles/Chat18x/ShowPanel.prefab index 922b7bf6..a4e41279 100644 --- a/assets/bundles/Chat18x/ShowPanel.prefab +++ b/assets/bundles/Chat18x/ShowPanel.prefab @@ -26,22 +26,25 @@ }, { "__id__": 18 + }, + { + "__id__": 28 } ], "_active": true, "_components": [ { - "__id__": 28 + "__id__": 38 }, { - "__id__": 30 + "__id__": 40 }, { - "__id__": 32 + "__id__": 42 } ], "_prefab": { - "__id__": 34 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -74,7 +77,7 @@ }, { "__type__": "cc.Node", - "_name": "SpriteSplash", + "_name": "SpriteSplash-001", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -142,8 +145,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 1080, - "height": 2340 + "width": 750, + "height": 1600 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -154,7 +157,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "110iG9EytA1YAB0wVNQw+A" + "fileId": "64oC39qRhPiILCzDURmdsH" }, { "__type__": "cc.Sprite", @@ -199,7 +202,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f0CR2UEFFOF6PU6TRY202K" + "fileId": "b6+pUSAA9M1aAzJcYXWwSj" }, { "__type__": "cc.Widget", @@ -235,7 +238,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f6j/k9YUFHCaZUOQEfX2Wf" + "fileId": "7buDRDSQxB8K867JsG8uE4" }, { "__type__": "cc.Button", @@ -245,7 +248,7 @@ "node": { "__id__": 2 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 10 }, @@ -286,12 +289,14 @@ "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 1.2, - "_target": null, + "_target": { + "__id__": 2 + }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "74vW3BgyFGHKbowSkSx8rg" + "fileId": "e2PJKtew9EOoXNWdmKCQul" }, { "__type__": "cc.PrefabInfo", @@ -301,9 +306,7 @@ "asset": { "__id__": 0 }, - "fileId": "847WtxRnVLRZqyVBgRKHkS", - "instance": null, - "targetOverrides": null, + "fileId": "d2SK42VpNELrobGtwLgDKQ", "nestedPrefabInstanceRoots": null }, { @@ -554,8 +557,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 384, - "height": 672 + "width": 400, + "height": 866 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -652,6 +655,240 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "SpriteSplash", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 29 + }, + { + "__id__": 31 + }, + { + "__id__": 33 + }, + { + "__id__": 35 + } + ], + "_prefab": { + "__id__": 37 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "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__": 28 + }, + "_enabled": true, + "__prefab": { + "__id__": 30 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 750, + "height": 1600 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "110iG9EytA1YAB0wVNQw+A" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 28 + }, + "_enabled": false, + "__prefab": { + "__id__": 32 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 138 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f0CR2UEFFOF6PU6TRY202K" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 28 + }, + "_enabled": true, + "__prefab": { + "__id__": 34 + }, + "_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": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f6j/k9YUFHCaZUOQEfX2Wf" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 28 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "clickEvents": [], + "_interactable": true, + "_transition": 0, + "_normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "74vW3BgyFGHKbowSkSx8rg" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "847WtxRnVLRZqyVBgRKHkS", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -662,12 +899,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 39 }, "_contentSize": { "__type__": "cc.Size", - "width": 1080, - "height": 2340 + "width": 750, + "height": 1600 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -690,7 +927,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 41 }, "_alignFlags": 45, "_target": null, @@ -726,14 +963,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 43 }, "m_rootNode": null, "image": { "__id__": 15 }, "splash": { - "__id__": 5 + "__id__": 31 }, "videoArea": { "__id__": 25 @@ -756,7 +993,6 @@ "__id__": 0 }, "fileId": "18xipwdnNNI6CKhTGcIHEq", - "instance": null, - "targetOverrides": null + "instance": null } ] \ No newline at end of file diff --git a/assets/bundles/Chat18x/ThemePanel.prefab b/assets/bundles/Chat18x/ThemePanel.prefab index 9cf1623a..39dcfeec 100644 --- a/assets/bundles/Chat18x/ThemePanel.prefab +++ b/assets/bundles/Chat18x/ThemePanel.prefab @@ -1704,11 +1704,11 @@ "_string": "精心推荐", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 31.1, + "_actualFontSize": 32, "_fontSize": 31.1, "_fontFamily": "Arial", "_lineHeight": 40, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, @@ -2530,11 +2530,11 @@ "_string": "更多分类", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 31.1, + "_actualFontSize": 32, "_fontSize": 31.1, "_fontFamily": "Arial", "_lineHeight": 40, - "_overflow": 0, + "_overflow": 2, "_enableWrapText": true, "_font": null, "_isSystemFontUsed": true, diff --git a/assets/bundles/Chat18x/releasePanel.prefab b/assets/bundles/Chat18x/releasePanel.prefab index d9597a1b..07d74499 100644 --- a/assets/bundles/Chat18x/releasePanel.prefab +++ b/assets/bundles/Chat18x/releasePanel.prefab @@ -24,18 +24,18 @@ ], "_active": true, "_components": [ - { - "__id__": 10 - }, { "__id__": 12 }, { "__id__": 14 + }, + { + "__id__": 16 } ], "_prefab": { - "__id__": 16 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -85,15 +85,18 @@ }, { "__id__": 7 + }, + { + "__id__": 9 } ], "_prefab": { - "__id__": 9 + "__id__": 11 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 1.865000000000009, + "y": 0, "z": 0 }, "_lrot": { @@ -239,6 +242,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "7e5W3GRyVPp5gq5LCEPNOu" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_alignFlags": 18, + "_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": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cbESmpq9hNKryEPilyTXXZ" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -262,7 +301,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 13 }, "_contentSize": { "__type__": "cc.Size", @@ -290,7 +329,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 15 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -335,7 +374,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 17 }, "m_rootNode": null, "_id": ""