miduo_client/Assets/ManagedResources/~Lua/Modules/Carbon
xiejun c47462c5d8 Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-09-20 18:57:44 +08:00
..
NewCarbon 副本UI 2023-09-02 18:53:21 +08:00
CarbonManager.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
CarbonManager.lua.meta
CarbonMopUpEndPanel.lua 【装备界面】提交 2021-11-09 10:22:16 +08:00
CarbonMopUpEndPanel.lua.meta
CarbonScoreSortPanel.lua
CarbonScoreSortPanel.lua.meta
CarbonTypePanel.lua
CarbonTypePanel.lua.meta
CarbonTypePanelV2.lua 【ID1011007】 2022-01-06 11:30:35 +08:00
CarbonTypePanelV2.lua.meta
CarbonTypePanelV3.lua
CarbonTypePanelV3.lua.meta
ChallengeCopyPanel.lua 御灵 2023-09-02 17:16:34 +08:00
ChallengeCopyPanel.lua.meta 挑战副本相关脚本提交 2022-04-14 16:07:45 +08:00
DailyCarbonPanel.lua Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-09-20 18:57:44 +08:00
DailyCarbonPanel.lua.meta
EliteCarbonAchievePanel.lua
EliteCarbonAchievePanel.lua.meta
EliteCarbonPanel.lua
EliteCarbonPanel.lua.meta
EndLessCarbonPanel.lua 【无尽副本】优化清除缓存第一次进入无尽副本时任务状态错误 2022-01-19 18:32:43 +08:00
EndLessCarbonPanel.lua.meta
MapLeavePanel.lua
MapLeavePanel.lua.meta
MapStatsPanel.lua
MapStatsPanel.lua.meta
MinMapPopup.lua
MinMapPopup.lua.meta
NewCarbon.meta
PlotCarbonPanel.lua
PlotCarbonPanel.lua.meta
PlotRewardPreviewPupop.lua
PlotRewardPreviewPupop.lua.meta
TaiChuMiJuanPanel.lua
TaiChuMiJuanPanel.lua.meta
TrialCarbonPanel.lua
TrialCarbonPanel.lua.meta
TrialResetPopup.lua
TrialResetPopup.lua.meta
XuanYuanMirrorManager.lua 修改 2023-09-01 18:27:39 +08:00
XuanYuanMirrorManager.lua.meta
XuanYuanMirrorPanel.lua 修改 2023-09-01 18:27:39 +08:00
XuanYuanMirrorPanel.lua.meta
XuanYuanMirrorPanelList.lua Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo 2023-09-20 18:57:44 +08:00
XuanYuanMirrorPanelList.lua.meta
XuanYuanMirrorRankPopup.lua
XuanYuanMirrorRankPopup.lua.meta
XuanYuanMirrorRewardSortPopup.lua
XuanYuanMirrorRewardSortPopup.lua.meta