Commit Graph

7 Commits (c266827b4eebc072da0f3f06e67c03eca09af3d1)

Author SHA1 Message Date
gaoxin 37f976e4be 【资源】资源缺失提交 2021-04-28 02:43:24 +08:00
ZhangBiao 30361f5393 【限时活动】调整提交 2021-04-21 11:37:55 +08:00
gaoxin 2c80bc9953 【资源】同名资源文件处理修改 2021-04-19 13:59:01 +08:00
jiaoyangna 92104541fc Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller.meta
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller.meta
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller.meta
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2021-04-16 15:42:39 +08:00
jiaoyangna f91b6f8ca1 资源重复修改提交 2021-04-16 14:53:44 +08:00
JieLing bfce2a542a 【资源】重名文件处理,meta文件提交 2021-04-12 22:06:58 +08:00
wangzhenxing 443ba942cf [功能]================称号功能提交 2021-04-12 16:23:57 +08:00