Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

art_wzw

2018-09-13 8228f63f095e662d9368245b3ad23c1ee94fcdb6

 Effects/UI/Boss_Xiu/Boss_Cx/Texture/Materials/Boss_Xiu_M126_27.mat.meta

copy from Maps/Model/Map010_Mzgc/Mesh/Materials/06 - Default.mat.meta
copy to Effects/UI/Boss_Xiu/Boss_Cx/Texture/Materials/Boss_Xiu_M126_27.mat.meta
File was copied from Maps/Model/Map010_Mzgc/Mesh/Materials/06 - Default.mat.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: e893c3d930f7a7544bd06b1b391330a3
timeCreated: 1536659725
licenseType: Free
guid: 7206436fd1ee7714b9eef132b4b95c1b
timeCreated: 1524794429
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000
  userData: