Merge branch 'main' of 47.107.44.202:xionglijia/18xchat

This commit is contained in:
chen wei bo
2025-09-09 15:16:41 +08:00
269 changed files with 29761 additions and 17972 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 861 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 999 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 620 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 181 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 350 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 849 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 946 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 358 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 841 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 528 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 468 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 626 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 987 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 211 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 832 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 889 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 453 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 632 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 990 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 848 KiB

+13 -13
View File
@@ -98,8 +98,8 @@
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 375, "x": 540,
"y": 667, "y": 1170,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@@ -184,7 +184,7 @@
"_priority": 0, "_priority": 0,
"_fov": 45, "_fov": 45,
"_fovAxis": 0, "_fovAxis": 0,
"_orthoHeight": 667, "_orthoHeight": 1170,
"_near": 0, "_near": 0,
"_far": 2000, "_far": 2000,
"_color": { "_color": {
@@ -558,8 +558,8 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 31, "width": 361,
"height": -622 "height": 384
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -660,8 +660,8 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750, "width": 1080,
"height": 1334 "height": 2340
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -786,8 +786,8 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750, "width": 1080,
"height": 1334 "height": 2340
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -886,8 +886,8 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750, "width": 1080,
"height": 1334 "height": 2340
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -938,8 +938,8 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750, "width": 1080,
"height": 1334 "height": 2340
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
+171 -237
View File
@@ -23,7 +23,7 @@
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 62 "__id__": 60
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@@ -54,7 +54,7 @@
}, },
"autoReleaseAssets": false, "autoReleaseAssets": false,
"_globals": { "_globals": {
"__id__": 63 "__id__": 61
}, },
"_id": "16b0d021-6436-4bbc-ba5e-05ebe3e84ba4" "_id": "16b0d021-6436-4bbc-ba5e-05ebe3e84ba4"
}, },
@@ -76,14 +76,14 @@
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 57
},
{
"__id__": 58
},
{ {
"__id__": 59 "__id__": 59
},
{
"__id__": 60
},
{
"__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
@@ -223,25 +223,25 @@
"__id__": 10 "__id__": 10
}, },
{ {
"__id__": 14 "__id__": 13
}, },
{ {
"__id__": 18 "__id__": 16
}, },
{ {
"__id__": 25 "__id__": 23
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 54
},
{
"__id__": 55
},
{ {
"__id__": 56 "__id__": 56
},
{
"__id__": 57
},
{
"__id__": 58
} }
], ],
"_prefab": null, "_prefab": null,
@@ -362,13 +362,13 @@
"_dstBlendFactor": 4, "_dstBlendFactor": 4,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 24,
"g": 255, "g": 15,
"b": 255, "b": 32,
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "f6b9ad73-5f75-4381-9a26-bc242b1c9c7e@f9941", "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
"__expectedType__": "cc.SpriteFrame" "__expectedType__": "cc.SpriteFrame"
}, },
"_type": 0, "_type": 0,
@@ -400,7 +400,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "logo", "_name": "Icon_BG",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
@@ -414,16 +414,13 @@
}, },
{ {
"__id__": 12 "__id__": 12
},
{
"__id__": 13
} }
], ],
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 47.06200000000001, "x": 0,
"y": -457.41099999999994, "y": 299.3589999999999,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@@ -447,7 +444,7 @@
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
"_id": "107+/WGklMAKqG8ntcZljJ" "_id": "96PSzdR+lNW6rxfZaUrhFR"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
@@ -461,15 +458,15 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 693, "width": 312,
"height": 285 "height": 312
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5, "x": 0.5,
"y": 0.5 "y": 0.5
}, },
"_id": "bec7wLhcNABaV7oJi0nM2S" "_id": "6cv3lYbA1LhIoC9AtJJObM"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
@@ -492,7 +489,7 @@
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "5ef9bbe1-032c-4c1c-a0bf-98290cf1dd1d@f9941", "__uuid__": "956bb46f-bf99-44c5-b1d3-4717914d71ea@f9941",
"__expectedType__": "cc.SpriteFrame" "__expectedType__": "cc.SpriteFrame"
}, },
"_type": 0, "_type": 0,
@@ -508,41 +505,11 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
"_id": "e7LFGMjJ9Cw4av+MQLGYH0" "_id": "f5WrotzqdGWJP9wQYVbDCZ"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 10
},
"_enabled": true,
"__prefab": null,
"_alignFlags": 1,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 1484.911,
"_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": "165eMG+J1O15r6QC2SGObg"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "LabProgress", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
@@ -551,21 +518,18 @@
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 14
},
{ {
"__id__": 15 "__id__": 15
},
{
"__id__": 16
},
{
"__id__": 17
} }
], ],
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -1019.5029999999999, "y": -14.424999999999955,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@@ -589,7 +553,7 @@
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
"_id": "4eKplCQcVIopTJpjTJhRYK" "_id": "8dWZtjhe5MC4Vrv/iR99Wa"
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
@@ -597,21 +561,21 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 14 "__id__": 13
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 130.3388671875, "width": 971.1772500000001,
"height": 50.4 "height": 307.104
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5, "x": 0.5,
"y": 0.5 "y": 0.5
}, },
"_id": "ff7V6JMqNEVYiXxHXDcJyI" "_id": "450JyC0olLu7EQEduC9/bx"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
@@ -619,7 +583,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 14 "__id__": 13
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -628,19 +592,19 @@
"_dstBlendFactor": 4, "_dstBlendFactor": 4,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 195,
"g": 255, "g": 186,
"b": 255, "b": 206,
"a": 255 "a": 255
}, },
"_string": "加载中...", "_string": "All characters, places, or organizations depicted in this app are fictitious. Any resemblance to real persons, living or dead, is purely coincidental.",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 34, "_actualFontSize": 46,
"_fontSize": 34, "_fontSize": 46,
"_fontFamily": "Arial", "_fontFamily": "NotoSans-Regular",
"_lineHeight": 40, "_lineHeight": 54.6,
"_overflow": 0, "_overflow": 1,
"_enableWrapText": true, "_enableWrapText": true,
"_font": null, "_font": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
@@ -649,7 +613,7 @@
"_isBold": false, "_isBold": false,
"_isUnderline": false, "_isUnderline": false,
"_underlineHeight": 2, "_underlineHeight": 2,
"_cacheMode": 1, "_cacheMode": 0,
"_enableOutline": false, "_enableOutline": false,
"_outlineColor": { "_outlineColor": {
"__type__": "cc.Color", "__type__": "cc.Color",
@@ -673,37 +637,7 @@
"y": 2 "y": 2
}, },
"_shadowBlur": 2, "_shadowBlur": 2,
"_id": "1cK/CutPBC7Z4HWmZGFEAe" "_id": "b4oSayshNMcqNuuyrCIJak"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 14
},
"_enabled": true,
"__prefab": null,
"_alignFlags": 4,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 125.29699999999997,
"_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": "91FbQIXVdI4KMRkPC8HzGf"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
@@ -715,26 +649,26 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 19 "__id__": 17
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 20
},
{
"__id__": 21
},
{ {
"__id__": 22 "__id__": 22
},
{
"__id__": 23
},
{
"__id__": 24
} }
], ],
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -975.5029999999999, "y": -755.781,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@@ -766,23 +700,23 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 18 "__id__": 16
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 20 "__id__": 18
}, },
{ {
"__id__": 21 "__id__": 19
} }
], ],
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -255, "x": -440.128,
"y": 0, "y": -5.684341886080802e-14,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@@ -814,14 +748,14 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 19 "__id__": 17
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 510, "width": 877.9,
"height": 24 "height": 29.8
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -836,7 +770,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 19 "__id__": 17
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -845,9 +779,9 @@
"_dstBlendFactor": 4, "_dstBlendFactor": 4,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 83,
"g": 255, "g": 48,
"b": 255, "b": 112,
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
@@ -856,14 +790,14 @@
}, },
"_type": 3, "_type": 3,
"_fillType": 0, "_fillType": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0, "x": 0,
"y": 0 "y": 0
}, },
"_fillStart": 0, "_fillStart": 0,
"_fillRange": 0.7, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_useGrayscale": false, "_useGrayscale": false,
"_atlas": null, "_atlas": null,
@@ -875,14 +809,14 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 18 "__id__": 16
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 517, "width": 896,
"height": 34 "height": 37
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@@ -897,7 +831,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 18 "__id__": 16
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -912,12 +846,12 @@
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "c9e9e586-533e-4a1c-b263-2a4d19d42d3b@f9941", "__uuid__": "43844079-261d-442c-a63a-5dfa72c3aeca@f9941",
"__expectedType__": "cc.SpriteFrame" "__expectedType__": "cc.SpriteFrame"
}, },
"_type": 0, "_type": 1,
"_fillType": 0, "_fillType": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0, "x": 0,
@@ -936,7 +870,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 18 "__id__": 16
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -945,7 +879,7 @@
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 177.49700000000007, "_bottom": 395.71900000000005,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
@@ -970,31 +904,31 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 26 "__id__": 24
}, },
{ {
"__id__": 34 "__id__": 32
}, },
{ {
"__id__": 38 "__id__": 36
}, },
{ {
"__id__": 42 "__id__": 40
}, },
{ {
"__id__": 46 "__id__": 44
}, },
{ {
"__id__": 50 "__id__": 48
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 54 "__id__": 52
}, },
{ {
"__id__": 55 "__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1033,33 +967,33 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 25 "__id__": 23
}, },
"_children": [ "_children": [
{ {
"__id__": 27 "__id__": 25
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 28
},
{
"__id__": 29
},
{ {
"__id__": 30 "__id__": 30
}, },
{ {
"__id__": 31 "__id__": 31
},
{
"__id__": 32
},
{
"__id__": 33
} }
], ],
"_prefab": null, "_prefab": null,
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -809.7220000000001, "y": -370.278,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@@ -1091,16 +1025,16 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 26 "__id__": 24
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 26
}, },
{ {
"__id__": 29 "__id__": 27
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1139,7 +1073,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 27 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1161,7 +1095,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 27 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1223,7 +1157,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 26 "__id__": 24
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1245,7 +1179,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 26 "__id__": 24
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1284,7 +1218,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 26 "__id__": 24
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1293,7 +1227,7 @@
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 305.2279999999999, "_bottom": 744.672,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
@@ -1314,7 +1248,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 26 "__id__": 24
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1356,7 +1290,7 @@
"_duration": 0.1, "_duration": 0.1,
"_zoomScale": 1.2, "_zoomScale": 1.2,
"_target": { "_target": {
"__id__": 26 "__id__": 24
}, },
"_id": "c9KDag5vBLKazTx4FSrM2p" "_id": "c9KDag5vBLKazTx4FSrM2p"
}, },
@@ -1366,19 +1300,19 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 25 "__id__": 23
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{
"__id__": 33
},
{
"__id__": 34
},
{ {
"__id__": 35 "__id__": 35
},
{
"__id__": 36
},
{
"__id__": 37
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1417,7 +1351,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 34 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1439,7 +1373,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 34 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1478,7 +1412,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 34 "__id__": 32
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1508,19 +1442,19 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 25 "__id__": 23
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{
"__id__": 37
},
{
"__id__": 38
},
{ {
"__id__": 39 "__id__": 39
},
{
"__id__": 40
},
{
"__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1559,7 +1493,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 38 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1581,7 +1515,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 38 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1643,7 +1577,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 38 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1673,19 +1607,19 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 25 "__id__": 23
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{
"__id__": 41
},
{
"__id__": 42
},
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 44
},
{
"__id__": 45
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1724,7 +1658,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1746,7 +1680,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1808,7 +1742,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 42 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1838,19 +1772,19 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 25 "__id__": 23
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{
"__id__": 45
},
{
"__id__": 46
},
{ {
"__id__": 47 "__id__": 47
},
{
"__id__": 48
},
{
"__id__": 49
} }
], ],
"_prefab": null, "_prefab": null,
@@ -1889,7 +1823,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 46 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1911,7 +1845,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 46 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -1973,7 +1907,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 46 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2003,19 +1937,19 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 25 "__id__": 23
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{
"__id__": 49
},
{
"__id__": 50
},
{ {
"__id__": 51 "__id__": 51
},
{
"__id__": 52
},
{
"__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
@@ -2054,7 +1988,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 50 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2076,7 +2010,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 50 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2138,7 +2072,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 50 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2168,7 +2102,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 25 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2190,7 +2124,7 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 25 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"__prefab": null, "__prefab": null,
@@ -2357,28 +2291,28 @@
{ {
"__type__": "cc.SceneGlobals", "__type__": "cc.SceneGlobals",
"ambient": { "ambient": {
"__id__": 64 "__id__": 62
}, },
"shadows": { "shadows": {
"__id__": 65 "__id__": 63
}, },
"_skybox": { "_skybox": {
"__id__": 66 "__id__": 64
}, },
"fog": { "fog": {
"__id__": 67 "__id__": 65
}, },
"octree": { "octree": {
"__id__": 68 "__id__": 66
}, },
"skin": { "skin": {
"__id__": 69 "__id__": 67
}, },
"lightProbeInfo": { "lightProbeInfo": {
"__id__": 70 "__id__": 68
}, },
"postSettings": { "postSettings": {
"__id__": 71 "__id__": 69
}, },
"bakedWithStationaryMainLight": false, "bakedWithStationaryMainLight": false,
"bakedWithHighpLightmap": false "bakedWithHighpLightmap": false
+12 -14
View File
@@ -38,7 +38,7 @@ import MachineInfoService from "db://assets/Scripts/chat18x/foundation/identity/
import { AuthService } from "db://assets/Scripts/chat18x/network/services/AuthService"; import { AuthService } from "db://assets/Scripts/chat18x/network/services/AuthService";
import { PlayerDataService } from "db://assets/Scripts/chat18x/network/services/PlayerDataService"; import { PlayerDataService } from "db://assets/Scripts/chat18x/network/services/PlayerDataService";
import { ApiCode } from "db://assets/Scripts/chat18x/network/client/types"; import { ApiCode } from "db://assets/Scripts/chat18x/network/client/types";
import proto from 'db://assets/Scripts/proto/proto.pb.js'; import proto from "db://assets/Scripts/proto/proto.pb.js";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
@@ -50,7 +50,7 @@ export class PreloadUI extends Component {
private jinduBar: Node = null; private jinduBar: Node = null;
private jinduFilled: Sprite = null; private jinduFilled: Sprite = null;
private LabProgress: Label = null; //private LabProgress: Label = null;
private loginNode: Node = null; private loginNode: Node = null;
private btnLogin: Node = null; //登录按钮 private btnLogin: Node = null; //登录按钮
@@ -61,9 +61,7 @@ export class PreloadUI extends Component {
this.jinduFilled = this.jinduBar this.jinduFilled = this.jinduBar
.getChildByName("jinduFilled") .getChildByName("jinduFilled")
.getComponent(Sprite); .getComponent(Sprite);
this.LabProgress = this.node
.getChildByName("LabProgress")
.getComponent(Label);
this.loginNode = this.node.getChildByName("loginNode"); this.loginNode = this.node.getChildByName("loginNode");
this.btnLogin = this.loginNode.getChildByName("btnLogin"); this.btnLogin = this.loginNode.getChildByName("btnLogin");
@@ -210,7 +208,7 @@ export class PreloadUI extends Component {
// 进入登录模块 // 进入登录模块
private enterLoginModule() { private enterLoginModule() {
this.LabProgress.node.active = false; //this.LabProgress.node.active = false;
this.jinduBar.active = false; this.jinduBar.active = false;
this.loginNode.active = true; this.loginNode.active = true;
} }
@@ -259,10 +257,10 @@ export class PreloadUI extends Component {
// }) // })
// 游客登录 // 游客登录
const deviceId = DeviceIdService.I.id; const deviceId = DeviceIdService.I.id;
const os = MachineInfoService.I.getMachineOs(); const os = MachineInfoService.I.getMachineOs();
const reqData = { const reqData = {
platType: 'guset', platType: "guset",
userId: deviceId, userId: deviceId,
device: deviceId, device: deviceId,
os, os,
@@ -279,7 +277,9 @@ export class PreloadUI extends Component {
loginData.expire = Number(resData.expire); loginData.expire = Number(resData.expire);
const playerData = DataManager.I.getDataById<PlayerData>(DataId.Player); const playerData = DataManager.I.getDataById<PlayerData>(DataId.Player);
playerData.name = resData.name; playerData.name = resData.name;
const accountData = DataManager.I.getDataById<AccountData>(DataId.Account); const accountData = DataManager.I.getDataById<AccountData>(
DataId.Account
);
accountData.accId = resData.accId; accountData.accId = resData.accId;
const envData = DataManager.I.getDataById<EnvData>(DataId.Env); const envData = DataManager.I.getDataById<EnvData>(DataId.Env);
envData.cdn = resData.cdn; envData.cdn = resData.cdn;
@@ -287,14 +287,12 @@ export class PreloadUI extends Component {
this.loginFinish = true; this.loginFinish = true;
// 请求个人信息 // 请求个人信息
this.reqMyInfo(); this.reqMyInfo();
}; }
} }
// 请求个人信息 // 请求个人信息
private async reqMyInfo() { private async reqMyInfo() {
const reqData = { const reqData = {};
};
let res = await PlayerDataService.I.reqMyInfo(reqData); let res = await PlayerDataService.I.reqMyInfo(reqData);
console.log("个人信息响应数据:", res); console.log("个人信息响应数据:", res);
if (res && res.code === proto.cs.EnmRetCode.SUCCESS) { if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
@@ -310,7 +308,7 @@ export class PreloadUI extends Component {
//let islogin = HttpUnit.IsLogin(); //let islogin = HttpUnit.IsLogin();
//console.log("进入游戏,登录状态:", islogin); //console.log("进入游戏,登录状态:", islogin);
this.jinduBar.active = false; this.jinduBar.active = false;
this.LabProgress.node.active = false; //this.LabProgress.node.active = false;
//this.btnLogin.node.active = false //this.btnLogin.node.active = false
// if (islogin) { // if (islogin) {
// } else { // } else {
@@ -1,5 +1,6 @@
import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager"; import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager";
import { UITransitionHelper } from "../utils/UITransitionHelper"; import { UITransitionHelper } from "../utils/UITransitionHelper";
import GameRootUI from "../../Main/Common/GameRootUI";
/** /**
* 导航管理器 * 导航管理器
@@ -10,161 +11,175 @@ import { UITransitionHelper } from "../utils/UITransitionHelper";
* @version 1.0.0 * @version 1.0.0
*/ */
export class NavigationManager { export class NavigationManager {
private static _instance: NavigationManager; private static _instance: NavigationManager;
/** /**
* 获取NavigationManager的单例实例 * 获取NavigationManager的单例实例
* *
* @returns {NavigationManager} 导航管理器实例 * @returns {NavigationManager} 导航管理器实例
* @static * @static
*/ */
public static get Instance(): NavigationManager { public static get Instance(): NavigationManager {
if (!this._instance) { if (!this._instance) {
this._instance = new NavigationManager(); this._instance = new NavigationManager();
} }
return this._instance; return this._instance;
}
private constructor() {}
/**
* 进入角色列表页面
*
* @param {number} themeId - 主题ID,用于筛选角色
*
* @example
* ```typescript
* NavigationManager.Instance.navigateToGirlList(1);
* ```
*/
public navigateToGirlList(themeId: number): void {
if (themeId == null || themeId < 0) {
console.warn("Invalid theme ID for girl list navigation:", themeId);
return;
}
GameRootUI.I.hideDefaultView();
console.log(`Navigating to girl list with theme ID: ${themeId}`);
ViewManager.I.openBundlesView("GirlListPanel", themeId);
}
/**
* 进入聊天页面
*
* @param {number} roleId - 角色ID
*
* @example
* ```typescript
* NavigationManager.Instance.navigateToChat(10001);
* ```
*/
public navigateToChat(roleId: number): void {
if (roleId == null || roleId <= 0) {
console.warn("Invalid role ID for chat navigation:", roleId);
return;
}
GameRootUI.I.hideDefaultView();
console.log(`Navigating to chat with role ID: ${roleId}`);
ViewManager.I.openBundlesView("ChatPanel", roleId);
}
/**
* 带过渡动画进入聊天页面
* 从GirlDetailPanel平滑过渡到ChatPanel
*
* @param {number} roleId - 角色ID
* @param {any} currentPanel - 当前面板实例(GirlDetailPanel
*
* @example
* ```typescript
* NavigationManager.Instance.navigateToChatWithTransition(10001, this);
* ```
*/
public navigateToChatWithTransition(
roleId: number,
currentPanel?: any
): void {
if (roleId == null || roleId <= 0) {
console.warn(
"Invalid role ID for chat navigation with transition:",
roleId
);
return;
} }
private constructor() {} console.log(`Navigating to chat with transition, role ID: ${roleId}`);
/** // 打开ChatPanel,同时标记需要执行滑入动画
* 进入角色列表页面 ViewManager.I.openBundlesView(
* "ChatPanel",
* @param {number} themeId - 主题ID,用于筛选角色 {
* roleId: roleId,
* @example withSlideTransition: true,
* ```typescript },
* NavigationManager.Instance.navigateToGirlList(1); (chatNode) => {
* ``` // ChatPanel打开后,如果有当前面板,执行滑出动画
*/ if (currentPanel && currentPanel.node && currentPanel.node.isValid) {
public navigateToGirlList(themeId: number): void { UITransitionHelper.slideOutToLeft(currentPanel.node, 0.3, () => {
if (themeId == null || themeId < 0) { // 滑出动画完成后关闭原面板
console.warn("Invalid theme ID for girl list navigation:", themeId); if (
return; currentPanel.onClose &&
} typeof currentPanel.onClose === "function"
) {
console.log(`Navigating to girl list with theme ID: ${themeId}`); currentPanel.onClose();
ViewManager.I.openBundlesView("GirlListPanel", themeId);
}
/**
* 进入聊天页面
*
* @param {number} roleId - 角色ID
*
* @example
* ```typescript
* NavigationManager.Instance.navigateToChat(10001);
* ```
*/
public navigateToChat(roleId: number): void {
if (roleId == null || roleId <= 0) {
console.warn("Invalid role ID for chat navigation:", roleId);
return;
}
console.log(`Navigating to chat with role ID: ${roleId}`);
ViewManager.I.openBundlesView("ChatPanel", roleId);
}
/**
* 带过渡动画进入聊天页面
* 从GirlDetailPanel平滑过渡到ChatPanel
*
* @param {number} roleId - 角色ID
* @param {any} currentPanel - 当前面板实例(GirlDetailPanel
*
* @example
* ```typescript
* NavigationManager.Instance.navigateToChatWithTransition(10001, this);
* ```
*/
public navigateToChatWithTransition(roleId: number, currentPanel?: any): void {
if (roleId == null || roleId <= 0) {
console.warn("Invalid role ID for chat navigation with transition:", roleId);
return;
}
console.log(`Navigating to chat with transition, role ID: ${roleId}`);
// 打开ChatPanel,同时标记需要执行滑入动画
ViewManager.I.openBundlesView("ChatPanel", {
roleId: roleId,
withSlideTransition: true
}, (chatNode) => {
// ChatPanel打开后,如果有当前面板,执行滑出动画
if (currentPanel && currentPanel.node && currentPanel.node.isValid) {
UITransitionHelper.slideOutToLeft(currentPanel.node, 0.3, () => {
// 滑出动画完成后关闭原面板
if (currentPanel.onClose && typeof currentPanel.onClose === 'function') {
currentPanel.onClose();
}
});
} }
}); });
}
/**
* 进入角色详情页面
*
* @param {number} roleId - 角色ID
*
* @example
* ```typescript
* NavigationManager.Instance.navigateToGirlDetail(10001);
* ```
*/
public navigateToGirlDetail(roleId: number): void {
if (roleId == null || roleId <= 0) {
console.warn("Invalid role ID for detail navigation:", roleId);
return;
} }
}
);
}
console.log(`Navigating to girl detail with role ID: ${roleId}`); /**
ViewManager.I.openBundlesView("GirlDetailPanel", roleId); * 进入角色详情页面
*
* @param {number} roleId - 角色ID
*
* @example
* ```typescript
* NavigationManager.Instance.navigateToGirlDetail(10001);
* ```
*/
public navigateToGirlDetail(roleId: number): void {
if (roleId == null || roleId <= 0) {
console.warn("Invalid role ID for detail navigation:", roleId);
return;
} }
/** console.log(`Navigating to girl detail with role ID: ${roleId}`);
* 返回主界面 ViewManager.I.openBundlesView("GirlDetailPanel", roleId);
* }
* @example
* ```typescript
* NavigationManager.Instance.navigateToMainMenu();
* ```
*/
public navigateToMainMenu(): void {
console.log("Navigating to main menu");
// TODO: 实现返回主界面的逻辑
// ViewManager.I.openBundlesView("MainMenu");
}
/** /**
* 检查是否可以导航到指定页 * 返回主界
* *
* @param {string} pageName - 页面名称 * @example
* @returns {boolean} 是否可以导航 * ```typescript
*/ * NavigationManager.Instance.navigateToMainMenu();
public canNavigateTo(pageName: string): boolean { * ```
const allowedPages = ["GirlListPanel", "ChatPanel", "GirlDetailPanel"]; */
return allowedPages.indexOf(pageName)>=0; public navigateToMainMenu(): void {
} console.log("Navigating to main menu");
// TODO: 实现返回主界面的逻辑
// ViewManager.I.openBundlesView("MainMenu");
}
/** /**
* 获取当前页面的导航历史(预留功能) * 检查是否可以导航到指定页面
* *
* @returns {string[]} 导航历史数组 * @param {string} pageName - 页面名称
*/ * @returns {boolean} 是否可以导航
public getNavigationHistory(): string[] { */
// TODO: 实现导航历史记录功能 public canNavigateTo(pageName: string): boolean {
console.log("Navigation history feature not implemented yet"); const allowedPages = ["GirlListPanel", "ChatPanel", "GirlDetailPanel"];
return []; return allowedPages.indexOf(pageName) >= 0;
} }
/** /**
* 返回上一页(预留功能) * 获取当前页面的导航历史(预留功能)
*/ *
public goBack(): void { * @returns {string[]} 导航历史数组
// TODO: 实现返回上一页功能 */
console.log("Go back feature not implemented yet"); public getNavigationHistory(): string[] {
} // TODO: 实现导航历史记录功能
console.log("Navigation history feature not implemented yet");
return [];
}
/**
* 返回上一页(预留功能)
*/
public goBack(): void {
// TODO: 实现返回上一页功能
console.log("Go back feature not implemented yet");
}
} }
@@ -19,8 +19,8 @@ export class SimpleToggle extends Component {
} }
init(isSelected: boolean, callBack: () => {}) { init(isSelected: boolean, callBack: () => {}) {
this.selectedSprite.enabled = isSelected; this.selectedSprite.node.active = isSelected;
this.unSelectedSprite.enabled = !isSelected; this.unSelectedSprite.node.active = !isSelected;
if (this.callback) { if (this.callback) {
this.onDestroy(); this.onDestroy();
} }
@@ -30,8 +30,8 @@ export class SimpleToggle extends Component {
} }
refresh(isSelected: boolean) { refresh(isSelected: boolean) {
this.selectedSprite.enabled = isSelected; this.selectedSprite.node.active = isSelected;
this.unSelectedSprite.enabled = !isSelected; this.unSelectedSprite.node.active = !isSelected;
} }
onClickThis() { onClickThis() {
@@ -6,9 +6,6 @@ const { ccclass, property } = _decorator;
export class SimpleToggleGroup extends Component { export class SimpleToggleGroup extends Component {
toggles: SimpleToggle[]; toggles: SimpleToggle[];
@property(Node)
slider: Node;
protected onLoad(): void { protected onLoad(): void {
this.toggles = this.getComponentsInChildren(SimpleToggle); this.toggles = this.getComponentsInChildren(SimpleToggle);
@@ -19,12 +16,6 @@ export class SimpleToggleGroup extends Component {
} }
toggleSelected(selectedNode: Node) { toggleSelected(selectedNode: Node) {
const pos = this.slider.getPosition();
const targetPos = new Vec3(selectedNode.getPosition().x, pos.y, pos.z);
tween(this.slider)
.to(0.3, { position: targetPos }, { easing: "sineInOut" })
.start();
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];
if (element.node === selectedNode) { if (element.node === selectedNode) {
@@ -402,7 +402,6 @@ export class ChatPanel extends li_BaseView implements IChatPanelCallback {
protected onEnable(): void { protected onEnable(): void {
if (!this.manager) this.manager = DialogManager.getInstance(); if (!this.manager) this.manager = DialogManager.getInstance();
GameRootUI.I.hideDefaultView();
} }
public async OnClickSend() { public async OnClickSend() {
@@ -7,7 +7,8 @@ import { ConfigManager } from "../../manager/ConfigManager";
import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService"; import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService";
import { DataManager, DataId } from "../../data/DataManager"; import { DataManager, DataId } from "../../data/DataManager";
import { GirlData } from "../../data/GirlData"; import { GirlData } from "../../data/GirlData";
import proto from 'db://assets/Scripts/proto/proto.pb.js'; import proto from "db://assets/Scripts/proto/proto.pb.js";
import GameRootUI from "../../../Main/Common/GameRootUI";
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
@@ -69,5 +70,6 @@ export class GirlListPanel extends li_BaseView {
} }
Return() { Return() {
this.onClose(); this.onClose();
GameRootUI.I.showDefaultView();
} }
} }
@@ -1,10 +1,18 @@
import { _decorator, Component, math, Node, Sprite, UITransform } from "cc"; import {
_decorator,
Component,
Label,
math,
Node,
Sprite,
UITransform,
} from "cc";
import { Config18x } from "db://assets/Scripts/Main/Config/Config18x"; import { Config18x } from "db://assets/Scripts/Main/Config/Config18x";
import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager";
import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager"; import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager";
import { GButton } from "db://assets/Scripts/Main/Common/GButton"; import { GButton } from "db://assets/Scripts/Main/Common/GButton";
import { GirlDetailPanel } from "../ui/panels/GirlDetailPanel"; import { GirlDetailPanel } from "../ui/panels/GirlDetailPanel";
import proto from 'db://assets/Scripts/proto/proto.pb.js'; import proto from "db://assets/Scripts/proto/proto.pb.js";
import { DataManager, DataId } from "../data/DataManager"; import { DataManager, DataId } from "../data/DataManager";
import { GirlData } from "../data/GirlData"; import { GirlData } from "../data/GirlData";
@@ -15,19 +23,26 @@ export class DetailImageItem extends Component {
@property(Sprite) @property(Sprite)
img: Sprite; img: Sprite;
@property(Node)
lock: Node;
@property(Node) @property(Node)
question: Node; question: Node;
@property(Sprite)
video: Sprite;
@property(Node)
priceFrame: Node;
@property(Label)
videoPrice: Label;
base: GirlDetailPanel; base: GirlDetailPanel;
url: string; url: string;
isImage: boolean; isImage: boolean;
uitransform: UITransform; uitransform: UITransform;
category: number; category: number;
id: number;
girlId: number;
resId: number; resId: number;
type : number; type: number;
onLoad() { onLoad() {
GButton.BandClick(this.node, this.onClickThis, this); GButton.BandClick(this.node, this.onClickThis, this);
@@ -58,7 +73,8 @@ export class DetailImageItem extends Component {
doScaleToFill() { doScaleToFill() {
if (!this.img || !this.img.spriteFrame) return; if (!this.img || !this.img.spriteFrame) return;
if (!this.uitransform)
this.uitransform = this.node.getComponent(UITransform);
const itemSize = this.uitransform.contentSize; const itemSize = this.uitransform.contentSize;
const imageSize = this.img.spriteFrame.originalSize; const imageSize = this.img.spriteFrame.originalSize;
@@ -97,28 +113,51 @@ export class DetailImageItem extends Component {
this.base = base; this.base = base;
this.type = type; this.type = type;
this.category = category; this.category = category;
this.id = id; this.girlId = id;
this.resId = resId; this.resId = resId;
this.lock.active = false;
this.question.active = true; // 显示问号,表示加载中 this.question.active = true; // 显示问号,表示加载中
const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl); const girlData = DataManager.I.getDataById<GirlData>(DataId.Girl);
let imgPath = ""; let imgPath = "";
this.video.enabled = type === 2;
this.priceFrame.active = type === 2;
if (type === 1) { if (type === 1) {
// 图片 // 图片
this.url = girlData.getGrilPhotoPic(this.category.toString(), this.id, this.resId); this.url = girlData.getGrilPhotoPic(
this.category.toString(),
this.girlId,
this.resId
);
imgPath = this.url; imgPath = this.url;
this.isImage = true; this.isImage = true;
} else if (type === 2) { } else if (type === 2) {
// 视频 // 视频
this.isImage = false; this.isImage = false;
this.url = girlData.getGrilVideoPath(this.category.toString(), this.id, this.resId); this.url = girlData.getGrilVideoPath(
let videoPrice = girlData.getGrilVideoPrice(this.category.toString(), this.id, this.resId); this.category.toString(),
this.girlId,
this.resId
);
let videoPrice = girlData.getGrilVideoPrice(
this.category.toString(),
this.girlId,
this.resId
);
this.url = girlData.getGrilVideoPath(
this.category.toString(),
this.girlId,
this.resId
);
if (videoPrice > 0) { if (videoPrice > 0) {
imgPath = this.url + "_thumbnail_blur"; imgPath = this.url + "_thumbnail_blur";
} else { } else {
imgPath = this.url + "_thumbnail"; imgPath = this.url + "_thumbnail";
} }
this.priceFrame.active = videoPrice > 0;
this.videoPrice.string = videoPrice.toString();
} }
ResManager.I.changeBundleSpriteFrame(this.img, imgPath, "Chat18x", () => { ResManager.I.changeBundleSpriteFrame(this.img, imgPath, "Chat18x", () => {
+44 -10
View File
@@ -1,4 +1,13 @@
import { _decorator, Component, Label, Node, Sprite, UITransform } from "cc"; import {
_decorator,
AssetManager,
Component,
Label,
Node,
randomRangeInt,
Sprite,
UITransform,
} from "cc";
import { Config18x } from "db://assets/Scripts/Main/Config/Config18x"; import { Config18x } from "db://assets/Scripts/Main/Config/Config18x";
import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager"; import { ViewManager } from "db://assets/Scripts/Main/Manager/ViewManager";
import ResManager from "db://assets/Scripts/Main/Manager/ResManager"; import ResManager from "db://assets/Scripts/Main/Manager/ResManager";
@@ -24,13 +33,15 @@ export class GirlListItem extends Component {
price: Label; price: Label;
@property(Node) @property(Node)
freeNode: Node; freeNode: Node;
@property(Node) @property(Node)
tryNode: Node; chatIcon: Node;
@property(Node)
chatBtn: Node;
@property(Node) @property(Node)
starParent: Node; starParent: Node;
stars: Sprite[];
id: number = -1; id: number = -1;
nameKey: string; nameKey: string;
@@ -68,6 +79,10 @@ export class GirlListItem extends Component {
baseNode: Node; baseNode: Node;
refreshData(category: number, girlId: number, baseNode: Node) { refreshData(category: number, girlId: number, baseNode: Node) {
if (!this.stars) {
this.stars = this.starParent.getComponentsInChildren(Sprite);
}
this.category = category; this.category = category;
this.baseNode = baseNode; this.baseNode = baseNode;
this.id = girlId; this.id = girlId;
@@ -83,11 +98,17 @@ export class GirlListItem extends Component {
desc += tags[i]; desc += tags[i];
} }
this.tags.string = desc; this.tags.string = desc;
let priceType = girlData.getGrilPriceType(this.category.toString(), this.id); let priceType = girlData.getGrilPriceType(
this.category.toString(),
this.id
);
this.price.node.active = priceType == PriceType.pay; this.price.node.active = priceType == PriceType.pay;
this.freeNode.active = priceType == PriceType.free; this.freeNode.active = priceType == PriceType.free;
this.tryNode.active = priceType == PriceType.first_time_free; //this.tryNode.active = priceType == PriceType.first_time_free;
let listAvatarPath = girlData.getGrilListAvatar(this.category.toString(), this.id); let listAvatarPath = girlData.getGrilListAvatar(
this.category.toString(),
this.id
);
ResManager.I.changeBundleSpriteFrame( ResManager.I.changeBundleSpriteFrame(
this.avatar, this.avatar,
listAvatarPath, listAvatarPath,
@@ -102,9 +123,22 @@ export class GirlListItem extends Component {
} }
); );
// for (let i = 0; i < 5; i++) { //虚假好感度
// this.starParent.children[i].active = i < data.; const ratio = randomRangeInt(0, 5);
// } this.starParent.active = ratio != 0;
this.chatIcon.active = ratio != 0;
this.price.node.active = ratio == 0;
for (let i = 0; i < this.stars.length; i++) {
const element = this.stars[i];
if (ratio > i) {
ResManager.I.changeResourceSpriteFrame(element, "ui/common/heart");
} else {
ResManager.I.changeResourceSpriteFrame(
element,
"ui/common/heart_empty"
);
}
}
} }
onClickDetail() { onClickDetail() {
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More