 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
|
8a076a8993
|
字体
|
2025-07-03 00:05:09 +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
|
723531beb3
|
布局修改
|
2025-07-01 21:41:56 +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 |
|
DESKTOP-7R8JEQQ\k
|
4455aaa25c
|
调试依赖文件诺位置
|
2025-06-27 21:35:45 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
f5335788dd
|
玩法bug修复中、调试文件
|
2025-06-27 21:33:42 +08:00 |
|
罗家炜
|
8fe5500ebc
|
强制打开观战
|
2025-06-26 02:28:24 +08:00 |
|
罗家炜
|
e480064fa2
|
合并冲突
|
2025-06-26 00:15:48 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
9cc8415a0c
|
添加字体、禁止观战
|
2025-06-25 23:14:16 +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 |
|
罗家炜
|
2cc9b3b7fb
|
有不同吗
|
2025-06-22 17:35:32 +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 |
|
罗家炜
|
61127b9352
|
邀请完成
|
2025-06-17 21:29: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 |
|
罗家炜
|
6e6e93b406
|
合并解决报错
|
2025-06-17 18:22:30 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
17857f76c7
|
合并主分支
|
2025-06-17 18:21:07 +08:00 |
|
罗家炜
|
76bae22205
|
提交合并冲突
|
2025-06-17 18:16:57 +08:00 |
|
罗家炜
|
949b2bcae7
|
恢复修改
|
2025-06-17 18:09:58 +08:00 |