miduo_client/Assets/ManagedResources/~Lua/Modules/Formation
zhangqiang e1b223e83f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/MonsterConfig.xlsx
#	data_execl/base_data/PrivilegeTypeConfig.xlsx
#	data_execl/base_data/RewardGroup.xlsx
#	data_execl/base_data/RewardItemConfig.xlsx
#	data_execl/base_data/SpecialConfig.xlsx
#	data_execl/base_data/StoreConfig.xlsx
#	data_execl/base_data/UIConfig.xlsx
2020-08-22 13:59:35 +08:00
..
View Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-22 13:59:35 +08:00
ElementPopup.lua encoding upate 2020-08-06 17:52:32 +08:00
ElementPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
FormationEditPopup.lua 2020-08-18 16:36:24 +08:00
FormationEditPopup.lua.meta 六月三号开发提交 2020-06-03 19:09:01 +08:00
FormationExamplePopup.lua encoding upate 2020-08-06 17:52:32 +08:00
FormationExamplePopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
FormationManager.lua 无尽副本基本功能 2020-08-18 10:49:21 +08:00
FormationManager.lua.meta 提交 2020-05-09 13:31:21 +08:00
FormationPanel.lua encoding upate 2020-08-06 17:52:32 +08:00
FormationPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
FormationPanelV2.lua Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-22 13:59:35 +08:00
FormationPanelV2.lua.meta 提交 2020-05-09 13:31:21 +08:00
FormationSetPanel.lua encoding upate 2020-08-06 17:52:32 +08:00
FormationSetPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
View.meta 提交 2020-05-09 13:31:21 +08:00