art_wzw
2018-08-25 829c5de1ca29a6c7ff632e3c503fd3182f00d39d
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
4个文件已修改
2个文件已添加
7287 ■■■■■ 已修改文件
Effects/BossBuff/JingJieYaZhi/Materials/10.mat 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/JingJieYaZhi/Prefab_Race_JingJieYZ.prefab 7272 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/JingJieYaZhi/Prefab_Race_JingJieYZ.prefab.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Role/A_Zs_Cb01/Materials/A_Zs_Cb01.png 补丁 | 查看 | 原始文档 | blame | 历史
Role/A_Zs_Cb01/Materials/A_Zs_Cb01_addTex_01.png 补丁 | 查看 | 原始文档 | blame | 历史
Role/A_Zs_Cb01/Materials/A_Zs_Cb01_glowTex_01.png 补丁 | 查看 | 原始文档 | blame | 历史
Effects/BossBuff/JingJieYaZhi/Materials/10.mat
@@ -48,8 +48,8 @@
        m_Offset: {x: 0, y: 0}
    - _NoiseTex:
        m_Texture: {fileID: 2800000, guid: aef06e5e563764048872e4523ffdbfbb, type: 3}
        m_Scale: {x: 1, y: -0.8}
        m_Offset: {x: 0, y: -0.07}
        m_Scale: {x: 1, y: -0.6}
        m_Offset: {x: 0, y: -0.15}
    - _OcclusionMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
@@ -71,7 +71,7 @@
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
    - _RollTimeX: 1
    - _RollTimeX: 0.5
    - _RollTimeY: -0.5
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
Effects/BossBuff/JingJieYaZhi/Prefab_Race_JingJieYZ.prefab
New file
Diff too large
Effects/BossBuff/JingJieYaZhi/Prefab_Race_JingJieYZ.prefab.meta
New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 3c23a16a20aea154ca801fc9e756def0
timeCreated: 1535095506
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: -1
  userData:
  assetBundleName:
  assetBundleVariant:
Role/A_Zs_Cb01/Materials/A_Zs_Cb01.png

Role/A_Zs_Cb01/Materials/A_Zs_Cb01_addTex_01.png

Role/A_Zs_Cb01/Materials/A_Zs_Cb01_glowTex_01.png