miduo_client/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch
gaoxin 53b6f4483f Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_yl_vo_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_zl_vo_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh03.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_hd01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_ql01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl02.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl03.mp3.meta
#	Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t3.png.meta
#	Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t3.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2020-11-06 19:56:52 +08:00
..
View 【巅峰赛】 头像特效设置层级有问题 线上 2020-11-06 15:31:29 +08:00
ATMMyGuessHistoryPopup.lua 头像特效添加 2020-09-27 16:58:10 +08:00
ATMMyGuessHistoryPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
ATMTeamRankPopup.lua 头像特效添加 2020-09-27 16:58:10 +08:00
ATMTeamRankPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
ArenaTopMatchGuessTipViewPopup.lua 头像特效添加 2020-09-27 16:58:10 +08:00
ArenaTopMatchGuessTipViewPopup.lua.meta 巅峰战竞猜结果新加界面 新手引导修改主线开始战斗按钮名称 2020-09-07 21:15:40 +08:00
ArenaTopMatchManager.lua Merge branch 'master_xma_local' into master_develop 2020-11-06 19:56:52 +08:00
ArenaTopMatchManager.lua.meta 提交 2020-05-09 13:31:21 +08:00
ArenaTopMatchPanel.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
ArenaTopMatchPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
DoGuessPopup.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
DoGuessPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
GuessCoinDropPopup.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
GuessCoinDropPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
RecordPopup.lua 头像特效添加 2020-09-27 16:58:10 +08:00
RecordPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
TopMatchPlayBattleAinSelectPopup.lua 头像特效添加 2020-09-27 16:58:10 +08:00
TopMatchPlayBattleAinSelectPopup.lua.meta 回放三局两胜显示 2020-07-23 18:06:55 +08:00
View.meta 提交 2020-05-09 13:31:21 +08:00