# 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 |
||
|---|---|---|
| .. | ||
| No Name.mat | ||
| No Name.mat.meta | ||
| No Name_mat2.mat | ||
| No Name_mat2.mat.meta | ||