浏览代码

Deleting Vlad's waves and updating my own

/main
John OReilly 6 年前
当前提交
11ab0ead
共有 6 个文件被更改,包括 168 次插入728 次删除
  1. 332
      Assets/Materials/Shader_WavesBasic.ShaderGraph
  2. 153
      Assets/Scenes/Scene_TextureUnityTip.unity
  3. 87
      Assets/VladwWaves.mat
  4. 8
      Assets/VladwWaves.mat.meta
  5. 306
      Assets/Waves.ShaderGraph
  6. 10
      Assets/Waves.ShaderGraph.meta

332
Assets/Materials/Shader_WavesBasic.ShaderGraph
文件差异内容过多而无法显示
查看文件

153
Assets/Scenes/Scene_TextureUnityTip.unity


debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &74557315
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 400000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
propertyPath: m_LocalPosition.x
value: -13.31
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
propertyPath: m_LocalPosition.z
value: 7.94
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
propertyPath: m_RootOrder
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2300000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 015b03120e5f08a4d86a9323b9acd75e, type: 2}
- target: {fileID: 400000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
propertyPath: m_LocalScale.x
value: 0.38535616
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
propertyPath: m_LocalScale.y
value: 0.38535616
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
propertyPath: m_LocalScale.z
value: 0.38535616
objectReference: {fileID: 0}
- target: {fileID: 100000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
propertyPath: m_Name
value: Fbx_Plane200 (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5b9e6d66ca498ec48b9f44c7b5cbeb0a, type: 3}
m_IsPrefabAsset: 0
--- !u!1 &277585722
GameObject:
m_ObjectHideFlags: 0

m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 14
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &653260035
GameObject:

m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a889b4865483a8d489a4358a6cdca1ee, type: 3}
m_IsPrefabAsset: 0
--- !u!1 &979977815
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 979977819}
- component: {fileID: 979977818}
- component: {fileID: 979977817}
- component: {fileID: 979977816}
m_Layer: 0
m_Name: Plane
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!64 &979977816
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 979977815}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 3
m_Convex: 0
m_CookingOptions: 14
m_SkinWidth: 0.01
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &979977817
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 979977815}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 2100000, guid: 015b03120e5f08a4d86a9323b9acd75e, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &979977818
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 979977815}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &979977819
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 979977815}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -20.517138, y: -0.22155836, z: 11.743978}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1028827115
Prefab:
m_ObjectHideFlags: 0

m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1759333298
GameObject:

87
Assets/VladwWaves.mat


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: VladwWaves
m_Shader: {fileID: 4800000, guid: e45a2ff24fe4e2b40bc3479c723640a3, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Vector1_215955D3: 10
- Vector1_CEE8295C: 1
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

8
Assets/VladwWaves.mat.meta


fileFormatVersion: 2
guid: 015b03120e5f08a4d86a9323b9acd75e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

306
Assets/Waves.ShaderGraph
文件差异内容过多而无法显示
查看文件

10
Assets/Waves.ShaderGraph.meta


fileFormatVersion: 2
guid: e45a2ff24fe4e2b40bc3479c723640a3
ScriptedImporter:
fileIDToRecycleName:
4800000: MainAsset
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
正在加载...
取消
保存