diff --git a/assets/Scenes/MainScene.scene b/assets/Scenes/MainScene.scene index db95d973..c59d14cb 100644 --- a/assets/Scenes/MainScene.scene +++ b/assets/Scenes/MainScene.scene @@ -23,7 +23,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 77 + "__id__": 83 }, "_lpos": { "__type__": "cc.Vec3", @@ -54,7 +54,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 82 + "__id__": 88 }, "_id": "16b0d021-6436-4bbc-ba5e-05ebe3e84ba4" }, @@ -80,13 +80,13 @@ "_active": true, "_components": [ { - "__id__": 74 + "__id__": 80 }, { - "__id__": 75 + "__id__": 81 }, { - "__id__": 76 + "__id__": 82 }, { "__id__": 42 @@ -1613,7 +1613,7 @@ "__id__": 43 }, "UILayerMod": { - "__id__": 54 + "__id__": 60 }, "MainCamera": { "__id__": 4 @@ -1632,10 +1632,10 @@ "_active": true, "_components": [ { - "__id__": 72 + "__id__": 78 }, { - "__id__": 73 + "__id__": 79 } ], "_prefab": null, @@ -1683,23 +1683,23 @@ { "__id__": 43 }, - { - "__id__": 54 - }, - { - "__id__": 57 - }, { "__id__": 60 + }, + { + "__id__": 63 + }, + { + "__id__": 66 } ], "_active": true, "_components": [ { - "__id__": 70 + "__id__": 76 }, { - "__id__": 71 + "__id__": 77 } ], "_prefab": null, @@ -1743,18 +1743,24 @@ "_children": [ { "__id__": 46 + }, + { + "__id__": 51 + }, + { + "__id__": 54 } ], "_active": true, "_components": [ { - "__id__": 51 + "__id__": 57 }, { - "__id__": 52 + "__id__": 58 }, { - "__id__": 53 + "__id__": 59 } ], "_prefab": null, @@ -1910,6 +1916,206 @@ "__prefab": null, "_id": "a2xQSbqBtDhpcLiyQWux8B" }, + { + "__type__": "cc.Node", + "_name": "DetailvideoArea", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 45 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 52 + }, + { + "__id__": 53 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 102.5, + "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": "06KG6npa5N9Ytt0BWKxBa3" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 51 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 1080, + "height": 1909.3999999999999 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "78X++gDdZMGKxBvP6ZCKZ/" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 51 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0.30000000000009663, + "_bottom": 205.29999999999998, + "_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": "030S2oso5E3br4TfZrRvr+" + }, + { + "__type__": "cc.Node", + "_name": "ChatVideoArea", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 45 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 55 + }, + { + "__id__": 56 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 83.80000000000007, + "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": "b1/o6QINNH8K+Y9z159GXq" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 54 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 1080, + "height": 1947.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "56ESXdup9E0rbHhYeG6phS" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 54 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 167.6, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 45, + "_id": "del+DteeVAs7WBjyy7eKrZ" + }, { "__type__": "cc.UITransform", "_name": "", @@ -1987,10 +2193,10 @@ "_active": true, "_components": [ { - "__id__": 55 + "__id__": 61 }, { - "__id__": 56 + "__id__": 62 } ], "_prefab": null, @@ -2029,7 +2235,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 60 }, "_enabled": true, "__prefab": null, @@ -2051,7 +2257,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 54 + "__id__": 60 }, "_enabled": true, "__prefab": null, @@ -2087,10 +2293,10 @@ "_active": true, "_components": [ { - "__id__": 58 + "__id__": 64 }, { - "__id__": 59 + "__id__": 65 } ], "_prefab": null, @@ -2129,7 +2335,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 63 }, "_enabled": true, "__prefab": null, @@ -2151,7 +2357,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 63 }, "_enabled": true, "__prefab": null, @@ -2174,13 +2380,13 @@ }, "_children": [ { - "__id__": 61 + "__id__": 67 } ], "_active": false, "_components": [ { - "__id__": 69 + "__id__": 75 } ], "_prefab": null, @@ -2219,26 +2425,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 60 + "__id__": 66 }, "_children": [ { - "__id__": 62 + "__id__": 68 } ], "_active": true, "_components": [ { - "__id__": 65 + "__id__": 71 }, { - "__id__": 66 + "__id__": 72 }, { - "__id__": 67 + "__id__": 73 }, { - "__id__": 68 + "__id__": 74 } ], "_prefab": null, @@ -2277,16 +2483,16 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 61 + "__id__": 67 }, "_children": [], "_active": true, "_components": [ { - "__id__": 63 + "__id__": 69 }, { - "__id__": 64 + "__id__": 70 } ], "_prefab": null, @@ -2325,7 +2531,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 68 }, "_enabled": true, "__prefab": null, @@ -2347,7 +2553,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 68 }, "_enabled": true, "__prefab": null, @@ -2409,7 +2615,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 67 }, "_enabled": true, "__prefab": null, @@ -2431,7 +2637,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 67 }, "_enabled": true, "__prefab": null, @@ -2470,7 +2676,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 67 }, "_enabled": true, "__prefab": null, @@ -2524,7 +2730,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 61 + "__id__": 67 }, "_id": "f22A3TNbFMvbuNfDD/K03a" }, @@ -2534,12 +2740,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 67 }, "_enabled": true, "__prefab": null, "startTestButton": { - "__id__": 67 + "__id__": 73 }, "statusLabel": null, "resultLabel": null, @@ -2551,7 +2757,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 60 + "__id__": 66 }, "_enabled": true, "__prefab": null, @@ -2747,10 +2953,10 @@ "instance": null, "targetOverrides": [ { - "__id__": 78 + "__id__": 84 }, { - "__id__": 80 + "__id__": 86 } ] }, @@ -2767,7 +2973,7 @@ "__id__": 44 }, "targetInfo": { - "__id__": 79 + "__id__": 85 } }, { @@ -2789,7 +2995,7 @@ "__id__": 44 }, "targetInfo": { - "__id__": 81 + "__id__": 87 } }, { @@ -2801,29 +3007,29 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 83 - }, - "shadows": { - "__id__": 84 - }, - "_skybox": { - "__id__": 85 - }, - "fog": { - "__id__": 86 - }, - "octree": { - "__id__": 87 - }, - "skin": { - "__id__": 88 - }, - "lightProbeInfo": { "__id__": 89 }, - "postSettings": { + "shadows": { "__id__": 90 }, + "_skybox": { + "__id__": 91 + }, + "fog": { + "__id__": 92 + }, + "octree": { + "__id__": 93 + }, + "skin": { + "__id__": 94 + }, + "lightProbeInfo": { + "__id__": 95 + }, + "postSettings": { + "__id__": 96 + }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false }, diff --git a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts index b5837bc8..0f0886f0 100644 --- a/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts +++ b/assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts @@ -242,29 +242,12 @@ export class GirlDetailPanel extends li_BaseView { : new Size(600, 800); // 获取 videoArea 的中心位置，确保使用正确的世界坐标 - const videoAreaPos = this.videoAreaPos; - if (this.videoArea) { - // 获取 videoArea 的世界坐标 - this.videoAreaPos = this.videoArea.node.getWorldPosition(); - - // 也检查 videoLayer 的父节点信息，确保坐标系统一致 - if (this.videoLayer && this.videoLayer.getVideoPlayer()) { - const videoPlayerParent = - this.videoLayer.getVideoPlayer().node.parent; - if (videoPlayerParent) { - const parentWorldPos = videoPlayerParent.getWorldPosition(); - logger.log( - `GirlDetailPanel: VideoPlayer 父节点世界位置: (${parentWorldPos.x}, ${parentWorldPos.y}, ${parentWorldPos.z})` - ); - } - } - } // 使用新的统一 playVideo 方法 this.videoLayer.playVideo(firstPath, { loop: true, size: targetSize, - position: videoAreaPos, + position: this.videoAreaPos, }); } diff --git a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts index ec0f2ef9..939bd4dc 100644 --- a/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts +++ b/assets/Scripts/chat18x/ui/panels/PurchasePanel.ts @@ -1,4 +1,4 @@ -import { _decorator, Component, Label, Node } from "cc"; +import { _decorator, Component, Label, Node, ScrollView } from "cc"; import li_BaseView from "../../../Main/Common/li_BaseView"; import Utils from "../../../Main/Common/Utils"; import { GButton } from "../../../Main/Common/GButton"; @@ -29,6 +29,8 @@ export class PurchasePanel extends li_BaseView { private vipPrice30: Label; private vipTime30: Label; + private ScrollView: ScrollView; + private currentPayType: proto.cs.EnmPayType = proto.cs.EnmPayType.EPT_Cash_INR; private defaultNetworkType: proto.cs.EnmNetworkType = @@ -59,6 +61,8 @@ export class PurchasePanel extends li_BaseView { this.vipPrice30 = this._nodeTab.vipPrice30.getComponent(Label); this.vipTime30 = this._nodeTab.vipTime30.getComponent(Label); + this.ScrollView = this._nodeTab.ScrollView.getComponent(ScrollView); + this.cashBtnSelecting = this._nodeTab.cashBtn.getChildByName("selecting"); this.cashBtnNotSelect = this._nodeTab.cashBtn.getChildByName("notSelect"); this.web3BtnSelecting = this._nodeTab.web3Btn.getChildByName("selecting"); @@ -159,6 +163,7 @@ export class PurchasePanel extends li_BaseView { const memberId30 = this.shopData.get30DayMemberId(); const price30 = this.shopData.getOriginalPriceById(memberId30); this.vipPrice30.string = `$ ${price30}`; + this.ScrollView.scrollToBottom(); } // 0:cash 1:web3 diff --git a/assets/Scripts/chat18x/uiitems/PurchasePanelItem.ts b/assets/Scripts/chat18x/uiitems/PurchasePanelItem.ts index 4e894db6..48f8f746 100644 --- a/assets/Scripts/chat18x/uiitems/PurchasePanelItem.ts +++ b/assets/Scripts/chat18x/uiitems/PurchasePanelItem.ts @@ -26,25 +26,29 @@ export class PurchasePanelItem extends Component { GButton.BandClick(this.node, this.onClickThis, this); } + // 0:cash 1:web3 public refresh(type: number, goodId: number) { this.goodId = goodId; this.show(type); } + // 0:cash 1:web3 public show(type: number) { const shopData = DataManager.I.getDataById(DataId.Shop); const count = shopData.getCountById(this.goodId); this.count.string = count.toString(); - const price = shopData.getOriginalPriceById(this.goodId); - this.price.string = "$" + price.toString(); let path = ""; if (type == 1) { // web3币 path += "ui/shop/coin/"; + const price = shopData.getOriginalUsdPriceById(this.goodId); + this.price.string = price.toString(); } //cash else { path += "ui/shop/cash/"; + const price = shopData.getOriginalPriceById(this.goodId); + this.price.string = "₹‌" + price.toString(); } path += this.goodId; diff --git a/assets/bundles/Chat18x/PurchasePanel.prefab b/assets/bundles/Chat18x/PurchasePanel.prefab index 41d94134..561fb47b 100644 --- a/assets/bundles/Chat18x/PurchasePanel.prefab +++ b/assets/bundles/Chat18x/PurchasePanel.prefab @@ -1050,7 +1050,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 854.9869999999999, + "y": 857.1489999999999, "z": 0 }, "_lrot": { @@ -1665,6 +1665,8 @@ "__id__": 0 }, "fileId": "091GJm6LlLRakKyxCtUo8R", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -2118,6 +2120,8 @@ "__id__": 0 }, "fileId": "8fCxTLpn1Ew5TFhy/C6VKN", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -2953,7 +2957,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "27d0d01d-3b1b-4abe-aefb-caeabd202003@f9941", + "__uuid__": "1eec33bd-a22a-4731-8426-943f49050b20@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -3018,10 +3022,7 @@ "b": 124, "a": 255 }, - "_normalSprite": { - "__uuid__": "27d0d01d-3b1b-4abe-aefb-caeabd202003@f9941", - "__expectedType__": "cc.SpriteFrame" - }, + "_normalSprite": null, "_hoverSprite": null, "_pressedSprite": null, "_disabledSprite": null, @@ -3647,6 +3648,8 @@ "__id__": 0 }, "fileId": "bfmQnNE+dDppKipXIAljrF", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, {