Commit Graph

279 Commits (94b7b5e5174b42e3a7424f70de6c8e5f4630052a)

Author SHA1 Message Date
1076390229 323b6f7026 助理刷新修复 2025-08-04 20:34:41 +08:00
1076390229 c8c4adce64 拆开查看成员 2025-08-04 19:52:20 +08:00
1076390229 542dc157be 重连修复,动画调整,小三角标 2025-08-01 21:13:14 +08:00
1076390229 a9fd7d7900 玩法设置 2025-08-01 17:03:36 +08:00
1076390229 09e5adef7b 去除前端成员的权限判断 2025-07-31 21:01:22 +08:00
1076390229 c3516fc01d 家族刷新,解散界面,准备先不用清空手牌 2025-07-31 19:59:23 +08:00
1076390229 e5d1240726 单击双击设置 2025-07-31 16:54:29 +08:00
1076390229 40301d2f4e 旁观换背景 2025-07-30 22:31:32 +08:00
1076390229 a891dfc111 playing判断 2025-07-30 22:16:22 +08:00
1076390229 5b328e1104 新增文件 2025-07-30 21:56:29 +08:00
1076390229 713f86d2a5 背景更改中 2025-07-30 21:55:34 +08:00
1076390229 e7a320c273 两条协议统一数据输入 2025-07-30 19:40:37 +08:00
1076390229 8f1ce9aca4 申请信息红点 2025-07-30 18:35:43 +08:00
1076390229 2de9d303cc getData改int 2025-07-29 20:11:16 +08:00
1076390229 2b596d4dba setHome挪到group连接 2025-07-29 18:45:50 +08:00
1076390229 7bcb004ebb 胡牌的哪个牌倒牌、结算按钮 2025-07-29 01:17:29 +08:00
1076390229 3f97a0db14 在线成员协议 2025-07-29 00:10:16 +08:00
1076390229 04a307bee2 房间倍数修复 2025-07-28 23:10:48 +08:00
1076390229 0160bddd98 路径 2025-07-28 22:55:19 +08:00
1076390229 892c1b677d 协议路径 2025-07-28 22:53:36 +08:00
1076390229 9741424a38 添加callback 2025-07-28 22:49:25 +08:00
1076390229 f9657deec7 get_online_member协议 2025-07-28 22:42:58 +08:00
1076390229 6feed6a28e setHome放到web连接 2025-07-28 22:01:34 +08:00
1076390229 c0e4f8ce94 申请消息整理 2025-07-28 21:44:23 +08:00
1076390229 9a1c182fec 聊天室红点 2025-07-28 20:42:56 +08:00
1076390229 61a9b8ece3 添加富文本 2025-07-28 15:20:59 +08:00
1076390229 8f30fc3bd1 未跟踪文件 2025-07-27 02:58:44 +08:00
1076390229 cd6cc8b60c 12001刷新成员状态、状态排序、退出游戏按钮修复 2025-07-27 02:57:39 +08:00
DESKTOP-7R8JEQQ\k 31f8424637 改了一大推 2025-07-27 00:05:46 +08:00
DESKTOP-7R8JEQQ\k 9ec586442d 其他观战的继承关系 2025-07-25 23:37:32 +08:00
DESKTOP-7R8JEQQ\k 6162928d34 设置界面 2025-07-25 22:17:17 +08:00
DESKTOP-7R8JEQQ\k 84b9f60fde 15秒心跳 2025-07-24 21:41:05 +08:00
DESKTOP-7R8JEQQ\k 81e28ee578 协议提交 2025-07-24 17:04:53 +08:00
DESKTOP-7R8JEQQ\k 23bf422189 协议request_apply_count修复 2025-07-24 16:11:33 +08:00
DESKTOP-7R8JEQQ\k 1a51444774 成员备注修复、家族界面连接流程整理、倍数二级界面 2025-07-24 15:54:47 +08:00
DESKTOP-7R8JEQQ\k bb3ae96be5 倍数补充、6字省略补充 2025-07-23 15:40:53 +08:00
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 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 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
罗家炜 fd751af1fe 结算页面显示剩余的牌 2025-07-18 18:58:58 +08:00
DESKTOP-7R8JEQQ\k 2c3ff04b1a 未被跟踪的文件 2025-07-18 17:59:24 +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 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
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