miduo_client/Assets/ManagedResources/~Lua/Modules/Expedition/View
jiaoyangna cf3c571182 Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
2021-03-08 11:14:15 +08:00
..
ExpeditionMonsterInfo_Greed.lua 还原lua 2021-03-02 16:53:12 +08:00
ExpeditionMonsterInfo_Greed.lua.meta 外网包 0.16.1 2020-05-25 19:16:23 +08:00
ExpeditionMonsterInfo_Monster.lua Merge branch 'master_xma_local' into 0功能/silingshilian 2021-03-08 11:14:15 +08:00
ExpeditionMonsterInfo_Monster.lua.meta 外网包 0.16.1 2020-05-25 19:16:23 +08:00
ExpeditionMonsterInfo_Recruit.lua 还原lua 2021-03-02 16:53:12 +08:00
ExpeditionMonsterInfo_Recruit.lua.meta 外网包 0.16.1 2020-05-25 19:16:23 +08:00
ExpeditionMonsterInfo_Shop.lua 还原lua 2021-03-02 16:53:12 +08:00
ExpeditionMonsterInfo_Shop.lua.meta 外网包 0.16.1 2020-05-25 19:16:23 +08:00
ExpeditionMonsterInfo_Trail.lua 还原lua 2021-03-02 16:53:12 +08:00
ExpeditionMonsterInfo_Trail.lua.meta 外网包 0.16.1 2020-05-25 19:16:23 +08:00
MonsterFormationInfo.lua 四灵 修改 2021-03-01 19:53:28 +08:00
MonsterFormationInfo.lua.meta 【四灵试炼】预设提交 2020-12-08 17:01:53 +08:00