Commit Graph

15 Commits (c901948e97636501f5e53a37c1f8e821d52f60d1)

Author SHA1 Message Date
DESKTOP-7R8JEQQ\k c901948e97 6字省略 2025-07-22 20:00:07 +08:00
DESKTOP-7R8JEQQ\k 5f4b6bd160 临时提交,心跳 2025-07-18 16:02:20 +08:00
DESKTOP-7R8JEQQ\k 121e8a3716 换游戏底图 2025-07-09 21:32:02 +08:00
罗家炜 e3b7a3b0aa 提交一些小修改 2025-07-04 23:46:31 +08:00
DESKTOP-7R8JEQQ\k a5c1b71989 no message 2025-07-04 19:46:28 +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
罗家炜 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
罗家炜 e1cfb6650e 提交三四人麻将同步二人功能 2025-07-02 21:17:14 +08:00
DESKTOP-7R8JEQQ\k 32cc672870 麻将适配 2025-07-02 20:30:58 +08:00
DESKTOP-7R8JEQQ\k 105d254992 界面修改调整、打开关闭聊天室协议 2025-07-01 19:31:19 +08:00
FPGA a58f4ec1bb voice 2025-06-17 20:26:53 +08:00
罗家炜 6e7ebe64a6 同步观战 2025-06-10 16:11:48 +08:00