Commit Graph

33 Commits (8bc488315be2491595eac7151a4e6c08e740b1c6)

Author SHA1 Message Date
DESKTOP-7R8JEQQ\k 105d254992 界面修改调整、打开关闭聊天室协议 2025-07-01 19:31:19 +08:00
DESKTOP-7R8JEQQ\k 0fe9c27acb 添加字体、解放房间修复、布局调整 2025-06-30 17:48:47 +08:00
罗家炜 0fd486fe13 同步上传 2025-06-26 16:28:49 +08:00
罗家炜 8fe5500ebc 强制打开观战 2025-06-26 02:28:24 +08:00
罗家炜 0686db8061 fariygui冲突 2025-06-26 00:52:49 +08:00
罗家炜 e480064fa2 合并冲突 2025-06-26 00:15:48 +08:00
罗家炜 a7a53c2057 暴力合并other2 2025-06-25 22:49:44 +08:00
DESKTOP-7R8JEQQ\k f4cd51a641 同桌优化、创建亲友圈修复、添加多个字段 2025-06-25 22:21:05 +08:00
DESKTOP-7R8JEQQ\k 9a36d4145a Merge branch 'master' into lps/family5-M
# Conflicts:
#	wb_new_ui/assets/Family/package.xml
#	wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png
#	wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png
#	wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
2025-06-24 22:05:18 +08:00
DESKTOP-7R8JEQQ\k 9cc8e006a4 禁止同桌协议调通,聊天室开始联调 2025-06-24 21:50:51 +08:00
罗家炜 a378cf8097 战绩记录,成员战绩 2025-06-24 21:48:34 +08:00
DESKTOP-7R8JEQQ\k 530a2171b4 同桌协议调试 2025-06-24 14:54:19 +08:00
DESKTOP-7R8JEQQ\k b15898f73e 显示隐藏成员 2025-06-23 18:12:12 +08:00
DESKTOP-7R8JEQQ\k 21a357a986 房卡记录 2025-06-21 12:15:04 +08:00
罗家炜 fdef007d61 新合并冲突 2025-06-20 19:40:01 +08:00
罗家炜 98f1cc124a 合并冲突 2025-06-20 17:29:47 +08:00
罗家炜 a8122f41f6 修复成员战绩,显示记录 2025-06-20 17:25:43 +08:00
DESKTOP-7R8JEQQ\k fa6b4bed7b familyUI-备注、我的亲友圈 2025-06-20 01:55:55 +08:00
DESKTOP-7R8JEQQ\k 53c1f4be2e 修改公告 2025-06-19 18:17:02 +08:00
罗家炜 92d6f22322 解决冲突 2025-06-19 14:40:41 +08:00
罗家炜 a4af1515a0 排行榜完成 2025-06-19 14:38:23 +08:00
DESKTOP-7R8JEQQ\k 9ea9f829c9 我的家族 2025-06-19 14:29:16 +08:00
罗家炜 a2965576d3 合并赖修改 2025-06-18 14:56:16 +08:00
DESKTOP-7R8JEQQ\k 91c3404521 familyUI 2025-06-18 14:48:00 +08:00
DESKTOP-7R8JEQQ\k a222dcec15 家族战绩 2025-06-17 21:49:48 +08:00
FPGA a58f4ec1bb voice 2025-06-17 20:26:53 +08:00
DESKTOP-7R8JEQQ\k 76230794f1 familyUI 2025-06-17 17:51:24 +08:00
DESKTOP-7R8JEQQ\k 37667ea753 亲友圈ui 2025-06-17 15:29:16 +08:00
DESKTOP-7R8JEQQ\k 9306f75e6c 页面上传 2025-06-14 17:49:51 +08:00
罗家炜 6e7ebe64a6 同步观战 2025-06-10 16:11:48 +08:00
罗家炜 bb2028fa24 旁观按钮 2025-06-09 16:30:22 +08:00
罗家炜 952d30caf4 同步最新代码 2025-05-30 13:35:36 +08:00
罗家炜 6867fff9c4 同步gui目录 2025-05-22 15:08:28 +08:00