miduo_client/Assets/ManagedResources/PublicArtRes
gaoxin 357a27c100 Merge remote-tracking branch 'origin/剧情' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wzs.jpg.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-04-26 19:03:05 +08:00
..
Animations 【五星成长礼】添加箭头动画 2021-03-30 21:23:42 +08:00
Materials Merge remote-tracking branch 'origin/剧情' into china/dev 2021-04-26 19:03:05 +08:00
Models 剧情提交 2021-04-26 09:41:41 +08:00
Shaders [功能]==========聊天称号特效显示修改 2021-04-23 14:46:37 +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