Commit Graph

7 Commits (7551842ba783f26808dbf18635f4b7292a92e0fa)

Author SHA1 Message Date
JieLing 55ab6b992e Merge branch 'china/dev' into china/test
# Conflicts:
#	Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Textures/Fx_tex_os4_ani_017.png.meta
#	Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png.meta
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-07-26 10:20:29 +08:00
JieLing 7116d9137d 【心魔试炼】资源丢失 资源冲突解决提交 2021-07-23 18:54:10 +08:00
wangzhenxing 02cea65055 [称号]====跨服称号资源提交 2021-07-23 11:20:05 +08:00
ZhangBiao edaacd0e69 重复名资源提交 2021-07-15 17:24:56 +08:00
ZhangBiao e3baabda96 【副本界面】特效提交 2021-07-15 15:25:25 +08:00
gaoxin 87b221b621 新技能特效添加 2020-07-23 10:23:33 +08:00
jiaoyangna e15bf9a7b2 轩辕宝镜资源提交 2020-07-15 16:27:58 +08:00