miduo_client/Assets/ManagedResources/~Lua/Modules/GeneralPanel/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
..
GeneralBigPopup_FourElementHelpFight.lua 四灵修改提交 2021-03-01 20:26:43 +08:00
GeneralBigPopup_FourElementHelpFight.lua.meta 【四灵试炼】预设提交 2020-12-08 17:01:53 +08:00
GeneralBigPopup_ShenYingShuXing.lua 四灵 提交 2021-02-26 17:44:13 +08:00
GeneralBigPopup_ShenYingShuXing.lua.meta 【建木神树】神应属性界面 2020-12-11 16:03:27 +08:00
GeneralBigPopup_YiJingBaoKu.lua 【灵兽特惠】 2021-03-04 21:22:02 +08:00
GeneralBigPopup_YiJingBaoKu.lua.meta 【易经宝库】提交 2020-11-05 19:10:20 +08:00
GeneralBigPopup_YiJingBaoKuRewardPreview.lua 还原lua 2021-03-02 16:53:12 +08:00
GeneralBigPopup_YiJingBaoKuRewardPreview.lua.meta 【易经宝库】没有QA 无法购买 2020-11-06 13:36:48 +08:00