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
..
Main_new	Merge remote-tracking branch 'origin/master' into lps/8.13M	2025-08-13 14:15:52 +08:00
Main_new_2	布局修改	2025-07-01 21:41:56 +08:00
Main_style_2	暴力合并other2	2025-06-25 22:49:44 +08:00
Missile	结算页面显示剩余的牌	2025-07-18 18:58:58 +08:00
buttons	同步gui目录	2025-05-22 15:08:28 +08:00
component	出牌箭头提示，位置校准，全部显示。两人显示正常	2025-08-11 16:14:56 +08:00
font	同步gui目录	2025-05-22 15:08:28 +08:00
image	特效	2025-08-13 14:06:30 +08:00
images	拆开查看成员	2025-08-04 19:52:20 +08:00
Btn_chat.xml	同步gui目录	2025-05-22 15:08:28 +08:00
Gcm_chat.xml	同步gui目录	2025-05-22 15:08:28 +08:00
Main_2.xml	同步gui目录	2025-05-22 15:08:28 +08:00
Main_3.xml	同步gui目录	2025-05-22 15:08:28 +08:00
Main_4.xml	同步gui目录	2025-05-22 15:08:28 +08:00
Main_Majiang.rar	同步gui目录	2025-05-22 15:08:28 +08:00
Main_new_2.xml	voice	2025-06-17 20:26:53 +08:00
Pop_tip_choice.xml	同步gui目录	2025-05-22 15:08:28 +08:00
RightPanel_new.xml	同步gui目录	2025-05-22 15:08:28 +08:00
RoomInfoPanel.xml	同步gui目录	2025-05-22 15:08:28 +08:00
RoomInfoPanel1.xml	同步gui目录	2025-05-22 15:08:28 +08:00
Tab_biaoqing2.xml	同步gui目录	2025-05-22 15:08:28 +08:00
bg2.png	同步gui目录	2025-05-22 15:08:28 +08:00
checkbtn_click.xml	结算页面显示剩余的牌	2025-07-18 18:58:58 +08:00
laizi.png	同步gui目录	2025-05-22 15:08:28 +08:00
n40.png	同步gui目录	2025-05-22 15:08:28 +08:00
n41.png	同步gui目录	2025-05-22 15:08:28 +08:00
package.xml	特效	2025-08-13 14:06:30 +08:00
santan.png	同步gui目录	2025-05-22 15:08:28 +08:00
tablebg.png	同步gui目录	2025-05-22 15:08:28 +08:00
tablebg3d.png	同步gui目录	2025-05-22 15:08:28 +08:00
ting.xml	同步gui目录	2025-05-22 15:08:28 +08:00