Commit Graph

145 Commits (d40bee792ef6ab4d39d442a65af9f28c2900a607)

Author SHA1 Message Date
1076390229 3cff3b0992 麻将重构 2025-08-19 22:17:52 +08:00
1076390229 9749cd2db2 消息记录 2025-08-13 16:55:18 +08:00
1076390229 f30c5ec59e 家族微调 2025-08-06 21:26:29 +08:00
1076390229 3ddb4d8740 打烊调整 2025-08-06 20:47:42 +08:00
1076390229 a1715131be 家族界面生命周期管理 2025-08-06 18:34:58 +08:00
1076390229 3e1932b63a 未跟踪文件 2025-08-05 21:25:59 +08:00
1076390229 d7e766509b 边框、成员排序、亲友圈标题 2025-08-05 21:00:17 +08:00
1076390229 e57ed8a8d2 各种调整 2025-08-05 20:29:11 +08:00
1076390229 82bf2e5950 成员列表长度 2025-08-04 22:05:20 +08:00
罗家炜 ff0248dca8 Family_fui.bytes冲突,直接发布并提交 2025-08-04 21:50:25 +08:00
罗家炜 c0b1e9335a 查看成员修改颜色和大小 2025-08-04 21:47:53 +08:00
1076390229 bba4495727 打烊适配 2025-08-04 21:44:15 +08:00
1076390229 170e97b473 房间刷新修复 2025-08-04 21:20:23 +08:00
1076390229 c8c4adce64 拆开查看成员 2025-08-04 19:52:20 +08:00
1076390229 8f1ce9aca4 申请信息红点 2025-07-30 18:35:43 +08:00
1076390229 2de9d303cc getData改int 2025-07-29 20:11:16 +08:00
1076390229 0223cb5064 未跟踪文件 2025-07-29 00:11:46 +08:00
1076390229 c0e4f8ce94 申请消息整理 2025-07-28 21:44:23 +08:00
1076390229 9a1c182fec 聊天室红点 2025-07-28 20:42:56 +08:00
DESKTOP-7R8JEQQ\k 31f8424637 改了一大推 2025-07-27 00:05:46 +08:00
DESKTOP-7R8JEQQ\k 6162928d34 设置界面 2025-07-25 22:17:17 +08:00
DESKTOP-7R8JEQQ\k 81e28ee578 协议提交 2025-07-24 17:04:53 +08:00
DESKTOP-7R8JEQQ\k 1a51444774 成员备注修复、家族界面连接流程整理、倍数二级界面 2025-07-24 15:54:47 +08:00
DESKTOP-7R8JEQQ\k bb3ae96be5 倍数补充、6字省略补充 2025-07-23 15:40:53 +08:00
DESKTOP-7R8JEQQ\k c901948e97 6字省略 2025-07-22 20:00:07 +08:00
DESKTOP-7R8JEQQ\k 9fc9ba2315 退出房间 2025-07-21 21:44:50 +08:00
DESKTOP-7R8JEQQ\k 4c950a0d25 游戏按钮位置调整,添加玩法修复 2025-07-20 00:24:30 +08:00
DESKTOP-7R8JEQQ\k 0c75adcb2f 心跳 2025-07-19 16:32:03 +08:00
DESKTOP-7R8JEQQ\k ae902d0c42 设置界面 2025-07-10 01:52:55 +08:00
DESKTOP-7R8JEQQ\k 5c6f18656f 麻将布局,家族在线协议 2025-07-09 23:48:28 +08:00
DESKTOP-7R8JEQQ\k 121e8a3716 换游戏底图 2025-07-09 21:32:02 +08:00
DESKTOP-7R8JEQQ\k c3fea3ad73 充值家族房卡协议 2025-07-08 20:29:50 +08:00
DESKTOP-7R8JEQQ\k a62cfb045b 房间列表超出 2025-07-08 18:05:07 +08:00
DESKTOP-7R8JEQQ\k 2419bdc9b6 退出家族提示、申请适配 2025-07-08 18:01:27 +08:00
DESKTOP-7R8JEQQ\k be20b7261e title文字阴影 2025-07-08 16:37:03 +08:00
DESKTOP-7R8JEQQ\k c4afbc83ef 家族title位置 2025-07-08 16:33:30 +08:00
DESKTOP-7R8JEQQ\k 37613959f4 删除debug文本 2025-07-08 16:30:25 +08:00
DESKTOP-7R8JEQQ\k 0fe11afd84 成员记录适配 2025-07-08 16:28:40 +08:00
DESKTOP-7R8JEQQ\k d0e04026ea 玩法文本长度 2025-07-08 16:14:21 +08:00
DESKTOP-7R8JEQQ\k ff247d8de3 按钮对齐 2025-07-08 16:11:14 +08:00
DESKTOP-7R8JEQQ\k 08ec95efc0 适配 2025-07-08 14:50:36 +08:00
DESKTOP-7R8JEQQ\k e716914a0c 适配 2025-07-07 20:31:46 +08:00
DESKTOP-7R8JEQQ\k d8beada063 聊天室协议 2025-07-07 19:49:16 +08:00
DESKTOP-7R8JEQQ\k 1c566ac71a 加入修复 2025-07-07 17:42:23 +08:00
DESKTOP-7R8JEQQ\k 5e470d57ee 聊天室协议 2025-07-05 21:36:09 +08:00
DESKTOP-7R8JEQQ\k 78057035d4 适配 2025-07-05 18:06:16 +08:00
罗家炜 c1c3d3ca76 推送没有推送结果 2025-07-05 17:07:20 +08:00
罗家炜 64746b5a6e 忽略。bytes文件冲突 2025-07-04 23:47:14 +08:00
罗家炜 e3b7a3b0aa 提交一些小修改 2025-07-04 23:46:31 +08:00
DESKTOP-7R8JEQQ\k 30fb05be36 界面修复 2025-07-04 21:33:06 +08:00
罗家炜 9bdb8aa28b 成员状态刷新 2025-07-04 21:16:14 +08:00
DESKTOP-7R8JEQQ\k 3b4471f2b8 合并 2025-07-04 20:39:41 +08:00
DESKTOP-7R8JEQQ\k 7e73151fd8 Merge branch 'master' into lps/fonts.2025.7.4
# Conflicts:
#	wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
#	wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png
#	wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png
#	wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png
#	wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png
#	wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png
#	wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png
#	wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png
#	wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
2025-07-04 02:12:45 +08:00
DESKTOP-7R8JEQQ\k d37167d945 字体 2025-07-04 02:11:59 +08:00
罗家炜 4bf314879d 玩法管理修改 2025-07-04 02:06:24 +08:00
DESKTOP-7R8JEQQ\k f2bfeb2323 Merge branch 'master' into lps/emoji
# Conflicts:
#	wb_new_ui/assets/Family/Main.xml
#	wb_new_ui/assets/Family/Main/Component/c_familyMember.xml
#	wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
2025-07-04 01:00:14 +08:00
DESKTOP-7R8JEQQ\k 19b6a21208 emoji 2025-07-04 00:27:03 +08:00
罗家炜 89c6b76f59 麻将换牌 2025-07-03 19:42:13 +08:00
DESKTOP-7R8JEQQ\k 8a076a8993 字体 2025-07-03 00:05:09 +08:00
罗家炜 cdef6dcb91 解决冲突 2025-07-02 20:22:26 +08:00
DESKTOP-7R8JEQQ\k 573edc0de6 界面修改 2025-07-02 20:13:34 +08:00
DESKTOP-7R8JEQQ\k c20f0a127a 界面修改,聊天室协议 2025-07-02 17:19:20 +08:00
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