Commit Graph

224 Commits (5f4b6bd1601476ddb11eb72095e1ccc084bd7cd1)

Author SHA1 Message Date
DESKTOP-7R8JEQQ\k 5f4b6bd160 临时提交,心跳 2025-07-18 16:02:20 +08:00
DESKTOP-7R8JEQQ\k e4b616bb5b 邀请提交 2025-07-17 15:02:14 +08:00
DESKTOP-7R8JEQQ\k 2a3bea4ae1 换牌 2025-07-16 15:07:29 +08:00
DESKTOP-7R8JEQQ\k 80c0d02632 杠加分 2025-07-11 21:37:35 +08:00
DESKTOP-7R8JEQQ\k 9bfe386b48 用户小界面 2025-07-11 17:17:16 +08:00
DESKTOP-7R8JEQQ\k fd5b374479 在线离线联调 2025-07-11 16:05:11 +08:00
DESKTOP-7R8JEQQ\k 15b1b53e3b 退出房间、申请加入 2025-07-10 03:14:40 +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 b061321f56 头像边框 2025-07-08 15:34:01 +08:00
DESKTOP-7R8JEQQ\k c6b78511fd main头像剧中 2025-07-08 15:18:06 +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
罗家炜 e3b7a3b0aa 提交一些小修改 2025-07-04 23:46:31 +08:00
罗家炜 9bdb8aa28b 成员状态刷新 2025-07-04 21:16:14 +08:00
罗家炜 ccbc9cf5d5 .bytes文件冲突,不处理 2025-07-04 20:42:46 +08:00
罗家炜 15a0592dae 被提示需要提交版本 2025-07-04 20:41:52 +08:00
DESKTOP-7R8JEQQ\k 3b4471f2b8 合并 2025-07-04 20:39:41 +08:00
DESKTOP-7R8JEQQ\k 575c61a4f9 Merge branch 'master' into lps/chatroom.2025.7.4
# Conflicts:
#	wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes
#	wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes
#	wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes
#	wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes
#	wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes
#	wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes
#	wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes
2025-07-04 19:46:47 +08:00
DESKTOP-7R8JEQQ\k a5c1b71989 no message 2025-07-04 19:46:28 +08:00
罗家炜 d87181cda1 全都bytes忽略 2025-07-04 19:38:38 +08:00
罗家炜 1b6415ca59 编辑玩法换图和修复bug 2025-07-04 19:36:00 +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 b1bb0a865f Merge branch 'master' into lps/fonts.2025.7.3
# Conflicts:
#	wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
2025-07-03 00:05:32 +08:00
DESKTOP-7R8JEQQ\k 8a076a8993 字体 2025-07-03 00:05:09 +08:00
罗家炜 e1cfb6650e 提交三四人麻将同步二人功能 2025-07-02 21:17:14 +08:00
罗家炜 4a6c3b3b07 解决冲突 2025-07-02 20:38:42 +08:00
罗家炜 b3db28766b 游戏背景 2025-07-02 20:37:27 +08:00
DESKTOP-7R8JEQQ\k a8a58ddb01 Merge branch 'master' into lps/fixBug.2025.7.2 2025-07-02 20:32:31 +08:00
DESKTOP-7R8JEQQ\k 32cc672870 麻将适配 2025-07-02 20:30:58 +08:00