diff --git a/assets/Scenes/MainScene.scene b/assets/Scenes/MainScene.scene index 686e071f..b190c805 100644 --- a/assets/Scenes/MainScene.scene +++ b/assets/Scenes/MainScene.scene @@ -302,7 +302,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 185.337, "z": 0 }, "_lrot": { diff --git a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts index 39c011e3..73530f21 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts @@ -71,7 +71,7 @@ export class GirlDetailPanel extends li_BaseView { @property(Node) imgsLayout: Node; - videoAreaPos; + videoAreaPos: Vec3; protected onEnable(): void { this.refresh(); @@ -139,7 +139,7 @@ export class GirlDetailPanel extends li_BaseView { this.id = NavigationManager.Instance.getSelectedGirlId(); this.category = NavigationManager.Instance.getSelectedCategoryId(); this.imgItemInst.node.active = false; - this.videoAreaPos = new Vec3(540, 1384); + this.videoAreaPos = new Vec3(540, 1384 - 60); const pos = new Vec3( this.descContent.position.x, diff --git a/assets/bundles/Chat18x/GirlDetailPanel.prefab b/assets/bundles/Chat18x/GirlDetailPanel.prefab index 356a09a2..7777fab1 100644 --- a/assets/bundles/Chat18x/GirlDetailPanel.prefab +++ b/assets/bundles/Chat18x/GirlDetailPanel.prefab @@ -458,6 +458,9 @@ { "__id__": 18 }, + { + "__id__": 24 + }, { "__id__": 283 } @@ -506,6 +509,133 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "videoArea", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 17 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 19 + }, + { + "__id__": 21 + } + ], + "_prefab": { + "__id__": 23 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 263.16700000000014, + "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__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 20 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1080, + "height": 1749.4999999999998 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "12V/UNWFRHXozItfLgjvke" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 18 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": -160.36700000000008, + "_bottom": 365.9670000000001, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 850, + "_originalHeight": 1080, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "89cUOjXspBQYJ1QxrJwK3G" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a33747NDdExbU+VWXHzler", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "ScrollView", @@ -516,7 +646,7 @@ }, "_children": [ { - "__id__": 19 + "__id__": 25 } ], "_active": true, @@ -572,11 +702,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 18 + "__id__": 24 }, "_children": [ { - "__id__": 20 + "__id__": 26 } ], "_active": true, @@ -632,11 +762,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 19 + "__id__": 25 }, "_children": [ { - "__id__": 21 + "__id__": 27 }, { "__id__": 41 @@ -701,11 +831,11 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [ { - "__id__": 22 + "__id__": 28 } ], "_active": true, @@ -758,13 +888,9 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 21 + "__id__": 27 }, - "_children": [ - { - "__id__": 23 - } - ], + "_children": [], "_active": true, "_components": [ { @@ -807,140 +933,13 @@ "_id": "" }, { - "__type__": "cc.Node", - "_name": "videoArea", + "__type__": "cc.UITransform", + "_name": "", "_objFlags": 0, "__editorExtras__": {}, - "_parent": { - "__id__": 22 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 24 - }, - { - "__id__": 26 - } - ], - "_prefab": { + "node": { "__id__": 28 }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 270.30000000000007, - "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__": 23 - }, - "_enabled": true, - "__prefab": { - "__id__": 25 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 1080, - "height": 1714.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "12V/UNWFRHXozItfLgjvke" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 23 - }, - "_enabled": true, - "__prefab": { - "__id__": 27 - }, - "_alignFlags": 45, - "_target": null, - "_left": 0, - "_right": 0, - "_top": -167.5, - "_bottom": 373.1, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 850, - "_originalHeight": 1080, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "89cUOjXspBQYJ1QxrJwK3G" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "a33747NDdExbU+VWXHzler", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 22 - }, "_enabled": true, "__prefab": { "__id__": 30 @@ -967,7 +966,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 28 }, "_enabled": true, "__prefab": { @@ -1016,7 +1015,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 27 }, "_enabled": true, "__prefab": { @@ -1044,7 +1043,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 27 }, "_enabled": false, "__prefab": { @@ -1089,7 +1088,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 27 }, "_enabled": true, "__prefab": { @@ -1138,7 +1137,7 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [ { @@ -1375,6 +1374,8 @@ "__id__": 0 }, "fileId": "30Y/ksyBxMHaP3nhLfx2yw", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -3557,7 +3558,7 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [ { @@ -4115,7 +4116,7 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [ { @@ -5953,7 +5954,7 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 20 + "__id__": 26 }, "_children": [], "_active": true, @@ -6121,7 +6122,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 26 }, "_enabled": true, "__prefab": { @@ -6149,7 +6150,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 26 }, "_enabled": true, "__prefab": { @@ -6185,7 +6186,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 20 + "__id__": 26 }, "_enabled": true, "__prefab": { @@ -6226,8 +6227,6 @@ "__id__": 0 }, "fileId": "a8jgwzPNtJVpWPRJw66C37", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6236,7 +6235,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 25 }, "_enabled": true, "__prefab": { @@ -6264,7 +6263,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 25 }, "_enabled": true, "__prefab": { @@ -6286,7 +6285,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 25 }, "_enabled": true, "__prefab": { @@ -6332,7 +6331,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 25 }, "_enabled": true, "__prefab": { @@ -6381,7 +6380,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 24 }, "_enabled": true, "__prefab": { @@ -6409,7 +6408,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 24 }, "_enabled": false, "__prefab": { @@ -6454,7 +6453,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 24 }, "_enabled": true, "__prefab": { @@ -6469,7 +6468,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 20 + "__id__": 26 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -6485,7 +6484,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 24 }, "_enabled": true, "__prefab": { @@ -6524,6 +6523,8 @@ "__id__": 0 }, "fileId": "4cPLdPNYtIyKxjZXbpFSuo", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -8308,8 +8309,6 @@ "__id__": 0 }, "fileId": "47GAgASDxMgr95ufaUc9Za", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -8777,7 +8776,7 @@ }, "m_rootNode": null, "videoArea": { - "__id__": 24 + "__id__": 19 }, "girlName": { "__id__": 53 @@ -8827,6 +8826,7 @@ "__id__": 0 }, "fileId": "24mSBg+Z9OS5KNS5Yscqr0", + "instance": null, "targetOverrides": null } ] \ No newline at end of file