Commit Graph

79 Commits (master)

Author SHA1 Message Date
罗家炜 1813727234 8.23提交 2025-08-23 22:23:17 +08:00
罗家炜 94b7b5e517 gps房创建拦截 2025-08-23 17:00:09 +08:00
罗家炜 7e9802346c 回退到 0b644ea8 的代码 2025-08-23 16:07:53 +08:00
niko 963b9e158e 合并 2025-08-21 22:55:51 +08:00
罗家炜 68ab098267 同步 2025-08-21 22:10:22 +08:00
niko e421cc0462 同步 2025-08-21 21:35:24 +08:00
罗家炜 f3607148bd tongb 2025-08-21 18:35:26 +08:00
1076390229 972b5291d2 同步 2025-08-20 18:13:19 +08:00
1076390229 611658bb15 家族监听周期修复 2025-08-08 20:17:08 +08:00
niko 37f1cc49ae 同步,游戏内用户头像调整。 2025-08-08 16:50:05 +08:00
DESKTOP-7R8JEQQ\k 80c0d02632 杠加分 2025-07-11 21:37:35 +08:00
DESKTOP-7R8JEQQ\k 30fb05be36 界面修复 2025-07-04 21:33:06 +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 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
罗家炜 e1cfb6650e 提交三四人麻将同步二人功能 2025-07-02 21:17:14 +08:00
罗家炜 b6a28f0987 提交 2025-07-02 20:18:16 +08:00
罗家炜 b3542b2193 同步 2025-06-26 16:11:40 +08:00
罗家炜 8fe5500ebc 强制打开观战 2025-06-26 02:28:24 +08:00
罗家炜 ceaa9dfb55 gitigrone修复 2025-06-26 01:09:13 +08:00
罗家炜 329705af06 麻将显示语音按钮 2025-06-17 21:23:42 +08:00
罗家炜 a91a44def6 同步修改 2025-06-17 20:34:45 +08:00
FPGA a58f4ec1bb voice 2025-06-17 20:26:53 +08:00
罗家炜 6e7ebe64a6 同步观战 2025-06-10 16:11:48 +08:00