art_yxc
2019-05-06 ff19ee18dec0380288ee62e37597beaa3061a2a6
1111 灵草特效修改
3个文件已添加
2 文件已重命名
2个文件已修改
1个文件已删除
16344 ■■■■■ 已修改文件
Maps/Model/Map134_Yams/Effect/Materials/jiantou 2.mat 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map134_Yams/Effect/Materials/jiantou 2.mat.meta 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map141_Lcy/Effect.meta 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map141_Lcy/Effect/Effect.prefab 16175 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map141_Lcy/Effect/Effect.prefab.meta 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map141_Lcy/Mesh/Lcy_shrub_00.FBX.meta 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map141_Lcy/Mesh/Materials/Lcy_building_00.mat 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Scenes/Map141_Lcy.unity 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Maps/Model/Map134_Yams/Effect/Materials/jiantou 2.mat
New file
@@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
  serializedVersion: 6
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_Name: jiantou 2
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords:
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
  stringTagMap: {}
  disabledShaderPasses: []
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 0c1d079d0c399e848b09ce7ebbd1769f, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Floats:
    - _InvFade: 1
    m_Colors:
    - _TintColor: {r: 0.5955882, g: 0.41497862, b: 0.02627594, a: 0.316}
Maps/Model/Map134_Yams/Effect/Materials/jiantou 2.mat.meta
File was renamed from Maps/Model/Map141_Lcy/Mesh/Materials/Lcy_building_00.mat.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 7a33543298217414991b1b5202eb7c4b
timeCreated: 1556439449
guid: 3ebcfc9d8b26fad468c6c167cc0ff715
timeCreated: 1541152904
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 2100000
Maps/Model/Map141_Lcy/Effect.meta
File was renamed from Maps/Model/Map141_Lcy/Mesh/Materials.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 06ac76971cce68542b8b7ce602bba28c
guid: 756597f4eebdd614997f0fec1aaa4a3b
folderAsset: yes
timeCreated: 1556439449
timeCreated: 1557131493
licenseType: Pro
DefaultImporter:
  userData: 
Maps/Model/Map141_Lcy/Effect/Effect.prefab
New file
Diff too large
Maps/Model/Map141_Lcy/Effect/Effect.prefab.meta
New file
@@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: ef76000a84b648740a9cec1a4a5cc49b
timeCreated: 1557132391
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 100100000
  userData:
  assetBundleName:
  assetBundleVariant:
Maps/Model/Map141_Lcy/Mesh/Lcy_shrub_00.FBX.meta
@@ -11,7 +11,7 @@
    3300000: //RootNode
    4300000: Lcy_shrub_00
  materials:
    importMaterials: 1
    importMaterials: 0
    materialName: 0
    materialSearch: 1
  animations:
Maps/Model/Map141_Lcy/Mesh/Materials/Lcy_building_00.mat
File was deleted
Maps/Scenes/Map141_Lcy.unity
@@ -2300,6 +2300,48 @@
  m_UseColorTemperature: 0
  m_ShadowRadius: 0.1
  m_ShadowAngle: 0
--- !u!1001 &181456752
Prefab:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
    - target: {fileID: 4661320279349824, guid: ef76000a84b648740a9cec1a4a5cc49b, type: 2}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4661320279349824, guid: ef76000a84b648740a9cec1a4a5cc49b, type: 2}
      propertyPath: m_LocalPosition.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4661320279349824, guid: ef76000a84b648740a9cec1a4a5cc49b, type: 2}
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4661320279349824, guid: ef76000a84b648740a9cec1a4a5cc49b, type: 2}
      propertyPath: m_LocalRotation.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4661320279349824, guid: ef76000a84b648740a9cec1a4a5cc49b, type: 2}
      propertyPath: m_LocalRotation.y
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4661320279349824, guid: ef76000a84b648740a9cec1a4a5cc49b, type: 2}
      propertyPath: m_LocalRotation.z
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4661320279349824, guid: ef76000a84b648740a9cec1a4a5cc49b, type: 2}
      propertyPath: m_LocalRotation.w
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4661320279349824, guid: ef76000a84b648740a9cec1a4a5cc49b, type: 2}
      propertyPath: m_RootOrder
      value: 3
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: ef76000a84b648740a9cec1a4a5cc49b, type: 2}
  m_IsPrefabParent: 0
--- !u!1001 &202842709
Prefab:
  m_ObjectHideFlags: 0
@@ -19003,8 +19045,9 @@
  - {fileID: 923059646}
  - {fileID: 1884484266}
  - {fileID: 500613134}
  - {fileID: 784238823}
  - {fileID: 783654270}
  - {fileID: 416828640}
  - {fileID: 784238823}
  - {fileID: 430247892}
  - {fileID: 299214029}
  - {fileID: 531814088}
@@ -19019,7 +19062,6 @@
  - {fileID: 1823108462}
  - {fileID: 499416668}
  - {fileID: 1873958484}
  - {fileID: 783654270}
  - {fileID: 1935843111}
  - {fileID: 70299085}
  - {fileID: 2099139689}