miduo_client/Assets/ManagedResources/~Lua/Modules/Carbon
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
..
CarbonManager.lua Merge branch 'master_xma_local' into 0功能/silingshilian 2021-03-08 11:14:15 +08:00
CarbonManager.lua.meta 提交 2020-05-09 13:31:21 +08:00
CarbonMopUpEndPanel.lua Merge branch 'master_xma_local' into 0功能/silingshilian 2021-03-08 11:14:15 +08:00
CarbonMopUpEndPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
CarbonScoreSortPanel.lua 【本地化】 2021-01-29 13:22:50 +08:00
CarbonScoreSortPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
CarbonTypePanel.lua 还原lua 2021-03-02 16:53:12 +08:00
CarbonTypePanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
CarbonTypePanelV2.lua Merge branch 'master_xma_local' into 0功能/silingshilian 2021-03-08 11:14:15 +08:00
CarbonTypePanelV2.lua.meta 提交 2020-05-09 13:31:21 +08:00
CarbonTypePanelV3.lua 【巅峰赛限时头像修改】 2021-01-15 21:06:48 +08:00
CarbonTypePanelV3.lua.meta 轩辕宝镜提交 2020-07-21 10:42:20 +08:00
DailyCarbonPanel.lua 【本地化】 2021-03-03 17:04:17 +08:00
DailyCarbonPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
EliteCarbonAchievePanel.lua 还原lua 2021-03-02 16:53:12 +08:00
EliteCarbonAchievePanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
EliteCarbonPanel.lua 还原lua 2021-03-02 16:53:12 +08:00
EliteCarbonPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
EndLessCarbonPanel.lua 还原lua 2021-03-02 16:53:12 +08:00
EndLessCarbonPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
MapLeavePanel.lua 还原lua 2021-03-02 16:53:12 +08:00
MapLeavePanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
MapStatsPanel.lua 还原lua 2021-03-02 16:53:12 +08:00
MapStatsPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
MinMapPopup.lua Merge branch 'master_xma_local' into gx/xma_local 2021-01-26 11:08:54 +08:00
MinMapPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
PlotCarbonPanel.lua 还原lua 2021-03-02 16:53:12 +08:00
PlotCarbonPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
PlotRewardPreviewPupop.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
PlotRewardPreviewPupop.lua.meta 提交 2020-05-09 13:31:21 +08:00
TrialCarbonPanel.lua 还原lua 2021-03-02 16:53:12 +08:00
TrialCarbonPanel.lua.meta 提交 2020-05-09 13:31:21 +08:00
TrialResetPopup.lua 还原lua 2021-03-02 16:53:12 +08:00
TrialResetPopup.lua.meta 提交 2020-05-09 13:31:21 +08:00
XuanYuanMirrorManager.lua 还原lua 2021-03-02 16:53:12 +08:00
XuanYuanMirrorManager.lua.meta 幸运探宝提交 2020-07-16 20:24:28 +08:00
XuanYuanMirrorPanel.lua 还原lua 2021-03-02 16:53:12 +08:00
XuanYuanMirrorPanel.lua.meta 轩辕宝镜资源提交 2020-07-15 16:27:58 +08:00
XuanYuanMirrorPanelList.lua 还原lua 2021-03-02 16:53:12 +08:00
XuanYuanMirrorPanelList.lua.meta 轩辕宝镜资源提交 2020-07-15 16:27:58 +08:00
XuanYuanMirrorRankPopup.lua 【排行榜优化】排行榜信息分页读取 2021-02-03 14:45:32 +08:00
XuanYuanMirrorRankPopup.lua.meta no message 2020-08-11 11:00:30 +08:00
XuanYuanMirrorRewardSortPopup.lua 还原lua 2021-03-02 16:53:12 +08:00
XuanYuanMirrorRewardSortPopup.lua.meta 轩辕宝镜提交 2020-08-11 09:48:21 +08:00