hengyang_client/lua_probject/extend_project/extend/majiang/jinxi
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
..
CS_Win_Type.lua 其他四个麻将同步 2025-04-21 18:55:46 +08:00
CardCheck.lua 初始化提交 2025-04-01 10:48:36 +08:00
EXClearingView.lua 麻将结算界面换牌 2025-07-18 20:13:46 +08:00
EXGameController.lua 显示剩余牌补充,修复bug 2025-07-18 19:26:03 +08:00
EXGameInfo.lua 编辑玩法换图和修复bug 2025-07-04 19:36:00 +08:00
EXMainView.lua 未被跟踪的文件 2025-07-18 17:59:24 +08:00
EXPlayBackView.lua 暴力合并other2 2025-06-25 22:49:44 +08:00
EXPlayer.lua 初始化提交 2025-04-01 10:48:36 +08:00
EXPlayerInfoView.lua 同步分数限制修改 2025-05-19 16:21:21 +08:00
EXRoomConfig.lua 初始化提交 2025-04-01 10:48:36 +08:00
EXSettingView.lua 未被跟踪的文件 2025-07-18 17:59:24 +08:00
EXWitnessView.lua 心跳30秒 2025-07-18 16:28:57 +08:00
ExtendConfig.lua 暴力合并other2 2025-06-25 22:49:44 +08:00
GameEvent.lua 展示牌更新 2025-05-08 12:41:42 +08:00
MJPlayerSelfCardInfoView.lua 同步分数限制修改 2025-05-19 16:21:21 +08:00
Protocol.lua 同步613 2025-05-08 12:48:37 +08:00
RecordEvent.lua 初始化提交 2025-04-01 10:48:36 +08:00