 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
|
b24f5508a9
|
退出亲友圈跳转
|
2025-07-08 18:24:28 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
2419bdc9b6
|
退出家族提示、申请适配
|
2025-07-08 18:01:27 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
0fe11afd84
|
成员记录适配
|
2025-07-08 16:28:40 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
ad029e528b
|
家族头像
|
2025-07-08 15:15:57 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
8396506302
|
家族点击优化
|
2025-07-07 21:03:06 +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
|
e8ea56febf
|
积分修复
|
2025-07-07 16:09:48 +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 |
 罗家炜
|
e3b7a3b0aa
|
提交一些小修改
|
2025-07-04 23:46:31 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
f8f5ed1c3e
|
bug修改
|
2025-07-04 21:17:27 +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
|
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 |
|
罗家炜
|
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
|
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 |
|
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 |