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 |
|
罗家炜
|
64746b5a6e
|
忽略。bytes文件冲突
|
2025-07-04 23:47:14 +08:00 |
|
罗家炜
|
e3b7a3b0aa
|
提交一些小修改
|
2025-07-04 23:46:31 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
30fb05be36
|
界面修复
|
2025-07-04 21:33:06 +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 |
|
罗家炜
|
cdef6dcb91
|
解决冲突
|
2025-07-02 20:22:26 +08:00 |
|
罗家炜
|
b6a28f0987
|
提交
|
2025-07-02 20:18:16 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
7570ba54c8
|
删除art大小写
|
2025-07-02 20:15:38 +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
|
8bc488315b
|
界面修改
|
2025-07-01 21:58:29 +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 |
|
罗家炜
|
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 |
|
罗家炜
|
cd87d521ad
|
回到分支
|
2025-06-26 01:00:37 +08:00 |
|
罗家炜
|
e480064fa2
|
合并冲突
|
2025-06-26 00:15:48 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
9cc8415a0c
|
添加字体、禁止观战
|
2025-06-25 23:14:16 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
f4cd51a641
|
同桌优化、创建亲友圈修复、添加多个字段
|
2025-06-25 22:21:05 +08:00 |
|
罗家炜
|
aef31e30f8
|
补充差异
|
2025-06-24 22:24:56 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
933a5df897
|
Merge branch 'master' into lps/family5-M2
# 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:17:15 +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 |
|
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 |
|
罗家炜
|
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 |
|
罗家炜
|
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 |
|
罗家炜
|
76bae22205
|
提交合并冲突
|
2025-06-17 18:16:57 +08:00 |
|
罗家炜
|
949b2bcae7
|
恢复修改
|
2025-06-17 18:09:58 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
76230794f1
|
familyUI
|
2025-06-17 17:51:24 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
37667ea753
|
亲友圈ui
|
2025-06-17 15:29:16 +08:00 |
|
罗家炜
|
58eee6f33a
|
发送带id的邀请协议
|
2025-06-16 15:24:27 +08:00 |
|
DESKTOP-7R8JEQQ\k
|
9306f75e6c
|
页面上传
|
2025-06-14 17:49:51 +08:00 |
|
罗家炜
|
379a55cf70
|
江西同步
|
2025-06-13 13:33:34 +08:00 |
|
罗家炜
|
46b6313486
|
同步family
|
2025-06-12 15:17:53 +08:00 |
|
罗家炜
|
9cef826299
|
同步46.45
|
2025-06-11 16:45:21 +08:00 |
|
罗家炜
|
fb86fe4259
|
修改同步桌面
|
2025-06-10 20:36:42 +08:00 |
|
罗家炜
|
09788f907f
|
观战最新
|
2025-06-10 18:48:57 +08:00 |
|
罗家炜
|
6e7ebe64a6
|
同步观战
|
2025-06-10 16:11:48 +08:00 |
|
罗家炜
|
06c3fdb252
|
同步聊天信息
|
2025-06-09 19:48:22 +08:00 |
|
罗家炜
|
ba69d4899f
|
再同步一下
|
2025-06-09 19:10:02 +08:00 |
|
罗家炜
|
bb2028fa24
|
旁观按钮
|
2025-06-09 16:30:22 +08:00 |
|
罗家炜
|
ff71aa5732
|
同步红桃十翻倍
|
2025-06-07 21:42:35 +08:00 |
|
罗家炜
|
7ce85c4e1b
|
同步跑得快新作面
|
2025-06-07 21:31:47 +08:00 |
|
罗家炜
|
856491eba0
|
同步牌跑得快两人
|
2025-06-07 20:45:11 +08:00 |
|
罗家炜
|
33df77bd7c
|
同步两人
|
2025-06-07 17:32:53 +08:00 |
|
罗家炜
|
4ce7523cad
|
两人麻将同步
|
2025-06-07 13:49:44 +08:00 |
|
罗家炜
|
64ac20b580
|
没发布成功，继续同步
|
2025-06-07 12:31:25 +08:00 |
|
罗家炜
|
70b8ae1972
|
同步四人
|
2025-06-07 12:23:34 +08:00 |
|
罗家炜
|
a324397141
|
麻将2-4人提交
|
2025-06-07 12:05:04 +08:00 |
|
罗家炜
|
b7eafcab26
|
更新麻将新桌面
|
2025-06-06 19:48:45 +08:00 |
|
罗家炜
|
952d30caf4
|
同步最新代码
|
2025-05-30 13:35:36 +08:00 |
|
罗家炜
|
3fc753c4fd
|
同步2
|
2025-05-22 18:14:21 +08:00 |
|
罗家炜
|
4bb10d0df4
|
同步最新】
|
2025-05-22 11:22:14 +08:00 |
|
罗家炜
|
24a65c8f08
|
亲友圈审核
|
2025-05-21 14:22:02 +08:00 |
|
罗家炜
|
578cb4bf69
|
加入亲友圈类型
|
2025-05-20 18:43:03 +08:00 |
|
罗家炜
|
b71547126a
|
修改亲友圈限制分
|
2025-05-20 16:51:56 +08:00 |
|
罗家炜
|
f2fafa2cdd
|
同步发送勾选战绩
|
2025-05-20 13:39:54 +08:00 |
|
罗家炜
|
4ce2905807
|
同步分数限制修改
|
2025-05-19 16:21:21 +08:00 |
|
罗家炜
|
0c90268eb7
|
显示庄家
|
2025-05-17 15:00:23 +08:00 |
|
罗家炜
|
81d75aa5ce
|
同步梭哈结算界面
|
2025-05-16 17:45:35 +08:00 |
|
罗家炜
|
c15e55477a
|
梭哈显示分
|
2025-05-16 16:33:31 +08:00 |
|
罗家炜
|
c70a0b899d
|
同步梭哈2099协议提示内容修改
|
2025-05-16 11:55:28 +08:00 |
|
罗家炜
|
9f6a0d439a
|
同步梭哈新协议2099
|
2025-05-16 11:13:01 +08:00 |
|
罗家炜
|
c5e9fa47fd
|
梭哈同步修复资源引用跑得快
|
2025-05-16 10:55:12 +08:00 |
|
罗家炜
|
cf897e81f4
|
同步梭哈协议修改
|
2025-05-15 18:46:02 +08:00 |
|
罗家炜
|
98a12bdbbc
|
同步下注显示分数梭哈
|
2025-05-15 18:30:29 +08:00 |
|
罗家炜
|
a0892f7c6b
|
梭哈提示显示同步
|
2025-05-15 17:01:19 +08:00 |
|
罗家炜
|
9d72403c7b
|
同步梭哈修改
|
2025-05-15 16:49:18 +08:00 |
|
罗家炜
|
502962ae43
|
同步梭哈
|
2025-05-14 18:56:50 +08:00 |
|
罗家炜
|
28f489a286
|
三张少带和飞机少带检查类型增多判断
|
2025-05-14 15:56:27 +08:00 |
|
罗家炜
|
4499ae219b
|
同步跑得快结尾动画，判断类型使用cardcheck
|
2025-05-14 14:37:31 +08:00 |
|
罗家炜
|
901df13ef6
|
同步亲友圈查看成员
|
2025-05-14 10:59:30 +08:00 |
|
罗家炜
|
2964f26fe4
|
同步放置提示
|
2025-05-13 15:26:22 +08:00 |
|
罗家炜
|
14aec64a6f
|
同步庄家显示问题
|
2025-05-13 14:38:42 +08:00 |
|
罗家炜
|
7edfac1243
|
新git地址同步
|
2025-05-13 10:30:27 +08:00 |
|
罗家炜
|
dce351f969
|
同步展示
|
2025-05-09 14:56:23 +08:00 |
|
罗家炜
|
552d248de1
|
同步四人左面展示
|
2025-05-08 14:23:48 +08:00 |
|
罗家炜
|
b3283b922c
|
修复同时弹窗
|
2025-05-08 13:18:43 +08:00 |
|
罗家炜
|
037c03f977
|
展示牌更新
|
2025-05-08 12:41:42 +08:00 |
|
罗家炜
|
ff796b86dd
|
同步出牌提示
|
2025-05-07 15:38:38 +08:00 |
|
罗家炜
|
2370ea7783
|
四人选择错误修复
|
2025-05-07 11:08:06 +08:00 |
|
罗家炜
|
ec89eae095
|
按下是清楚移动状态
|
2025-05-07 10:29:37 +08:00 |
|
罗家炜
|
96963a0d18
|
同步
|
2025-04-30 23:12:21 +08:00 |
|
罗家炜
|
910d7508ec
|
同步头像和提示可以出牌修改
|
2025-04-30 10:53:04 +08:00 |
|
罗家炜
|
3c23a3dfe2
|
抚州添加庄家积分翻倍
|
2025-04-29 15:59:12 +08:00 |
|
罗家炜
|
fadf1b10da
|
跑得快结算界面完成
|
2025-04-29 15:48:04 +08:00 |
|
罗家炜
|
f23654dfe9
|
跑得快临时
|
2025-04-29 14:24:48 +08:00 |
|
罗家炜
|
01d428b954
|
跑得快结算同步
|
2025-04-29 13:50:07 +08:00 |
|
罗家炜
|
9e8f489f76
|
梭哈上传
|
2025-04-29 12:11:00 +08:00 |
|
罗家炜
|
6fefee5067
|
梭哈主界面丢失修复
|
2025-04-29 10:48:00 +08:00 |
|
罗家炜
|
1d1b742ead
|
梭哈
|
2025-04-28 19:58:34 +08:00 |
|
罗家炜
|
95ce550312
|
跑得快出牌同步
|
2025-04-28 15:12:04 +08:00 |
|
罗家炜
|
a19b61d7ac
|
跑得快修正中
|
2025-04-27 20:22:15 +08:00 |
|
罗家炜
|
e01cec4dcf
|
修复泽帆提供的小建议
|
2025-04-26 17:49:54 +08:00 |
|
罗家炜
|
ad2767352b
|
金溪同步
|
2025-04-26 15:01:05 +08:00 |
|
罗家炜
|
4f44039b65
|
修复对家精牌标志显示
|
2025-04-26 14:36:14 +08:00 |
|
罗家炜
|
bd2ae0c35b
|
修复放置提示被一键下派遮挡
|
2025-04-26 14:27:28 +08:00 |