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

art_wzw

2018-10-25 b7d38cd074afde46b28719de69a08bd6711b6223

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

 Role/Fb/Fb_Rz_013/Effects/Effect_Fb_Rz_013.prefab

Diff too large

 Role/Fb/Fb_Rz_013/Effects/Effect_Fb_Rz_013.prefab.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 38553058dfeb30a418185a492773606a
timeCreated: 1532438842
timeCreated: 1540437744
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000

 Role/Fb/Fb_Rz_013/Effects/Materials/4.mat

@@ -75,4 +75,4 @@
    m_Colors:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _TintColor: {r: 0.9117647, g: 0.6008771, b: 0.36202425, a: 0.209}
    - _TintColor: {r: 0.9117647, g: 0.6008771, b: 0.36202425, a: 0.134}