miduo_client/Assets/ManagedResources/~Lua/Modules/Formation
gaoxin 3e3d0d9416 Merge remote-tracking branch 'origin/china/xq' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-09-09 11:22:47 +08:00
..
View Merge remote-tracking branch 'origin/china/xq' into china/dev 2021-09-09 11:22:47 +08:00
ElementPopup.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
ElementPopup.lua.meta
FormationEditPopup.lua Merge branch 'china/dev' into china/local 2021-06-07 14:18:09 +08:00
FormationEditPopup.lua.meta
FormationExamplePopup.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
FormationExamplePopup.lua.meta
FormationManager.lua 四灵提交 2021-08-30 14:21:41 +08:00
FormationManager.lua.meta
FormationPanel.lua 【ios推荐服】白片处理,修复无尽副本无法返回,修复副本回到主界面点击其他页签黑屏 2021-04-22 20:39:30 +08:00
FormationPanel.lua.meta
FormationPanelV2.lua 一键上阵修改提交 2021-09-01 17:12:25 +08:00
FormationPanelV2.lua.meta
FormationSetPanel.lua 无尽副本战力修改提交 2021-05-26 11:52:32 +08:00
FormationSetPanel.lua.meta
View.meta