Commit Graph

5 Commits (0722edb10767355bd60420fad48c6f2ee7da77a5)

Author SHA1 Message Date
gaoxin 37381da67e 【特效】修复特效贴图过大的问题 2021-09-28 19:35:46 +08:00
yuanshuai 0d31e6b0f8 ,meta 2021-09-18 15:44:09 +08:00
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
ZhangBiao edaacd0e69 重复名资源提交 2021-07-15 17:24:56 +08:00
ZhangBiao e3baabda96 【副本界面】特效提交 2021-07-15 15:25:25 +08:00