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
..
Chat	布局修改	2025-07-01 21:41:56 +08:00
Clearing	麻将结算界面换牌	2025-07-18 20:13:46 +08:00
Component	麻将显示语音按钮	2025-06-17 21:23:42 +08:00
FZTips	换牌	2025-07-16 15:07:29 +08:00
Image	麻将显示语音按钮	2025-06-17 21:23:42 +08:00
Main	结算页面显示剩余的牌	2025-07-18 18:58:58 +08:00
Main_new_2	邀请提交	2025-07-17 15:02:14 +08:00
Main_new_3	gitigrone修复	2025-06-26 01:09:13 +08:00
Main_new_4	麻将布局，家族在线协议	2025-07-09 23:48:28 +08:00
Setting	退出房间、申请加入	2025-07-10 03:14:40 +08:00
record	战绩记录，成员战绩	2025-06-24 21:48:34 +08:00
Main_new_2.xml	麻将适配	2025-07-02 20:30:58 +08:00
Main_new_2_jiangxi.xml	游戏按钮位置调整，添加玩法修复	2025-07-20 00:24:30 +08:00
Main_new_3_jiangxi.xml	游戏按钮位置调整，添加玩法修复	2025-07-20 00:24:30 +08:00
Main_new_4_jiangxi.xml	游戏按钮位置调整，添加玩法修复	2025-07-20 00:24:30 +08:00