Commit Graph

602 Commits (master)

Author SHA1 Message Date
DESKTOP-7R8JEQQ\k 43d8c12065 新界面 2025-07-22 20:04:48 +08:00
DESKTOP-7R8JEQQ\k c901948e97 6字省略 2025-07-22 20:00:07 +08:00
DESKTOP-7R8JEQQ\k 9fc9ba2315 退出房间 2025-07-21 21:44:50 +08:00
DESKTOP-7R8JEQQ\k 53c2085bfc 心跳3秒,助理推送 2025-07-21 18:12:13 +08:00
DESKTOP-7R8JEQQ\k f9f51384b4 roomid转回string' 2025-07-21 17:29:07 +08:00
DESKTOP-7R8JEQQ\k fca54c0342 roomid转int 2025-07-21 16:15:25 +08:00
DESKTOP-7R8JEQQ\k 1c5f949aeb 不知道为什么叫我改别人的东西,上传上去了 2025-07-21 15:57:50 +08:00
DESKTOP-7R8JEQQ\k 124d06d4bb no message 2025-07-21 14:56:59 +08:00
DESKTOP-7R8JEQQ\k bc1dc6e86b Merge branch 'master' into lps/missFile-M
# Conflicts:
#	lua_probject/base_project/Game/View/MissileSender.lua
#	lua_probject/base_project/Game/View/playerDetailView.lua
#	wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta
#	wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_qmc17jbz.png.meta
#	wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas10.png.meta
#	wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
2025-07-21 14:52:45 +08:00
DESKTOP-7R8JEQQ\k 094f2a37ab atr资源 2025-07-21 14:48:26 +08:00
DESKTOP-7R8JEQQ\k c2dd7d7683 扔番茄 2025-07-21 14:42:49 +08:00
DESKTOP-7R8JEQQ\k 0efe04d84c 提交文件 2025-07-20 06:48:10 +08:00
DESKTOP-7R8JEQQ\k 2e256e43b8 扔番茄 2025-07-20 06:45:30 +08:00
DESKTOP-7R8JEQQ\k 12c663c183 在线状态刷新/扔番茄 2025-07-20 06:21:43 +08:00
DESKTOP-7R8JEQQ\k 4c950a0d25 游戏按钮位置调整,添加玩法修复 2025-07-20 00:24:30 +08:00
DESKTOP-7R8JEQQ\k a117017348 代码提交 2025-07-19 16:39:08 +08:00
DESKTOP-7R8JEQQ\k 0c75adcb2f 心跳 2025-07-19 16:32:03 +08:00
罗家炜 c325906c13 麻将结算界面换牌 2025-07-18 20:13:46 +08:00
罗家炜 ff9dad5e8c 显示剩余牌补充,修复bug 2025-07-18 19:26:03 +08:00
罗家炜 fd751af1fe 结算页面显示剩余的牌 2025-07-18 18:58:58 +08:00
DESKTOP-7R8JEQQ\k d990d86d56 删掉子类的代码 2025-07-18 18:04:27 +08:00
DESKTOP-7R8JEQQ\k 2c3ff04b1a 未被跟踪的文件 2025-07-18 17:59:24 +08:00
DESKTOP-7R8JEQQ\k f9615707f2 结算显示所有人手牌 2025-07-18 16:46:03 +08:00
DESKTOP-7R8JEQQ\k 1c182f160d 心跳30秒 2025-07-18 16:28:57 +08:00
DESKTOP-7R8JEQQ\k 5f4b6bd160 临时提交,心跳 2025-07-18 16:02:20 +08:00
DESKTOP-7R8JEQQ\k e4b616bb5b 邀请提交 2025-07-17 15:02:14 +08:00
DESKTOP-7R8JEQQ\k 2a3bea4ae1 换牌 2025-07-16 15:07:29 +08:00
DESKTOP-7R8JEQQ\k 80c0d02632 杠加分 2025-07-11 21:37:35 +08:00
DESKTOP-7R8JEQQ\k 4ca52e0842 bug 2025-07-11 17:24:07 +08:00
DESKTOP-7R8JEQQ\k 9bfe386b48 用户小界面 2025-07-11 17:17:16 +08:00
DESKTOP-7R8JEQQ\k fd5b374479 在线离线联调 2025-07-11 16:05:11 +08:00
DESKTOP-7R8JEQQ\k 88dbbabbd6 换牌 2025-07-10 03:37:09 +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 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 ad029e528b 家族头像 2025-07-08 15:15:57 +08:00
DESKTOP-7R8JEQQ\k 08ec95efc0 适配 2025-07-08 14:50:36 +08:00