art_yxc
2018-08-17 ba5acf6132c9554a859e73c417a1d648987bdc6c
荒芜沙漠场景特效修改
2个文件已修改
11个文件已删除
1 文件已复制
9 文件已重命名
15417 ■■■■ 已修改文件
Maps/Model/Map110_Hwsm/Effects/Effect.prefab 14799 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Effect.prefab.meta 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_01.mat 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_01.mat.meta 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_02.mat 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_02.mat.meta 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_03.mat 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_03.mat.meta 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_04.mat 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_04.mat.meta 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_YanHuo_0012.mat 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_YanHuo_0013.mat 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_YanHuo_0013.mat.meta 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_YanHuo_0014.mat 140 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_YanHuo_0014.mat.meta 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Textures/Effect_Hwsm_01.png 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Textures/Effect_Hwsm_01.png.meta 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Textures/Hwsm_fx_001.png 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Textures/Hwsm_fx_001.png.meta 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Textures/Hwsm_fx_002.tga 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Textures/Hwsm_fx_002.tga.meta 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Textures/Hwsm_fx_003.png 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Textures/Hwsm_fx_003.png.meta 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map110_Hwsm/Effects/Effect.prefab
Diff too large
Maps/Model/Map110_Hwsm/Effects/Effect.prefab.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 11a49620848940541b6b989f0117af46
timeCreated: 1503912064
timeCreated: 1534486143
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_01.mat
File was renamed from Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_YanHuo_0011.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Hwsm_fx_YanHuo_0011
  m_Name: Effect_Hwsm_01
  m_Shader: {fileID: 4800000, guid: 2cb8b07796bbb29469fdeb295ba9a3d6, type: 3}
  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
  m_LightmapFlags: 5
@@ -39,9 +39,9 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: eaf85c85ecdcde941b622c520566aa95, type: 3}
        m_Scale: {x: 1, y: 2}
        m_Offset: {x: 0, y: 4.26}
        m_Texture: {fileID: 2800000, guid: a1d8f67bd26b50a43a4717dc826d341d, type: 3}
        m_Scale: {x: 5, y: 5}
        m_Offset: {x: 0, y: 0}
    - _Maintex:
        m_Texture: {fileID: 2800000, guid: 76810e9f325434f458c010004bed5913, type: 3}
        m_Scale: {x: 0.8, y: 1.5}
@@ -51,8 +51,8 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MistTex:
        m_Texture: {fileID: 2800000, guid: ee73a1e1f721b4446a9c0511082163dc, type: 3}
        m_Scale: {x: 3, y: 1}
        m_Texture: {fileID: 2800000, guid: 8fb6606bb73ca7b4bafef5550d507986, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _OcclusionMap:
        m_Texture: {fileID: 0}
@@ -98,6 +98,6 @@
    m_Colors:
    - _Color: {r: 0.011029422, g: 0.375, b: 0.26957402, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _Main_color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
    - _Main_color: {r: 0.5808823, g: 0.38163853, b: 0.20074607, a: 1}
    - _Mist_color: {r: 0.6862745, g: 0.49411768, b: 0.25882354, a: 0.5019608}
    - _TintColor: {r: 1, g: 1, b: 1, a: 0.684}
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_01.mat.meta
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_02.mat
copy from Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_YanHuo_0011.mat copy to Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_02.mat
File was copied from Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_YanHuo_0011.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Hwsm_fx_YanHuo_0011
  m_Name: Effect_Hwsm_02
  m_Shader: {fileID: 4800000, guid: 2cb8b07796bbb29469fdeb295ba9a3d6, type: 3}
  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
  m_LightmapFlags: 5
@@ -39,8 +39,8 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: eaf85c85ecdcde941b622c520566aa95, type: 3}
        m_Scale: {x: 1, y: 2}
        m_Texture: {fileID: 2800000, guid: a1d8f67bd26b50a43a4717dc826d341d, type: 3}
        m_Scale: {x: 5, y: 5}
        m_Offset: {x: 0, y: 4.26}
    - _Maintex:
        m_Texture: {fileID: 2800000, guid: 76810e9f325434f458c010004bed5913, type: 3}
@@ -51,8 +51,8 @@
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MistTex:
        m_Texture: {fileID: 2800000, guid: ee73a1e1f721b4446a9c0511082163dc, type: 3}
        m_Scale: {x: 3, y: 1}
        m_Texture: {fileID: 2800000, guid: 8fb6606bb73ca7b4bafef5550d507986, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _OcclusionMap:
        m_Texture: {fileID: 0}
@@ -79,8 +79,8 @@
    - _MainTex_XPanner: 0.03
    - _MainTex_YPanner: 0.03
    - _Metallic: 0
    - _MistTex_XPanner_copy: 0.2
    - _MistTex_YPanner_copy: 0
    - _MistTex_XPanner_copy: 0.3
    - _MistTex_YPanner_copy: -0.05
    - _Mist_XPanner: -0.03
    - _Mist_YPanner: -0.03
    - _Mode: 3
@@ -98,6 +98,6 @@
    m_Colors:
    - _Color: {r: 0.011029422, g: 0.375, b: 0.26957402, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _Main_color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
    - _Mist_color: {r: 0.6862745, g: 0.49411768, b: 0.25882354, a: 0.5019608}
    - _Main_color: {r: 0.5661765, g: 0.43554246, b: 0.29557744, a: 0.516}
    - _Mist_color: {r: 0.6862745, g: 0.49411768, b: 0.25882354, a: 0.8352941}
    - _TintColor: {r: 1, g: 1, b: 1, a: 0.684}
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_02.mat.meta
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_03.mat
File was renamed from Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_003.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Hwsm_fx_003
  m_Name: Effect_Hwsm_03
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
@@ -19,7 +19,7 @@
    serializedVersion: 3
    m_TexEnvs:
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 74b3ea48b29dae741bf2052f87d1f646, type: 3}
        m_Texture: {fileID: 2800000, guid: ce63e6be0ee623f4babeb9ab1d187010, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Floats:
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_03.mat.meta
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_04.mat
File was renamed from Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_platform_03Glow.mat
@@ -6,7 +6,7 @@
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: Hwsm_platform_03Glow
  m_Name: Effect_Hwsm_04
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
Maps/Model/Map110_Hwsm/Effects/Materials/Effect_Hwsm_04.mat.meta
Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_YanHuo_0012.mat
File was deleted
Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_YanHuo_0013.mat
File was deleted
Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_YanHuo_0013.mat.meta
File was deleted
Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_YanHuo_0014.mat
File was deleted
Maps/Model/Map110_Hwsm/Effects/Materials/Hwsm_fx_YanHuo_0014.mat.meta
File was deleted
Maps/Model/Map110_Hwsm/Effects/Textures/Effect_Hwsm_01.png

Maps/Model/Map110_Hwsm/Effects/Textures/Effect_Hwsm_01.png.meta
Maps/Model/Map110_Hwsm/Effects/Textures/Hwsm_fx_001.png
Binary files differ
Maps/Model/Map110_Hwsm/Effects/Textures/Hwsm_fx_001.png.meta
File was deleted
Maps/Model/Map110_Hwsm/Effects/Textures/Hwsm_fx_002.tga
Binary files differ
Maps/Model/Map110_Hwsm/Effects/Textures/Hwsm_fx_002.tga.meta
File was deleted
Maps/Model/Map110_Hwsm/Effects/Textures/Hwsm_fx_003.png
Binary files differ
Maps/Model/Map110_Hwsm/Effects/Textures/Hwsm_fx_003.png.meta
File was deleted