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-09-22 14:13:18 +08:00
parent ec35bf4e87
commit 26019a0080
5 changed files with 298 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/Scenes/MainScene.scene
+276 -70
View File
@@ -23,7 +23,7 @@
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 77 "__id__": 83
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
}, },
"autoReleaseAssets": false, "autoReleaseAssets": false,
"_globals": { "_globals": {
"__id__": 82 "__id__": 88
}, },
"_id": "16b0d021-6436-4bbc-ba5e-05ebe3e84ba4" "_id": "16b0d021-6436-4bbc-ba5e-05ebe3e84ba4"
}, },
@@ -80,13 +80,13 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 80
}, },
{ {
"__id__": 75 "__id__": 81
}, },
{ {
"__id__": 76 "__id__": 82
}, },
{ {
"__id__": 42 "__id__": 42
@@ -1613,7 +1613,7 @@
"__id__": 43 "__id__": 43
}, },
"UILayerMod": { "UILayerMod": {
"__id__": 54 "__id__": 60
}, },
"MainCamera": { "MainCamera": {
"__id__": 4 "__id__": 4
@@ -1632,10 +1632,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 72 "__id__": 78
}, },
{ {
"__id__": 73 "__id__": 79
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1683,23 +1683,23 @@
{ {
"__id__": 43 "__id__": 43
}, },
{
"__id__": 54
},
{
"__id__": 57
},
{ {
"__id__": 60 "__id__": 60
},
{
"__id__": 63
},
{
"__id__": 66
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 70 "__id__": 76
}, },
{ {
"__id__": 71 "__id__": 77
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1743,18 +1743,24 @@
"_children": [ "_children": [
{ {
"__id__": 46 "__id__": 46
},
{
"__id__": 51
},
{
"__id__": 54
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 51 "__id__": 57
}, },
{ {
"__id__": 52 "__id__": 58
}, },
{ {
"__id__": 53 "__id__": 59
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1910,6 +1916,206 @@
"__prefab": null, "__prefab": null,
"_id": "a2xQSbqBtDhpcLiyQWux8B" "_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", "__type__": "cc.UITransform",
"_name": "", "_name": "",
@@ -1987,10 +2193,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 55 "__id__": 61
}, },
{ {
"__id__": 56 "__id__": 62
} }
], ],
"_prefab": null, "_prefab": null,
@@ -2029,7 +2235,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 54 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2051,7 +2257,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 54 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2087,10 +2293,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 58 "__id__": 64
}, },
{ {
"__id__": 59 "__id__": 65
} }
], ],
"_prefab": null, "_prefab": null,
@@ -2129,7 +2335,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 57 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2151,7 +2357,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 57 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2174,13 +2380,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 61 "__id__": 67
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 69 "__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
@@ -2219,26 +2425,26 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 60 "__id__": 66
}, },
"_children": [ "_children": [
{ {
"__id__": 62 "__id__": 68
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 65 "__id__": 71
}, },
{ {
"__id__": 66 "__id__": 72
}, },
{ {
"__id__": 67 "__id__": 73
}, },
{ {
"__id__": 68 "__id__": 74
} }
], ],
"_prefab": null, "_prefab": null,
@@ -2277,16 +2483,16 @@
"_objFlags": 512, "_objFlags": 512,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 61 "__id__": 67
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 63 "__id__": 69
}, },
{ {
"__id__": 64 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
@@ -2325,7 +2531,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 62 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2347,7 +2553,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 62 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2409,7 +2615,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 61 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2431,7 +2637,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 61 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2470,7 +2676,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 61 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2524,7 +2730,7 @@
"_duration": 0.1, "_duration": 0.1,
"_zoomScale": 1.2, "_zoomScale": 1.2,
"_target": { "_target": {
"__id__": 61 "__id__": 67
}, },
"_id": "f22A3TNbFMvbuNfDD/K03a" "_id": "f22A3TNbFMvbuNfDD/K03a"
}, },
@@ -2534,12 +2740,12 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 61 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"startTestButton": { "startTestButton": {
"__id__": 67 "__id__": 73
}, },
"statusLabel": null, "statusLabel": null,
"resultLabel": null, "resultLabel": null,
@@ -2551,7 +2757,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 60 "__id__": 66
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2747,10 +2953,10 @@
"instance": null, "instance": null,
"targetOverrides": [ "targetOverrides": [
{ {
"__id__": 78 "__id__": 84
}, },
{ {
"__id__": 80 "__id__": 86
} }
] ]
}, },
@@ -2767,7 +2973,7 @@
"__id__": 44 "__id__": 44
}, },
"targetInfo": { "targetInfo": {
"__id__": 79 "__id__": 85
} }
}, },
{ {
@@ -2789,7 +2995,7 @@
"__id__": 44 "__id__": 44
}, },
"targetInfo": { "targetInfo": {
"__id__": 81 "__id__": 87
} }
}, },
{ {
@@ -2801,29 +3007,29 @@
{ {
"__type__": "cc.SceneGlobals", "__type__": "cc.SceneGlobals",
"ambient": { "ambient": {
"__id__": 83
},
"shadows": {
"__id__": 84
},
"_skybox": {
"__id__": 85
},
"fog": {
"__id__": 86
},
"octree": {
"__id__": 87
},
"skin": {
"__id__": 88
},
"lightProbeInfo": {
"__id__": 89 "__id__": 89
}, },
"postSettings": { "shadows": {
"__id__": 90 "__id__": 90
}, },
"_skybox": {
"__id__": 91
},
"fog": {
"__id__": 92
},
"octree": {
"__id__": 93
},
"skin": {
"__id__": 94
},
"lightProbeInfo": {
"__id__": 95
},
"postSettings": {
"__id__": 96
},
"bakedWithStationaryMainLight": false, "bakedWithStationaryMainLight": false,
"bakedWithHighpLightmap": false "bakedWithHighpLightmap": false
}, },
assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts
+1 -18
View File
@@ -242,29 +242,12 @@ export class GirlDetailPanel extends li_BaseView {
: new Size(600, 800); : new Size(600, 800);
// 获取 videoArea 的中心位置，确保使用正确的世界坐标 // 获取 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 方法 // 使用新的统一 playVideo 方法
this.videoLayer.playVideo(firstPath, { this.videoLayer.playVideo(firstPath, {
loop: true, loop: true,
size: targetSize, size: targetSize,
position: videoAreaPos, position: this.videoAreaPos,
}); });
} }
assets/Scripts/chat18x/ui/panels/PurchasePanel.ts
+6 -1
View File
@@ -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 li_BaseView from "../../../Main/Common/li_BaseView";
import Utils from "../../../Main/Common/Utils"; import Utils from "../../../Main/Common/Utils";
import { GButton } from "../../../Main/Common/GButton"; import { GButton } from "../../../Main/Common/GButton";
@@ -29,6 +29,8 @@ export class PurchasePanel extends li_BaseView {
private vipPrice30: Label; private vipPrice30: Label;
private vipTime30: Label; private vipTime30: Label;
private ScrollView: ScrollView;
private currentPayType: proto.cs.EnmPayType = private currentPayType: proto.cs.EnmPayType =
proto.cs.EnmPayType.EPT_Cash_INR; proto.cs.EnmPayType.EPT_Cash_INR;
private defaultNetworkType: proto.cs.EnmNetworkType = private defaultNetworkType: proto.cs.EnmNetworkType =
@@ -59,6 +61,8 @@ export class PurchasePanel extends li_BaseView {
this.vipPrice30 = this._nodeTab.vipPrice30.getComponent(Label); this.vipPrice30 = this._nodeTab.vipPrice30.getComponent(Label);
this.vipTime30 = this._nodeTab.vipTime30.getComponent(Label); this.vipTime30 = this._nodeTab.vipTime30.getComponent(Label);
this.ScrollView = this._nodeTab.ScrollView.getComponent(ScrollView);
this.cashBtnSelecting = this._nodeTab.cashBtn.getChildByName("selecting"); this.cashBtnSelecting = this._nodeTab.cashBtn.getChildByName("selecting");
this.cashBtnNotSelect = this._nodeTab.cashBtn.getChildByName("notSelect"); this.cashBtnNotSelect = this._nodeTab.cashBtn.getChildByName("notSelect");
this.web3BtnSelecting = this._nodeTab.web3Btn.getChildByName("selecting"); this.web3BtnSelecting = this._nodeTab.web3Btn.getChildByName("selecting");
@@ -159,6 +163,7 @@ export class PurchasePanel extends li_BaseView {
const memberId30 = this.shopData.get30DayMemberId(); const memberId30 = this.shopData.get30DayMemberId();
const price30 = this.shopData.getOriginalPriceById(memberId30); const price30 = this.shopData.getOriginalPriceById(memberId30);
this.vipPrice30.string = `$ ${price30}`; this.vipPrice30.string = `$ ${price30}`;
this.ScrollView.scrollToBottom();
} }
// 0:cash 1:web3 // 0:cash 1:web3
assets/Scripts/chat18x/uiitems/PurchasePanelItem.ts
+6 -2
View File
@@ -26,25 +26,29 @@ export class PurchasePanelItem extends Component {
GButton.BandClick(this.node, this.onClickThis, this); GButton.BandClick(this.node, this.onClickThis, this);
} }
// 0:cash 1:web3
public refresh(type: number, goodId: number) { public refresh(type: number, goodId: number) {
this.goodId = goodId; this.goodId = goodId;
this.show(type); this.show(type);
} }
// 0:cash 1:web3
public show(type: number) { public show(type: number) {
const shopData = DataManager.I.getDataById<ShopData>(DataId.Shop); const shopData = DataManager.I.getDataById<ShopData>(DataId.Shop);
const count = shopData.getCountById(this.goodId); const count = shopData.getCountById(this.goodId);
this.count.string = count.toString(); this.count.string = count.toString();
const price = shopData.getOriginalPriceById(this.goodId);
this.price.string = "$" + price.toString();
let path = ""; let path = "";
if (type == 1) { if (type == 1) {
// web3币 // web3币
path += "ui/shop/coin/"; path += "ui/shop/coin/";
const price = shopData.getOriginalUsdPriceById(this.goodId);
this.price.string = price.toString();
} //cash } //cash
else { else {
path += "ui/shop/cash/"; path += "ui/shop/cash/";
const price = shopData.getOriginalPriceById(this.goodId);
this.price.string = "₹‌" + price.toString();
} }
path += this.goodId; path += this.goodId;
assets/bundles/Chat18x/PurchasePanel.prefab
+9 -6
View File
@@ -1050,7 +1050,7 @@
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 854.9869999999999, "y": 857.1489999999999,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@@ -1665,6 +1665,8 @@
"__id__": 0 "__id__": 0
}, },
"fileId": "091GJm6LlLRakKyxCtUo8R", "fileId": "091GJm6LlLRakKyxCtUo8R",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {
@@ -2118,6 +2120,8 @@
"__id__": 0 "__id__": 0
}, },
"fileId": "8fCxTLpn1Ew5TFhy/C6VKN", "fileId": "8fCxTLpn1Ew5TFhy/C6VKN",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {
@@ -2953,7 +2957,7 @@
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "27d0d01d-3b1b-4abe-aefb-caeabd202003@f9941", "__uuid__": "1eec33bd-a22a-4731-8426-943f49050b20@f9941",
"__expectedType__": "cc.SpriteFrame" "__expectedType__": "cc.SpriteFrame"
}, },
"_type": 1, "_type": 1,
@@ -3018,10 +3022,7 @@
"b": 124, "b": 124,
"a": 255 "a": 255
}, },
"_normalSprite": { "_normalSprite": null,
"__uuid__": "27d0d01d-3b1b-4abe-aefb-caeabd202003@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_hoverSprite": null, "_hoverSprite": null,
"_pressedSprite": null, "_pressedSprite": null,
"_disabledSprite": null, "_disabledSprite": null,
@@ -3647,6 +3648,8 @@
"__id__": 0 "__id__": 0
}, },
"fileId": "bfmQnNE+dDppKipXIAljrF", "fileId": "bfmQnNE+dDppKipXIAljrF",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {