xionglijia/18xchat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
chen wei bo
2025-09-25 11:33:48 +08:00
parent ce13387864 9850d59522
commit c09988ccc4
8 changed files with 780 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/Scripts/Main/Config/CommonConfig.ts
+3 -2
View File
@@ -41,8 +41,9 @@ export namespace CommonConfig {
Layer_ui2 = 2,
Layer_dialog = 3,
Layer_tips = 4,
Layer_top = 5,
Layer_navigationbar = 6,
Layer_navigationbar = 5,
Layer_top = 6,
}
}
assets/Scripts/Main/Manager/ViewManager.ts
+1 -1
View File
@@ -227,7 +227,7 @@ export class ViewManager extends Component {
i_openData,
callBack,
i_prefab,
"tips"
"top"
);
} else {
logger.log("打开界面：", i_prefab);
assets/bundles/Chat18x/GirlListPopupPanel-Fix.prefab
+22 -19
View File
@@ -920,7 +920,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 81.5,
"y": 23.375999999999976,
"z": 0
},
"_lrot": {
@@ -1013,8 +1013,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 865,
"height": 1116
"width": 865.0920000000001,
"height": 616.6315682281061
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -1041,8 +1041,8 @@
},
"_alignFlags": 42,
"_target": null,
"_left": 0,
"_right": 0,
"_left": -0.023000000000045873,
"_right": -0.022999999999946397,
"_top": 508,
"_bottom": 508,
"_horizontalCenter": 0,
@@ -1085,7 +1085,10 @@
"b": 255,
"a": 255
},
"_spriteFrame": null,
"_spriteFrame": {
"__uuid__": "777fc276-1999-4eba-a9a4-9bcfb84cbd72@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 0,
@@ -1132,8 +1135,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 865,
"height": 1116
"width": 865.046,
"height": 616.631568
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -1162,7 +1165,7 @@
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_top": 307.808216,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
@@ -3275,7 +3278,7 @@
"__id__": 34
},
"_children": [],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 138
@@ -3295,8 +3298,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 342.19899999999996,
"y": 551.768,
"x": 372.25199999999995,
"y": 268.53600000000006,
"z": 0
},
"_lrot": {
@@ -3358,7 +3361,7 @@
"node": {
"__id__": 137
},
"_enabled": false,
"_enabled": true,
"__prefab": {
"__id__": 141
},
@@ -3367,9 +3370,9 @@
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"r": 214,
"g": 214,
"b": 214,
"a": 255
},
"_spriteFrame": {
@@ -3408,7 +3411,7 @@
"__id__": 143
},
"clickEvents": [],
"_interactable": false,
"_interactable": true,
"_transition": 1,
"_normalColor": {
"__type__": "cc.Color",
@@ -3480,8 +3483,8 @@
"_alignFlags": 33,
"_target": null,
"_left": 0,
"_right": 62.301000000000045,
"_top": 59.73199999999997,
"_right": 32.24800000000005,
"_top": 342.96399999999994,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
assets/bundles/Chat18x/GirlListPopupPanel-Fix.prefab.meta
+1 -1
View File
@@ -2,7 +2,7 @@
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "afacd1df-6501-429b-9ea5-78e88900e6fa",
"uuid": "b74d98b5-cded-438b-aa35-efecb6e3d293",
"files": [
".json"
],
assets/bundles/Chat18x/GirlListPopupPanel.prefab
+16 -13
View File
@@ -920,7 +920,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 81.5,
"y": 23.375999999999976,
"z": 0
},
"_lrot": {
@@ -1013,8 +1013,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 865,
"height": 1116
"width": 865.0920000000001,
"height": 616.6315682281061
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -1041,8 +1041,8 @@
},
"_alignFlags": 42,
"_target": null,
"_left": 0,
"_right": 0,
"_left": -0.023000000000045873,
"_right": -0.022999999999946397,
"_top": 508,
"_bottom": 508,
"_horizontalCenter": 0,
@@ -1085,7 +1085,10 @@
"b": 255,
"a": 255
},
"_spriteFrame": null,
"_spriteFrame": {
"__uuid__": "777fc276-1999-4eba-a9a4-9bcfb84cbd72@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 0,
@@ -1132,8 +1135,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 865,
"height": 1116
"width": 865.046,
"height": 616.631568
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -1162,7 +1165,7 @@
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_top": 307.808216,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
@@ -3295,8 +3298,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 342.19899999999996,
"y": 551.768,
"x": 372.25199999999995,
"y": 268.53600000000006,
"z": 0
},
"_lrot": {
@@ -3480,8 +3483,8 @@
"_alignFlags": 33,
"_target": null,
"_left": 0,
"_right": 62.301000000000045,
"_top": 59.73199999999997,
"_right": 32.24800000000005,
"_top": 342.96399999999994,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
assets/bundles/Chat18x/Web3PopPanel.prefab
+716 -517
View File
File diff suppressed because it is too large Load Diff
assets/resources/test/10001_avatar.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 277 KiB

After

Width:  |  Height:  |  Size: 269 KiB

assets/resources/test/10001_avatar.png.meta
+21 -21
View File
@@ -46,10 +46,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 442,
"height": 442,
"rawWidth": 442,
"rawHeight": 442,
"width": 491,
"height": 350,
"rawWidth": 491,
"rawHeight": 350,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -61,17 +61,17 @@
"meshType": 0,
"vertices": {
"rawPosition": [
-221,
-221,
-245.5,
-175,
0,
221,
-221,
245.5,
-175,
0,
-221,
221,
-245.5,
175,
0,
221,
221,
245.5,
175,
0
],
"indexes": [
@@ -84,12 +84,12 @@
],
"uv": [
0,
442,
442,
442,
350,
491,
350,
0,
0,
442,
491,
0
],
"nuv": [
@@ -103,13 +103,13 @@
1
],
"minPos": [
-221,
-221,
-245.5,
-175,
0
],
"maxPos": [
221,
221,
245.5,
175,
0
]
},
@@ -127,7 +127,7 @@
},
"userData": {
"type": "sprite-frame",
"hasAlpha": false,
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "777fc276-1999-4eba-a9a4-9bcfb84cbd72@6c48a"
}