lingmeng
/
jx_client_neibu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
553 Commits
1 Branch
0 Tags
4 GiB
Commit Graph

334 Commits (d70d367fd7689568258b0e9f91190addb5647ec0)

Author SHA1 Message Date
1076390229 5acf91d425 麻将布局 2025-08-13 23:07:05 +08:00
1076390229 9749cd2db2 消息记录 2025-08-13 16:55:18 +08:00
1076390229 097ed2e24c Merge remote-tracking branch 'origin/master' into lps/8.13M 
# Conflicts:
#	wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
#	wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
 2025-08-13 14:15:52 +08:00
1076390229 76d4d151b2 特效 2025-08-13 14:06:30 +08:00
罗家炜 523997005f 合并冲突，只有.bytes文件，发布后提交上传 2025-08-11 16:17:48 +08:00
罗家炜 17db91bd27 出牌箭头提示，位置校准，全部显示。两人显示正常 2025-08-11 16:14:56 +08:00
1076390229 2e92757ba3 适配和加分 2025-08-09 22:05:28 +08:00
1076390229 e041ed61e9 游戏适配、玩法编辑适配、字段废弃 2025-08-08 17:47:07 +08:00
niko 37f1cc49ae 同步，游戏内用户头像调整。 2025-08-08 16:50:05 +08:00
罗家炜 e6b0511c1f 打开托管 2025-08-06 23:32:39 +08:00
罗家炜 b093da2999 同步 2025-08-06 22:32:30 +08:00
罗家炜 591fd7c795 助理显示同步 2025-08-06 22:29:15 +08:00
1076390229 f30c5ec59e 家族微调 2025-08-06 21:26:29 +08:00
1076390229 ae30a4f9b2 剩余牌数文字 2025-08-06 19:39:06 +08:00
1076390229 a1715131be 家族界面生命周期管理 2025-08-06 18:34:58 +08:00
1076390229 2b4403f0b6 1006加gid 2025-08-06 15:26:47 +08:00
1076390229 d7e766509b 边框、成员排序、亲友圈标题 2025-08-05 21:00:17 +08:00
1076390229 e57ed8a8d2 各种调整 2025-08-05 20:29:11 +08:00
1076390229 82bf2e5950 成员列表长度 2025-08-04 22:05:20 +08:00
罗家炜 ff0248dca8 Family_fui.bytes冲突，直接发布并提交 2025-08-04 21:50:25 +08:00
罗家炜 c0b1e9335a 查看成员修改颜色和大小 2025-08-04 21:47:53 +08:00
1076390229 bba4495727 打烊适配 2025-08-04 21:44:15 +08:00
1076390229 170e97b473 房间刷新修复 2025-08-04 21:20:23 +08:00
1076390229 323b6f7026 助理刷新修复 2025-08-04 20:34:41 +08:00
1076390229 c8c4adce64 拆开查看成员 2025-08-04 19:52:20 +08:00
1076390229 82b6e0c8cd unity编辑器刷新问题 2025-08-04 16:16:31 +08:00
1076390229 e37eb61dd3 胡牌刷新 2025-08-04 15:35:45 +08:00
1076390229 542dc157be 重连修复，动画调整，小三角标 2025-08-01 21:13:14 +08:00
1076390229 ec9b52f707 fgui文件 2025-08-01 18:07:26 +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 5b328e1104 新增文件 2025-07-30 21:56:29 +08:00
1076390229 713f86d2a5 背景更改中 2025-07-30 21:55:34 +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 7bcb004ebb 胡牌的哪个牌倒牌、结算按钮 2025-07-29 01:17:29 +08:00
1076390229 0223cb5064 未跟踪文件 2025-07-29 00:11:46 +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 cd6cc8b60c 12001刷新成员状态、状态排序、退出游戏按钮修复 2025-07-27 02:57:39 +08:00
1076390229 e9cdfbbbc2 对战位置调整 2025-07-27 00:31:26 +08:00
DESKTOP-7R8JEQQ\k 31f8424637 改了一大推 2025-07-27 00:05:46 +08:00
DESKTOP-7R8JEQQ\k 6162928d34 设置界面 2025-07-25 22:17:17 +08:00
DESKTOP-7R8JEQQ\k 81e28ee578 协议提交 2025-07-24 17:04:53 +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 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 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 4c950a0d25 游戏按钮位置调整，添加玩法修复 2025-07-20 00:24:30 +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 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 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 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
罗家炜 e3b7a3b0aa 提交一些小修改 2025-07-04 23:46:31 +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