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

Browse Source

# Conflicts:
#	assets/Scripts/Sub/UI/PreloadUI.ts
#	assets/Scripts/chat18x/ui/panels/GirlDetailPanel.ts
#	assets/Scripts/chat18x/uiitems/DetailImageItem.ts

...

This commit is contained in:

xionglijia

2025-09-09 14:50:51 +08:00

parent da8ddc0716 54321458eb

commit 9077a19975

70 changed files with 15763 additions and 6106 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

assets/bundles/Chat18x/GirlDetailPanel.prefab

+1847 -1839

File diff suppressed because it is too large Load Diff