miduo_client/Assets/ManagedResources/Prefabs
zhangqiang e38c766348 Merge branch '0功能/跨服天梯' into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua
#	Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua
#	Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua
2020-12-26 11:45:20 +08:00
..
Effect Merge branch 'master_xma_local' into master_develop 2020-11-04 16:18:35 +08:00
Live2d Merge branch '0活动开发聚集地/新将活动3个' into master_develop 2020-12-23 15:27:52 +08:00
Map 去除宝箱黑色框 2020-08-31 10:40:23 +08:00
UI Merge branch '0功能/跨服天梯' into master_develop 2020-12-26 11:45:20 +08:00
Effect.meta 提交 2020-05-09 13:31:21 +08:00
Live2d.meta 每次销毁界面时清理一次不用的资源,界面打开音效配置添加 2020-09-04 10:03:35 +08:00
Map.meta 提交 2020-05-09 13:31:21 +08:00
UI.meta 提交 2020-05-09 13:31:21 +08:00