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-20 12:22:00 +08:00
parent 8a60992052
commit 4d6f8b5bdd
8 changed files with 1321 additions and 1476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/Scenes/LoginScene.scene
+56 -38
View File
@@ -23,7 +23,7 @@
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 47 "__id__": 48
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
}, },
"autoReleaseAssets": false, "autoReleaseAssets": false,
"_globals": { "_globals": {
"__id__": 48 "__id__": 49
}, },
"_id": "dab4ae00-c26e-4176-9c7e-709d8899e525" "_id": "dab4ae00-c26e-4176-9c7e-709d8899e525"
}, },
@@ -76,14 +76,14 @@
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 44
},
{ {
"__id__": 45 "__id__": 45
}, },
{ {
"__id__": 46 "__id__": 46
},
{
"__id__": 47
} }
], ],
"_prefab": null, "_prefab": null,
@@ -235,19 +235,19 @@
"__id__": 27 "__id__": 27
}, },
{ {
"__id__": 30 "__id__": 31
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 41
},
{ {
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 44
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1009,6 +1009,9 @@
}, },
{ {
"__id__": 29 "__id__": 29
},
{
"__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1128,6 +1131,21 @@
"_shadowBlur": 2, "_shadowBlur": 2,
"_id": "b4oSayshNMcqNuuyrCIJak" "_id": "b4oSayshNMcqNuuyrCIJak"
}, },
{
"__type__": "d7e4fOii5xNLqH2PF6de4pP",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 27
},
"_enabled": true,
"__prefab": null,
"languageKey": "opening.desc",
"defaultText": "",
"autoUpdate": true,
"_id": "73R25edyxKpoKwPXNA+Idv"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "loginNode", "_name": "loginNode",
@@ -1138,16 +1156,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 31 "__id__": 32
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 39 "__id__": 40
}, },
{ {
"__id__": 40 "__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1186,18 +1204,15 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 30 "__id__": 31
}, },
"_children": [ "_children": [
{ {
"__id__": 32 "__id__": 33
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 35
},
{ {
"__id__": 36 "__id__": 36
}, },
@@ -1206,6 +1221,9 @@
}, },
{ {
"__id__": 38 "__id__": 38
},
{
"__id__": 39
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1244,16 +1262,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 31 "__id__": 32
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 34
}, },
{ {
"__id__": 34 "__id__": 35
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1292,7 +1310,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 32 "__id__": 33
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1314,7 +1332,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 32 "__id__": 33
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1376,7 +1394,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 31 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1398,7 +1416,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 31 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1437,7 +1455,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 31 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1467,7 +1485,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 31 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1509,7 +1527,7 @@
"_duration": 0.1, "_duration": 0.1,
"_zoomScale": 1.2, "_zoomScale": 1.2,
"_target": { "_target": {
"__id__": 31 "__id__": 32
}, },
"_id": "c9KDag5vBLKazTx4FSrM2p" "_id": "c9KDag5vBLKazTx4FSrM2p"
}, },
@@ -1519,7 +1537,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 30 "__id__": 31
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1541,7 +1559,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 30 "__id__": 31
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1709,29 +1727,29 @@
{ {
"__type__": "cc.SceneGlobals", "__type__": "cc.SceneGlobals",
"ambient": { "ambient": {
"__id__": 49
},
"shadows": {
"__id__": 50 "__id__": 50
}, },
"_skybox": { "shadows": {
"__id__": 51 "__id__": 51
}, },
"fog": { "_skybox": {
"__id__": 52 "__id__": 52
}, },
"octree": { "fog": {
"__id__": 53 "__id__": 53
}, },
"skin": { "octree": {
"__id__": 54 "__id__": 54
}, },
"lightProbeInfo": { "skin": {
"__id__": 55 "__id__": 55
}, },
"postSettings": { "lightProbeInfo": {
"__id__": 56 "__id__": 56
}, },
"postSettings": {
"__id__": 57
},
"bakedWithStationaryMainLight": false, "bakedWithStationaryMainLight": false,
"bakedWithHighpLightmap": false "bakedWithHighpLightmap": false
}, },
assets/Scenes/PreloadScene.scene
+69 -51
View File
@@ -23,7 +23,7 @@
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 54 "__id__": 55
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
}, },
"autoReleaseAssets": false, "autoReleaseAssets": false,
"_globals": { "_globals": {
"__id__": 55 "__id__": 56
}, },
"_id": "16b0d021-6436-4bbc-ba5e-05ebe3e84ba4" "_id": "16b0d021-6436-4bbc-ba5e-05ebe3e84ba4"
}, },
@@ -76,14 +76,14 @@
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 51
},
{ {
"__id__": 52 "__id__": 52
}, },
{ {
"__id__": 53 "__id__": 53
},
{
"__id__": 54
} }
], ],
"_prefab": null, "_prefab": null,
@@ -235,22 +235,22 @@
"__id__": 27 "__id__": 27
}, },
{ {
"__id__": 30 "__id__": 31
}, },
{ {
"__id__": 37 "__id__": 38
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 48
},
{ {
"__id__": 49 "__id__": 49
}, },
{ {
"__id__": 50 "__id__": 50
},
{
"__id__": 51
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1012,6 +1012,9 @@
}, },
{ {
"__id__": 29 "__id__": 29
},
{
"__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1131,6 +1134,21 @@
"_shadowBlur": 2, "_shadowBlur": 2,
"_id": "b4oSayshNMcqNuuyrCIJak" "_id": "b4oSayshNMcqNuuyrCIJak"
}, },
{
"__type__": "d7e4fOii5xNLqH2PF6de4pP",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 27
},
"_enabled": true,
"__prefab": null,
"languageKey": "opening.desc",
"defaultText": "",
"autoUpdate": true,
"_id": "0d7v6Eg6lMm65faTibDc9x"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "jinduBar", "_name": "jinduBar",
@@ -1141,19 +1159,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 31 "__id__": 32
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 34
},
{ {
"__id__": 35 "__id__": 35
}, },
{ {
"__id__": 36 "__id__": 36
},
{
"__id__": 37
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1192,16 +1210,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 30 "__id__": 31
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 32 "__id__": 33
}, },
{ {
"__id__": 33 "__id__": 34
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1240,7 +1258,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 31 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1262,7 +1280,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 31 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1301,7 +1319,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 30 "__id__": 31
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1323,7 +1341,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 30 "__id__": 31
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1362,7 +1380,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 30 "__id__": 31
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1396,16 +1414,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 38 "__id__": 39
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 47
}, },
{ {
"__id__": 47 "__id__": 48
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1444,18 +1462,15 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 37 "__id__": 38
}, },
"_children": [ "_children": [
{ {
"__id__": 39 "__id__": 40
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 42
},
{ {
"__id__": 43 "__id__": 43
}, },
@@ -1464,6 +1479,9 @@
}, },
{ {
"__id__": 45 "__id__": 45
},
{
"__id__": 46
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1502,16 +1520,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 38 "__id__": 39
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 40 "__id__": 41
}, },
{ {
"__id__": 41 "__id__": 42
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1550,7 +1568,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 39 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1572,7 +1590,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 39 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1634,7 +1652,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 38 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1656,7 +1674,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 38 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1695,7 +1713,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 38 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1725,7 +1743,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 38 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1767,7 +1785,7 @@
"_duration": 0.1, "_duration": 0.1,
"_zoomScale": 1.2, "_zoomScale": 1.2,
"_target": { "_target": {
"__id__": 38 "__id__": 39
}, },
"_id": "c9KDag5vBLKazTx4FSrM2p" "_id": "c9KDag5vBLKazTx4FSrM2p"
}, },
@@ -1777,7 +1795,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 37 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1799,7 +1817,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 37 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1966,29 +1984,29 @@
{ {
"__type__": "cc.SceneGlobals", "__type__": "cc.SceneGlobals",
"ambient": { "ambient": {
"__id__": 56
},
"shadows": {
"__id__": 57 "__id__": 57
}, },
"_skybox": { "shadows": {
"__id__": 58 "__id__": 58
}, },
"fog": { "_skybox": {
"__id__": 59 "__id__": 59
}, },
"octree": { "fog": {
"__id__": 60 "__id__": 60
}, },
"skin": { "octree": {
"__id__": 61 "__id__": 61
}, },
"lightProbeInfo": { "skin": {
"__id__": 62 "__id__": 62
}, },
"postSettings": { "lightProbeInfo": {
"__id__": 63 "__id__": 63
}, },
"postSettings": {
"__id__": 64
},
"bakedWithStationaryMainLight": false, "bakedWithStationaryMainLight": false,
"bakedWithHighpLightmap": false "bakedWithHighpLightmap": false
}, },
assets/Scripts/chat18x/ui/components/SimpleToggle.ts
+3 -13
View File
@@ -1,4 +1,5 @@
import { _decorator, Button, Component, Node, NodeEventType, Sprite } from "cc"; import { _decorator, Button, Component, Node, NodeEventType, Sprite } from "cc";
import { GButton } from "../../../Main/Common/GButton";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
@ccclass("SimpleToggle") @ccclass("SimpleToggle")
@@ -14,21 +15,10 @@ export class SimpleToggle extends Component {
btn: Button; btn: Button;
protected onLoad(): void { protected onLoad(): void {
this.node.on(NodeEventType.TOUCH_START, this.onClickThis, this); GButton.BandClick(this.node,this.onClickThis,this);
this.btn = this.getComponent(Button); this.btn = this.getComponent(Button);
} }
init(isSelected: boolean, callBack: () => {}) {
this.selectedSprite.node.active = isSelected;
this.unSelectedSprite.node.active = !isSelected;
if (this.callback) {
this.onDestroy();
}
this.callback = callBack;
this.node.on(NodeEventType.TOUCH_START, this.onClickThis, this);
}
refresh(isSelected: boolean) { refresh(isSelected: boolean) {
this.selectedSprite.node.active = isSelected; this.selectedSprite.node.active = isSelected;
this.unSelectedSprite.node.active = !isSelected; this.unSelectedSprite.node.active = !isSelected;
@@ -45,7 +35,7 @@ export class SimpleToggle extends Component {
} }
protected onDestroy(): void { protected onDestroy(): void {
this.node.off(NodeEventType.TOUCH_START, this.onClickThis, this); //this.node.off(NodeEventType.TOUCH_START, this.onClickThis, this);
this.callback = null; this.callback = null;
} }
assets/Scripts/chat18x/ui/components/SimpleToggleGroup.ts
+15
View File
@@ -15,6 +15,10 @@ export class SimpleToggleGroup extends Component {
} }
} }
protected onEnable(): void {
this.toggleSelectedIndex(0);
}
toggleSelected(selectedNode: Node) { toggleSelected(selectedNode: Node) {
for (let i = 0; i < this.toggles.length; i++) { for (let i = 0; i < this.toggles.length; i++) {
const element = this.toggles[i]; const element = this.toggles[i];
@@ -26,4 +30,15 @@ export class SimpleToggleGroup extends Component {
} }
} }
} }
toggleSelectedIndex(selectedIndex: number) {
for (let i = 0; i < this.toggles.length; i++) {
const element = this.toggles[i];
if (i === selectedIndex) {
element.refresh(true);
} else {
element.refresh(false);
element.btn.interactable = true;
}
}
}
} }
assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts
+2
View File
@@ -131,6 +131,8 @@ export class GirlDetailPanel extends li_BaseView {
console.warn("GirlDetailPanel: videoArea 未设置，使用默认尺寸"); console.warn("GirlDetailPanel: videoArea 未设置，使用默认尺寸");
return new Size(600, 800); return new Size(600, 800);
} }
nameKey: string; nameKey: string;
tagKey: string; tagKey: string;
descKey: string; descKey: string;
assets/Scripts/chat18x/ui/panels/ThemePanel.ts
+2 -2
View File
@@ -295,7 +295,7 @@ export class ThemePanel extends li_BaseView {
} }
enterShop() { enterShop() {
NavigationManager.Instance.switchToPanel(PanelType.PERSONAL); NavigationManager.Instance.openSubPanel("PurchasePanel", this.node);
} }
chatWithRec() { chatWithRec() {
@@ -329,7 +329,7 @@ export class ThemePanel extends li_BaseView {
openSetting() { openSetting() {
// 通过NavigationManager切换到个人信息面板，保持动画和状态同步 // 通过NavigationManager切换到个人信息面板，保持动画和状态同步
NavigationManager.Instance.switchToPanel(PanelType.PERSONAL); NavigationManager.Instance.openSubPanel("SettingPanel", this.node);
} }
openMsgBox() { openMsgBox() {
assets/bundles/Chat18x/PersonalPanel.prefab
+3 -1
View File
@@ -1142,7 +1142,7 @@
"__id__": 45 "__id__": 45
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 47 "__id__": 47
@@ -1708,6 +1708,8 @@
"__id__": 0 "__id__": 0
}, },
"fileId": "cb8+iIEeFIc44IlD6dsgZl", "fileId": "cb8+iIEeFIc44IlD6dsgZl",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {
assets/bundles/Chat18x/ThemePanel.prefab
+1171 -1371
View File
File diff suppressed because it is too large Load Diff