miduo_client/Assets/ManagedResources/~Lua/Modules/FightLevel
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
..
View [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +08:00
ArenaTrialPanel.lua 【ID1011205】 2022-03-02 17:48:52 +08:00
ArenaTrialPanel.lua.meta 【ID1010829】 2021-12-08 14:03:23 +08:00
FightLevelChapterPanel.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
FightLevelChapterPanel.lua.meta
FightLevelManager.lua 山河设计图添加开服时间限制 2023-06-02 16:09:28 +08:00
FightLevelManager.lua.meta
FightLevelOpenChapterPopup.lua
FightLevelOpenChapterPopup.lua.meta
FightLevelSingleChapterPanel.lua 新预制体已经公会和活动ui 2023-08-28 11:34:43 +08:00
FightLevelSingleChapterPanel.lua.meta
FightLevelSingleLevelInfoPopup.lua 【界面优化】提交 2021-11-02 14:31:18 +08:00
FightLevelSingleLevelInfoPopup.lua.meta
FightLevelTrialPanel.lua 山河试炼活动报错修改 2022-03-22 13:38:59 +08:00
FightLevelTrialPanel.lua.meta
View.meta