miduo_client/Assets/ManagedResources/Effects
gaoxin 9c58070aa8 Merge branch 'china/dev-c' into china/dev
# Conflicts:
#	Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
#	Assets/ManagedResources/BG/t_tehuishenzhuang_ditu.png.meta
#	Assets/ManagedResources/DynamicAtlas/s_suoxiangpimi_banner_zh.png.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua
#	Assets/Scripts/Editor/GameEditor/FrameTool/ConfigWindow.cs
2021-07-06 15:27:09 +08:00
..
Animation 【资源】循环引用资源优化 2021-06-10 22:53:11 +08:00
Materials 【资源】玉皇大帝技能显示错误修复 2021-06-22 17:40:41 +08:00
Model 【灵兽山】特效修改 2021-06-28 16:56:26 +08:00
Textures 【资源】循环引用资源优化 2021-06-10 22:53:11 +08:00
Animation.meta 提交 2020-05-09 13:31:21 +08:00
Materials.meta 提交 2020-05-09 13:31:21 +08:00
Model.meta 提交 2020-05-09 13:31:21 +08:00
Textures.meta 提交 2020-05-09 13:31:21 +08:00