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

art_wzw

2018-11-24 72c8c61c6ac5eddfb74075c374e4931aa00c1155

 Effects/ShenBing/Zs/BaoJi/Texture/Ef_ZsBaoJi_002.png.meta

copy from Effects/ShenBing/Zs/HunDun/Texture/04.png.meta
copy to Effects/ShenBing/Zs/BaoJi/Texture/Ef_ZsBaoJi_002.png.meta
File was copied from Effects/ShenBing/Zs/HunDun/Texture/04.png.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: e25fb5ec3b37e224cb85d4b7d0ad6009
timeCreated: 1541765933
licenseType: Pro
guid: 9efba3731c3b0c448b86e62dfec14a21
timeCreated: 1542779859
licenseType: Free
TextureImporter:
  fileIDToRecycleName: {}
  serializedVersion: 4