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
..
Common	换牌	2025-07-16 15:07:29 +08:00
Family	扔番茄	2025-07-21 14:42:49 +08:00
Lobby	玩法管理修改	2025-07-04 02:06:24 +08:00
NewGroup	游戏按钮位置调整，添加玩法修复	2025-07-20 00:24:30 +08:00
ChatView.lua	初始化提交	2025-04-01 10:48:36 +08:00
DismissRoomWindow.lua	初始化提交	2025-04-01 10:48:36 +08:00
FGAssistInviteView.lua	恢复修改	2025-06-17 18:09:58 +08:00
FGAssistView.lua	在线状态刷新/扔番茄	2025-07-20 06:21:43 +08:00
FamilyView.lua	在线状态刷新/扔番茄	2025-07-20 06:21:43 +08:00
HeadView.lua	初始化提交	2025-04-01 10:48:36 +08:00
LobbyView.lua	编辑玩法换图和修复bug	2025-07-04 19:36:00 +08:00
LoginView.lua	全部放大	2025-04-11 12:49:08 +08:00
MainRightPanelView.lua	初始化提交	2025-04-01 10:48:36 +08:00
MainView.lua	扔番茄	2025-07-21 14:42:49 +08:00
MissileSender.lua	结算页面显示剩余的牌	2025-07-18 18:58:58 +08:00
PhoneLoginView.lua	初始化提交	2025-04-01 10:48:36 +08:00
PlayBackView.lua	暴力合并other2	2025-06-25 22:49:44 +08:00
PlayerDistanceView.lua	初始化提交	2025-04-01 10:48:36 +08:00
PlayerInfoView.lua	换牌	2025-07-16 15:07:29 +08:00
PlayerInfoView2.lua	换牌	2025-07-16 15:07:29 +08:00
ResultView.lua	在线离线联调	2025-07-11 16:05:11 +08:00
RoomInfoView.lua	旁观按钮	2025-06-09 16:30:22 +08:00
RuleView.lua	初始化提交	2025-04-01 10:48:36 +08:00
SettingView.lua	梭哈同步修复资源引用跑得快	2025-05-16 10:55:12 +08:00
ViewUtil.lua	麻将结算界面换牌	2025-07-18 20:13:46 +08:00
init.lua	初始化提交	2025-04-01 10:48:36 +08:00
playerDetailView.lua	Merge branch 'master' into lps/missFile-M	2025-07-21 14:52:45 +08:00