miduo_client/Assets/ManagedResources/EffectResUI
ZhangBiao 24ea537bba Merge branch 'master_xma_local' into 0活动开发聚集地/限时神装
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
2021-03-11 15:15:09 +08:00
..
MonsterCasting 【本地化】灵兽技能文字左移 2021-03-07 21:22:23 +08:00
NiuZhuanQianKun 【本地化】牛转钱坤 2021-03-02 14:45:40 +08:00
PokemonEgg 【社稷大典/灵兽】特效资源重新整理 2020-11-01 17:00:39 +08:00
ShaiZi 【社稷大典/灵兽】特效资源重新整理 2020-11-01 17:00:39 +08:00
SheJiDaDian 逍遥游特效修改提交 2021-01-29 18:52:46 +08:00
TimeLimitSkin 【限时神装】 2021-01-15 17:50:43 +08:00
XiangYaoDuoBao Merge branch 'local_to_dev' into xma/dev 2021-03-02 16:44:38 +08:00
YiJingBaoKu 【资源】重名资源修改 2020-11-06 17:56:55 +08:00
MonsterCasting.meta 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
NiuZhuanQianKun.meta 【meta】打包后meta文件上传 2021-03-09 16:04:18 +08:00
PokemonEgg.meta 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
ShaiZi.meta 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
SheJiDaDian.meta 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
TimeLimitSkin.meta 【限时神装】 2021-01-15 17:50:43 +08:00
XiangYaoDuoBao.meta 【meta】打包后meta文件上传 2021-03-09 16:04:18 +08:00
YiJingBaoKu.meta 【meta】打包后meta文件上传 2021-03-09 16:04:18 +08:00