miduo_client/Assets/ManagedResources/~Lua/Modules/Formation
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-09-28 16:56:22 +08:00
ElementPopup.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
ElementPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
FormationEditPopup.lua 【皮肤】修改皮肤显示 2020-11-04 16:51:45 +08:00
FormationEditPopup.lua.meta 六月三号开发提交 2020-06-03 19:09:01 +08:00
FormationExamplePopup.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
FormationExamplePopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
FormationManager.lua 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
FormationManager.lua.meta 提交 2020-05-09 13:31:21 +08:00
FormationPanel.lua 森罗 无尽 流程优化和界面调整 2020-09-02 13:35:29 +08:00
FormationPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
FormationPanelV2.lua Merge branch 'master_xma_local' into master_develop 2020-11-06 19:56:52 +08:00
FormationPanelV2.lua.meta 提交 2020-05-09 13:31:21 +08:00
FormationSetPanel.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
FormationSetPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
View.meta 提交 2020-05-09 13:31:21 +08:00