miduo_client/Assets/ManagedResources/~Lua/Modules/Carbon
wangzhenxing a7f0c42cae Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
	Assets/ManagedResources/~Lua/View/UpView.lua
2021-09-18 11:52:01 +08:00
..
NewCarbon 四灵修改提交 2021-08-25 15:15:50 +08:00
CarbonManager.lua Merge branch 'china/dev' into 0功能/玉虚论道 2021-09-18 11:52:01 +08:00
CarbonManager.lua.meta
CarbonMopUpEndPanel.lua Merge branch 'china/dev-c' into 0功能/silingshilian 2021-05-24 16:39:34 +08:00
CarbonMopUpEndPanel.lua.meta
CarbonScoreSortPanel.lua 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 20:59:26 +08:00
CarbonScoreSortPanel.lua.meta
CarbonTypePanel.lua 【内存】btview可能会导致重复卸载资源的问题 2021-04-22 13:40:04 +08:00
CarbonTypePanel.lua.meta
CarbonTypePanelV2.lua Merge branch 'china/dev' into 0功能/silingshilian 2021-08-06 11:15:13 +08:00
CarbonTypePanelV2.lua.meta
CarbonTypePanelV3.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
CarbonTypePanelV3.lua.meta
DailyCarbonPanel.lua 【战斗校验】山河社稷图,跨服战斗,地图战斗添加战斗校验 2021-09-08 18:27:20 +08:00
DailyCarbonPanel.lua.meta
EliteCarbonAchievePanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
EliteCarbonAchievePanel.lua.meta
EliteCarbonPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
EliteCarbonPanel.lua.meta
EndLessCarbonPanel.lua 【无尽副本】特效穿透提交 2021-08-09 17:35:22 +08:00
EndLessCarbonPanel.lua.meta
MapLeavePanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
MapLeavePanel.lua.meta
MapStatsPanel.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
MapStatsPanel.lua.meta
MinMapPopup.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
MinMapPopup.lua.meta
NewCarbon.meta 【副本】新副本界面开坑 2021-07-06 11:55:21 +08:00
PlotCarbonPanel.lua 【副本】新界面提交 2021-07-06 16:30:58 +08:00
PlotCarbonPanel.lua.meta
PlotRewardPreviewPupop.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
PlotRewardPreviewPupop.lua.meta
TaiChuMiJuanPanel.lua 【太初密卷】修改为拉伸的方式 2021-08-26 16:30:52 +08:00
TaiChuMiJuanPanel.lua.meta 【ID1010059】 2021-08-11 15:15:41 +08:00
TrialCarbonPanel.lua 【副本】新界面提交 2021-07-06 16:30:58 +08:00
TrialCarbonPanel.lua.meta
TrialResetPopup.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
TrialResetPopup.lua.meta
XuanYuanMirrorManager.lua 【战斗校验】山河社稷图,跨服战斗,地图战斗添加战斗校验 2021-09-08 18:27:20 +08:00
XuanYuanMirrorManager.lua.meta
XuanYuanMirrorPanel.lua 【轩辕宝境】从任意一个宝境里返回轩辕宝境主界面,顶部资源条消失 2021-07-24 17:45:48 +08:00
XuanYuanMirrorPanel.lua.meta
XuanYuanMirrorPanelList.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
XuanYuanMirrorPanelList.lua.meta
XuanYuanMirrorRankPopup.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
XuanYuanMirrorRankPopup.lua.meta
XuanYuanMirrorRewardSortPopup.lua 【ios】图片回收 2021-04-21 13:12:04 +08:00
XuanYuanMirrorRewardSortPopup.lua.meta