miduo_client/Assets/ManagedResources/PublicArtRes
DESKTOP-98AVA47\Administrator 4bd4f1f483 Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-15 16:24:35 +08:00
..
Animations 首充修改提交 2021-06-26 15:15:27 +08:00
Materials 【称号】优化称号在老包中的显示 2021-06-08 11:04:11 +08:00
Models 【修行】特效导入 2021-05-27 17:40:54 +08:00
Shaders Merge branch '0功能/玲珑宝镜' into china/dev 2021-07-15 16:24:35 +08:00
Textures 【十五日登录】提交 2021-04-06 12:07:03 +08:00
Animations.meta 提交 2020-05-09 13:31:21 +08:00
Materials.meta 提交 2020-05-09 13:31:21 +08:00
Models.meta 提交 2020-05-09 13:31:21 +08:00
Shaders.meta 提交 2020-05-09 13:31:21 +08:00
Textures.meta 提交 2020-05-09 13:31:21 +08:00