From 1458745b33b2c6689df5c0e3adb20b0faa2e4c18 Mon Sep 17 00:00:00 2001 From: tigerchen Date: Thu, 12 Dec 2019 19:18:54 +0800 Subject: [PATCH] adjust vfx --- .../Assets/Materials/IceMaterial.mat | 259 ------------------ .../Assets/Materials/IceMaterial.mat.meta | 8 - .../Assets/Scenes/Ice.unity | 137 ++++----- .../Ice_Profiles/PostProcessing Profile.asset | 23 -- .../Assets/Textures/camera_tex.renderTexture | 4 +- .../Visual Effect Graphs/iceVFX_2018.vfx | 138 +++------- .../Packages/manifest.json | 1 + 7 files changed, 90 insertions(+), 480 deletions(-) delete mode 100644 01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Materials/IceMaterial.mat delete mode 100644 01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Materials/IceMaterial.mat.meta diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Materials/IceMaterial.mat b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Materials/IceMaterial.mat deleted file mode 100644 index c1afbf2..0000000 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Materials/IceMaterial.mat +++ /dev/null @@ -1,259 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: IceMaterial - m_Shader: {fileID: -6465566751694194690, guid: 1d9d5de04d4e7c6448d3b02f278f937f, - type: 3} - m_ShaderKeywords: - m_LightmapFlags: 1 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 1 - m_CustomRenderQueue: -1 - stringTagMap: - MotionVector: User - disabledShaderPasses: - - MOTIONVECTORS - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AnisotropyMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BaseColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BentNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BentNormalMapOS: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _CoatMaskMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DistortionVectorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissiveColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _HeightMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescenceMaskMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescenceThicknessMap: - 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} - - _MaskMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMapOS: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SampleTexture2D_389513AD_Texture_1: - m_Texture: {fileID: 2800000, guid: 958cfbda296458c4faf115404e562d73, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SampleTexture2D_983A7761_Texture_1: - m_Texture: {fileID: 2800000, guid: fbfffb30efcdb1543aeb718469e1e665, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SampleTexture2D_FE2D9A8D_Texture_1: - m_Texture: {fileID: 2800000, guid: 558da6be0a1233a42a24cb5d92e04037, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecularColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SubsurfaceMaskMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TangentMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TangentMapOS: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ThicknessMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TransmittanceColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - Vector1_30AC6A9E: -0.32 - - _AORemapMax: 1 - - _AORemapMin: 0 - - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - - _AlbedoAffectEmissive: 0 - - _AlphaCutoff: 0.5 - - _AlphaCutoffEnable: 0 - - _AlphaCutoffPostpass: 0.5 - - _AlphaCutoffPrepass: 0.5 - - _AlphaCutoffShadow: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _Anisotropy: 0 - - _BlendMode: 0 - - _CoatMask: 0 - - _CullMode: 2 - - _CullModeForward: 2 - - _Cutoff: 0.5 - - _DepthOffsetEnable: 0 - - _DetailAlbedoScale: 1 - - _DetailNormalScale: 1 - - _DetailSmoothnessScale: 1 - - _DiffusionProfile: 0 - - _DiffusionProfileHash: 0 - - _DisplacementLockObjectScale: 1 - - _DisplacementLockTilingScale: 1 - - _DisplacementMode: 0 - - _DistortionBlendMode: 0 - - _DistortionBlurBlendMode: 0 - - _DistortionBlurDstBlend: 0 - - _DistortionBlurRemapMax: 1 - - _DistortionBlurRemapMin: 0 - - _DistortionBlurScale: 1 - - _DistortionBlurSrcBlend: 0 - - _DistortionDepthTest: 1 - - _DistortionDstBlend: 0 - - _DistortionEnable: 0 - - _DistortionScale: 1 - - _DistortionSrcBlend: 0 - - _DistortionVectorBias: -1 - - _DistortionVectorScale: 2 - - _DoubleSidedEnable: 0 - - _DoubleSidedNormalMode: 1 - - _DstBlend: 0 - - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - - _EnableBlendModePreserveSpecularLighting: 1 - - _EnableFogOnTransparent: 1 - - _EnableGeometricSpecularAA: 0 - - _EnableSpecularOcclusion: 0 - - _EnergyConservingSpecularColor: 1 - - _HdrpVersion: 2 - - _HeightAmplitude: 0.02 - - _HeightCenter: 0.5 - - _HeightMapParametrization: 0 - - _HeightMax: 1 - - _HeightMin: -1 - - _HeightOffset: 0 - - _HeightPoMAmplitude: 2 - - _HeightTessAmplitude: 2 - - _HeightTessCenter: 0.5 - - _InvTilingScale: 1 - - _Ior: 1 - - _IridescenceMask: 1 - - _IridescenceThickness: 1 - - _LinkDetailsWithBase: 1 - - _MaterialID: 1 - - _Metallic: 0 - - _NormalMapSpace: 0 - - _NormalScale: 1 - - _PPDLodThreshold: 5 - - _PPDMaxSamples: 15 - - _PPDMinSamples: 5 - - _PPDPrimitiveLength: 1 - - _PPDPrimitiveWidth: 1 - - _ReceivesSSR: 1 - - _RefractionModel: 0 - - _SSRefractionProjectionModel: 0 - - _Smoothness: 0.5 - - _SmoothnessRemapMax: 1 - - _SmoothnessRemapMin: 0 - - _SpecularAAScreenSpaceVariance: 0.1 - - _SpecularAAThreshold: 0.2 - - _SrcBlend: 1 - - _StencilRef: 2 - - _StencilRefDepth: 0 - - _StencilRefDistortionVec: 64 - - _StencilRefGBuffer: 2 - - _StencilRefMV: 128 - - _StencilWriteMask: 3 - - _StencilWriteMaskDepth: 32 - - _StencilWriteMaskDistortionVec: 64 - - _StencilWriteMaskGBuffer: 3 - - _StencilWriteMaskMV: 128 - - _SubsurfaceMask: 1 - - _SupportDecals: 1 - - _SurfaceType: 0 - - _TexWorldScale: 1 - - _TexWorldScaleEmissive: 1 - - _Thickness: 1 - - _ThicknessMultiplier: 1 - - _TransmissionEnable: 1 - - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - - _TransparentDepthPostpassEnable: 0 - - _TransparentDepthPrepassEnable: 0 - - _TransparentSortPriority: 0 - - _TransparentWritingMotionVec: 0 - - _UVBase: 0 - - _UVDetail: 0 - - _UVEmissive: 0 - - _UseEmissiveIntensity: 0 - - _UseShadowThreshold: 0 - - _ZTestDepthEqualForOpaque: 4 - - _ZTestGBuffer: 4 - - _ZTestModeDistortion: 8 - - _ZTestTransparent: 4 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1} - - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Materials/IceMaterial.mat.meta b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Materials/IceMaterial.mat.meta deleted file mode 100644 index 9c272dd..0000000 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Materials/IceMaterial.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4ee0f7411bbeb1143a41f5c02d37677b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scenes/Ice.unity b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scenes/Ice.unity index 457f2e4..7722400 100644 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scenes/Ice.unity +++ b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scenes/Ice.unity @@ -130,7 +130,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &229411702 MonoBehaviour: m_ObjectHideFlags: 0 @@ -275,7 +275,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &396373727 GameObject: @@ -371,7 +371,7 @@ RectTransform: - {fileID: 1269857429} - {fileID: 1048552606} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -470,6 +470,7 @@ GameObject: - component: {fileID: 590248852} - component: {fileID: 590248853} - component: {fileID: 590248855} + - component: {fileID: 590248851} m_Layer: 8 m_Name: MainCamera m_TagString: MainCamera @@ -517,7 +518,7 @@ Camera: serializedVersion: 2 m_Bits: 4294967295 m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: 50e0f911f359d4746b586e8c5d6cfa82, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 @@ -535,7 +536,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 590248846} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0.7, y: 5.5, z: 0} + m_LocalPosition: {x: 0, y: 5.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -555,7 +556,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Version: 1 clearColorMode: 1 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + backgroundColorHDR: {r: 0, g: 0, b: 0, a: 0} clearDepth: 1 renderingPath: 0 volumeLayerMask: @@ -609,6 +610,19 @@ MonoBehaviour: enableFptlForForwardOpaque: 1 enableBigTilePrepass: 1 isFptlEnabled: 1 +--- !u!114 &590248851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590248846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: babbc0676431b324c96a829292898563, type: 3} + m_Name: + m_EditorClassIdentifier: + tex: {fileID: 0} --- !u!82 &590248852 AudioSource: m_ObjectHideFlags: 0 @@ -869,7 +883,7 @@ Transform: m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &940676729 GameObject: @@ -883,13 +897,14 @@ GameObject: - component: {fileID: 940676732} - component: {fileID: 940676731} - component: {fileID: 940676730} + - component: {fileID: 940676734} m_Layer: 0 m_Name: MonitorCamera m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &940676730 MonoBehaviour: m_ObjectHideFlags: 0 @@ -903,8 +918,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Version: 1 - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} + clearColorMode: 1 + backgroundColorHDR: {r: 0, g: 0, b: 0, a: 0} clearDepth: 1 renderingPath: 0 volumeLayerMask: @@ -991,7 +1006,7 @@ Camera: near clip plane: 0.3 far clip plane: 1000 field of view: 60 - orthographic: 1 + orthographic: 0 orthographic size: 5 m_Depth: 0 m_CullingMask: @@ -1020,8 +1035,21 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!114 &940676734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 940676729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: babbc0676431b324c96a829292898563, type: 3} + m_Name: + m_EditorClassIdentifier: + tex: {fileID: 0} --- !u!1 &1048552605 GameObject: m_ObjectHideFlags: 0 @@ -1269,7 +1297,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1090188929 MonoBehaviour: @@ -1330,8 +1358,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_ExecuteInEditor: 1 m_Bindings: - - {fileID: 1090188929} - {fileID: 1090188931} + - {fileID: 1090188929} - {fileID: 1090188930} m_VisualEffect: {fileID: 1090188927} --- !u!114 &1090188933 @@ -1375,7 +1403,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1216109996 RectTransform: m_ObjectHideFlags: 0 @@ -1384,7 +1412,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1216109995} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 578} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 396373731} @@ -1407,7 +1435,7 @@ MonoBehaviour: m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -1628,7 +1656,7 @@ Transform: m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1326070362 PrefabInstance: @@ -1675,7 +1703,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1824,7 +1852,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1674836082 GameObject: @@ -1854,7 +1882,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1794519316 GameObject: @@ -1964,7 +1992,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4601478661674938, guid: 6143453941a05b54582f835773a10d58, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4601478661674938, guid: 6143453941a05b54582f835773a10d58, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1980,69 +2008,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6143453941a05b54582f835773a10d58, type: 3} ---- !u!1 &1937584649 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1937584652} - - component: {fileID: 1937584651} - - component: {fileID: 1937584650} - m_Layer: 0 - m_Name: Scene Settings - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1937584650 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1937584649} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 441482e8936e35048a1dffac814e3ef8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Profile: {fileID: 11400000, guid: 61403f0eeedb6b84fafb386b66e1edae, type: 2} - m_BakingSkyUniqueID: 0 ---- !u!114 &1937584651 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1937584649} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: - isGlobal: 1 - priority: 0 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: 61403f0eeedb6b84fafb386b66e1edae, type: 2} ---- !u!4 &1937584652 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1937584649} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2032731583 GameObject: m_ObjectHideFlags: 0 @@ -2132,5 +2097,5 @@ Transform: m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scenes/Ice_Profiles/PostProcessing Profile.asset b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scenes/Ice_Profiles/PostProcessing Profile.asset index 47fb0ec..7fef509 100644 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scenes/Ice_Profiles/PostProcessing Profile.asset +++ b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Scenes/Ice_Profiles/PostProcessing Profile.asset @@ -16,7 +16,6 @@ MonoBehaviour: - {fileID: 114769904971952996} - {fileID: 114277786280399880} - {fileID: 114759790931544378} - - {fileID: 114436081672504764} --- !u!114 &114277786280399880 MonoBehaviour: m_ObjectHideFlags: 3 @@ -1328,28 +1327,6 @@ MonoBehaviour: - 0.5 - 0.5 - 0.5 ---- !u!114 &114436081672504764 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b94fcd11afffcb142908bfcb1e261fba, type: 3} - m_Name: MotionBlur - m_EditorClassIdentifier: - active: 1 - enabled: - overrideState: 1 - value: 1 - shutterAngle: - overrideState: 0 - value: 270 - sampleCount: - overrideState: 1 - value: 4 --- !u!114 &114759790931544378 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Textures/camera_tex.renderTexture b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Textures/camera_tex.renderTexture index 1ec6388..076c7e0 100644 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Textures/camera_tex.renderTexture +++ b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Textures/camera_tex.renderTexture @@ -14,9 +14,9 @@ RenderTexture: m_DownscaleFallback: 0 m_Width: 1920 m_Height: 1200 - m_AntiAliasing: 4 + m_AntiAliasing: 1 m_DepthFormat: 2 - m_ColorFormat: 8 + m_ColorFormat: 22 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 1 diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Visual Effect Graphs/iceVFX_2018.vfx b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Visual Effect Graphs/iceVFX_2018.vfx index 91a6e13..3293e22 100644 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Visual Effect Graphs/iceVFX_2018.vfx +++ b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Assets/Visual Effect Graphs/iceVFX_2018.vfx @@ -243,10 +243,10 @@ MonoBehaviour: categories: [] uiBounds: serializedVersion: 2 - x: -1524 + x: -1499 y: -422 - width: 4568 - height: 3714 + width: 4543 + height: 3743 --- !u!114 &114350483966674976 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1750,19 +1750,19 @@ VisualEffectResource: * 0x4 + 0x2740) << 2,asuint(position));\n attributeBuffer.Store((index * 0x2 + 0xC440) << 2,asuint(age));\n attributeBuffer.Store((index * 0x2 + 0xC441) << 2,uint(alive));\n attributeBuffer.Store((index - * 0x1 + 0x112C0) << 2,asuint(particleId));\n \n\n }\n#else\n + * 0x4 + 0x2743) << 2,asuint(particleId));\n \n\n }\n#else\n \ uint index = particleIndex;\n attributeBuffer.Store((index * 0x1 + 0x0) << 2,asuint(lifetime));\n attributeBuffer.Store3((index * 0x4 + 0x2740) << 2,asuint(position));\n attributeBuffer.Store((index * 0x2 + 0xC440) << 2,asuint(age));\n attributeBuffer.Store((index * 0x2 - + 0xC441) << 2,uint(alive));\n attributeBuffer.Store((index * 0x1 + 0x112C0) + + 0xC441) << 2,uint(alive));\n attributeBuffer.Store((index * 0x4 + 0x2743) << 2,asuint(particleId));\n \n\n#endif\n }\n}\n" - compute: 0 name: '[ground flake]Quad Output' source: "Shader \"Hidden/VFX/ground flake/Quad Output\"\n{\n\tSubShader\n\t{\t\n\t\tCull Off\n\t\t\n\t\tTags { \"Queue\"=\"Transparent\" \"IgnoreProjector\"=\"True\" \"RenderType\"=\"Transparent\" }\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\t\n\t\tBlend - SrcAlpha OneMinusSrcAlpha\n\t\tZTest LEqual\n\t\tZWrite Off\n\t\tCull Off\n\t\t\n\t\n\t\t\t\n\t\tHLSLINCLUDE\n\t\t#if + SrcAlpha One\n\t\tZTest LEqual\n\t\tZWrite Off\n\t\tCull Off\n\t\t\n\t\n\t\t\t\n\t\tHLSLINCLUDE\n\t\t#if !defined(VFX_WORLD_SPACE) && !defined(VFX_LOCAL_SPACE)\n\t\t#define VFX_LOCAL_SPACE 1\n\t\t#endif\n\t\t\n\t\t#include \"HLSLSupport.cginc\"\n\t\t#define NB_THREADS_PER_GROUP 64\n\t\t#define VFX_USE_LIFETIME_CURRENT 1\n\t\t#define VFX_USE_POSITION_CURRENT @@ -1774,14 +1774,14 @@ VisualEffectResource: VFX_USE_PIVOTY_CURRENT 1\n\t\t#define VFX_USE_PIVOTZ_CURRENT 1\n\t\t#define VFX_USE_SIZE_CURRENT 1\n\t\t#define VFX_USE_SCALEX_CURRENT 1\n\t\t#define VFX_USE_SCALEY_CURRENT 1\n\t\t#define VFX_USE_SCALEZ_CURRENT 1\n\t\t#define VFX_USE_PARTICLEID_CURRENT - 1\n\t\t#define VFX_BLENDMODE_ALPHA 1\n\t\t#define VFX_HAS_INDIRECT_DRAW 1\n\t\t#define - USE_DEAD_LIST_COUNT 1\n\t\t\n\t\t\n\t\t\n\t\t#define VFX_LOCAL_SPACE 1\n\t\t\n\n\t\tCBUFFER_START(parameters)\n\t\t - \ float4 Alpha_d;\n\t\t float uniform_b;\n\t\t float uniform_c;\n\t\t - \ float uniform_d;\n\t\t float uniform_f;\n\t\t float uniform_g;\n\t\t - \ float uniform_h;\n\t\t float uniform_i;\n\t\t uint PADDING_0;\n\t\tCBUFFER_END\n\t\tTexture2D - mainTexture;\n\t\tSamplerState samplermainTexture;\n\t\t\n\n\t\t\n\t\t#define - VFX_NEEDS_COLOR_INTERPOLATOR (VFX_USE_COLOR_CURRENT || VFX_USE_ALPHA_CURRENT)\n\t\t#define - IS_TRANSPARENT_PARTICLE (!IS_OPAQUE_PARTICLE)\n\t\t\n\t\t#include \"Packages/com.unity.visualeffectgraph/Shaders/RenderPipeline/HDRP/VFXGlobalDefines.cginc\"\n\t\t\n\n\t\t\n\t\tByteAddressBuffer + 1\n\t\t#define VFX_BLENDMODE_ADD 1\n\t\t\n\t\t\n\t\t\n\t\t#define VFX_LOCAL_SPACE + 1\n\t\t\n\n\t\tCBUFFER_START(parameters)\n\t\t float4 Alpha_d;\n\t\t float + uniform_b;\n\t\t float uniform_c;\n\t\t float uniform_d;\n\t\t float + uniform_f;\n\t\t float uniform_g;\n\t\t float uniform_h;\n\t\t float + uniform_i;\n\t\t uint PADDING_0;\n\t\tCBUFFER_END\n\t\tTexture2D mainTexture;\n\t\tSamplerState + samplermainTexture;\n\t\t\n\n\t\t\n\t\t#define VFX_NEEDS_COLOR_INTERPOLATOR + (VFX_USE_COLOR_CURRENT || VFX_USE_ALPHA_CURRENT)\n\t\t#define IS_TRANSPARENT_PARTICLE + (!IS_OPAQUE_PARTICLE)\n\t\t\n\t\t#include \"Packages/com.unity.visualeffectgraph/Shaders/RenderPipeline/HDRP/VFXGlobalDefines.cginc\"\n\t\t\n\n\t\t\n\t\tByteAddressBuffer attributeBuffer;\t\n\t\t\n\t\t#if VFX_HAS_INDIRECT_DRAW\n\t\tStructuredBuffer indirectBuffer;\t\n\t\t#endif\t\n\t\t\n\t\t#if USE_DEAD_LIST_COUNT\n\t\tByteAddressBuffer deadListCount;\n\t\t#endif\n\t\t\n\t\tCBUFFER_START(outputParams)\n\t\t\tfloat @@ -1840,7 +1840,7 @@ VisualEffectResource: pivotZ = (float)0;\n\t\t\t\t\t\tfloat size = (float)0.1;\n\t\t\t\t\t\tfloat scaleX = (float)1;\n\t\t\t\t\t\tfloat scaleY = (float)1;\n\t\t\t\t\t\tfloat scaleZ = (float)1;\n\t\t\t\t\t\tuint particleId = (attributeBuffer.Load((index - * 0x1 + 0x112C0) << 2));\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t#else\n\t\t\t\t\t\tbool + * 0x4 + 0x2743) << 2));\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t#else\n\t\t\t\t\t\tbool alive = (attributeBuffer.Load((index * 0x2 + 0xC441) << 2));\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\tif (!alive)\n\t\t\t\t\t\t\treturn o;\n\t\t\t\t\t\t\t\n\t\t\t\t\t\tfloat lifetime = asfloat(attributeBuffer.Load((index * 0x1 + 0x0) << 2));\n\t\t\t\t\t\tfloat3 @@ -1854,7 +1854,7 @@ VisualEffectResource: pivotZ = (float)0;\n\t\t\t\t\t\tfloat size = (float)0.1;\n\t\t\t\t\t\tfloat scaleX = (float)1;\n\t\t\t\t\t\tfloat scaleY = (float)1;\n\t\t\t\t\t\tfloat scaleZ = (float)1;\n\t\t\t\t\t\tuint particleId = (attributeBuffer.Load((index - * 0x1 + 0x112C0) << 2));\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t#endif\n\t\t\t\t\t\t\n\t\t\t\t{\n\t\t\t\t + * 0x4 + 0x2743) << 2));\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t#endif\n\t\t\t\t\t\t\n\t\t\t\t{\n\t\t\t\t \ Orient_4( /*inout */axisX, /*inout */axisY, /*inout */axisZ, float3(0,1,0), float3(1,0,0));\n\t\t\t\t}\n\t\t\t\t{\n\t\t\t\t float tmp_bf = FixedRand(particleId ^ asuint(uniform_c));\n\t\t\t\t float tmp_bg = tmp_bf * uniform_d;\n\t\t\t\t @@ -1909,9 +1909,9 @@ VisualEffectResource: name: '[ground flake]Update' source: "#pragma kernel CSMain\n#include \"HLSLSupport.cginc\"\n#define NB_THREADS_PER_GROUP 64\n#define VFX_USE_LIFETIME_CURRENT 1\n#define VFX_USE_AGE_CURRENT 1\n#define - VFX_USE_ALIVE_CURRENT 1\n#define VFX_HAS_INDIRECT_DRAW 1\n#define VFX_LOCAL_SPACE - 1\n\n\nCBUFFER_START(parameters)\n float uniform_b;\n float uniform_c;\n - \ float deltaTime_b;\n uint PADDING_0;\nCBUFFER_END\n\n\n#include \"Packages/com.unity.visualeffectgraph/Shaders/Common/VFXCommonCompute.cginc\"\n#include + VFX_USE_ALIVE_CURRENT 1\n#define VFX_LOCAL_SPACE 1\n\n\nCBUFFER_START(parameters)\n + \ float uniform_b;\n float uniform_c;\n float deltaTime_b;\n uint + PADDING_0;\nCBUFFER_END\n\n\n#include \"Packages/com.unity.visualeffectgraph/Shaders/Common/VFXCommonCompute.cginc\"\n#include \"Packages/com.unity.visualeffectgraph/Shaders/VFXCommon.cginc\"\n\n\n\nRWByteAddressBuffer attributeBuffer;\n\n#if VFX_USE_ALIVE_CURRENT\nRWStructuredBuffer deadListOut;\n#endif\n\n#if VFX_HAS_INDIRECT_DRAW\nRWStructuredBuffer indirectBuffer;\n#endif\n\nCBUFFER_START(updateParams)\n @@ -2099,27 +2099,6 @@ VisualEffectResource: wPos = position;\n#endif\n\t\tfloat3 camToPos = wPos - cameraPosition;\n\t\t\n\t\tKvp kvp;\n\t\tkvp.sortKey = dot(camToPos,camToPos); // sqr distance to the camera\n\t\tkvp.index = index;\n\n\t\toutputBuffer[id] = kvp;\n\t}\n}\n" - - compute: 1 - name: '[ground flake]CameraSort' - source: "#pragma kernel CSMain\n#include \"HLSLSupport.cginc\"\n#define NB_THREADS_PER_GROUP - 64\n#define VFX_USE_POSITION_CURRENT 1\n#define USE_DEAD_LIST_COUNT 1\n#define - VFX_LOCAL_SPACE 1\n\n\nCBUFFER_START(parameters)\n float4x4 localToWorld;\nCBUFFER_END\n\n\n#include - \"Packages/com.unity.visualeffectgraph/Shaders/Common/VFXCommonCompute.cginc\"\n#include - \"Packages/com.unity.visualeffectgraph/Shaders/VFXCommon.cginc\"\n\n\n\nCBUFFER_START(params)\n - \ uint nbMax;\n uint dispatchWidth;\nCBUFFER_END\n\nCBUFFER_START(cameraParams)\n - \ float3 cameraPosition;\nCBUFFER_END\n\nByteAddressBuffer attributeBuffer;\nStructuredBuffer - inputBuffer;\n\n#if USE_DEAD_LIST_COUNT\nByteAddressBuffer deadListCount;\n#endif\n\nstruct - Kvp\n{\n\tfloat sortKey;\n\tuint index;\n};\n\nRWStructuredBuffer outputBuffer;\n\n[numthreads(NB_THREADS_PER_GROUP,1,1)]\nvoid - CSMain(uint3 groupId : SV_GroupID,\n uint3 groupThreadId - \ : SV_GroupThreadID)\n{\n\tuint threshold = nbMax;\n#if USE_DEAD_LIST_COUNT\n\tthreshold - -= deadListCount.Load(0);\n#endif\n\tuint id = groupThreadId.x + groupId.x * - NB_THREADS_PER_GROUP + groupId.y * dispatchWidth * NB_THREADS_PER_GROUP;\n\tif - (id < threshold)\n\t{\n\t\tuint index = inputBuffer[id];\n\t\tfloat3 position - = asfloat(attributeBuffer.Load3((index * 0x4 + 0x2740) << 2));\n\t\t\n\n\t\t\n#if - VFX_LOCAL_SPACE\n\t\tfloat3 wPos = mul(localToWorld,float4(position,1.0f)).xyz;\n#else\n\t\tfloat3 - wPos = position;\n#endif\n\t\tfloat3 camToPos = wPos - cameraPosition;\n\t\t\n\t\tKvp - kvp;\n\t\tkvp.sortKey = dot(camToPos,camToPos); // sqr distance to the camera\n\t\tkvp.index - = index;\n\n\t\toutputBuffer[id] = kvp;\n\t}\n}\n" m_Infos: m_Expressions: m_Expressions: @@ -3500,7 +3479,7 @@ VisualEffectResource: capacity: 10000 stride: 4 - type: 1 - size: 80336 + size: 70240 layout: - name: lifetime type: 1 @@ -3514,6 +3493,12 @@ VisualEffectResource: bucket: 10048 structure: 4 element: 0 + - name: particleId + type: 6 + offset: + bucket: 10048 + structure: 4 + element: 3 - name: age type: 1 offset: @@ -3526,12 +3511,6 @@ VisualEffectResource: bucket: 50240 structure: 2 element: 1 - - name: particleId - type: 6 - offset: - bucket: 70336 - structure: 1 - element: 0 capacity: 10000 stride: 4 - type: 1 @@ -3674,7 +3653,7 @@ VisualEffectResource: capacity: 0 stride: 8 - type: 1 - size: 80384 + size: 70336 layout: - name: lifetime type: 1 @@ -3688,6 +3667,12 @@ VisualEffectResource: bucket: 10048 structure: 4 element: 0 + - name: particleId + type: 6 + offset: + bucket: 10048 + structure: 4 + element: 3 - name: age type: 1 offset: @@ -3700,12 +3685,6 @@ VisualEffectResource: bucket: 50240 structure: 2 element: 1 - - name: particleId - type: 6 - offset: - bucket: 70336 - structure: 1 - element: 0 capacity: 10048 stride: 4 - type: 1 @@ -3729,21 +3708,6 @@ VisualEffectResource: layout: [] capacity: 0 stride: 4 - - type: 4 - size: 10000 - layout: [] - capacity: 0 - stride: 4 - - type: 0 - size: 10000 - layout: [] - capacity: 0 - stride: 8 - - type: 0 - size: 10000 - layout: [] - capacity: 0 - stride: 8 m_CPUBuffers: - capacity: 1 stride: 1 @@ -4114,7 +4078,7 @@ VisualEffectResource: processor: {fileID: 0} shaderSourceIndex: 9 - type: 1 - flags: 3 + flags: 1 capacity: 10000 layer: 4294967295 buffers: @@ -4128,12 +4092,6 @@ VisualEffectResource: index: 17 - nameId: spawner_input index: 1 - - nameId: indirectBuffer - index: 18 - - nameId: sortBufferA - index: 19 - - nameId: sortBufferB - index: 20 values: - nameId: bounds_center index: 110 @@ -4178,8 +4136,6 @@ VisualEffectResource: index: 2 - nameId: deadListOut index: 16 - - nameId: indirectBuffer - index: 18 values: - nameId: uniform_b index: 69 @@ -4190,30 +4146,10 @@ VisualEffectResource: params: [] processor: {fileID: 0} shaderSourceIndex: 8 - - type: 805306369 - buffers: - - nameId: attributeBuffer - index: 2 - - nameId: inputBuffer - index: 18 - - nameId: outputBuffer - index: 19 - - nameId: deadListCount - index: 17 - values: - - nameId: localToWorld - index: 127 - params: [] - processor: {fileID: 0} - shaderSourceIndex: 11 - type: 1073741826 buffers: - nameId: attributeBuffer index: 2 - - nameId: indirectBuffer - index: 18 - - nameId: deadListCount - index: 17 values: - nameId: uniform_b index: 46 @@ -4236,8 +4172,6 @@ VisualEffectResource: params: - nameId: sortPriority index: 0 - - nameId: indirectDraw - index: 1 processor: {fileID: 0} shaderSourceIndex: 7 --- !u!114 &8926484042661614530 @@ -11357,7 +11291,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Parent: {fileID: 114350483966674976} m_Children: [] - m_UIPosition: {x: 881, y: 2559} + m_UIPosition: {x: 838, y: 2542} m_UICollapsed: 0 m_UISuperCollapsed: 1 m_InputSlots: [] @@ -18073,7 +18007,7 @@ MonoBehaviour: slotIndex: 0 m_OutputFlowSlot: - link: [] - blendMode: 1 + blendMode: 0 cullMode: 0 zWriteMode: 0 zTestMode: 0 diff --git a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/manifest.json b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/manifest.json index 65afd7d..f9758c8 100644 --- a/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/manifest.json +++ b/01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/manifest.json @@ -11,6 +11,7 @@ "com.unity.postprocessing": "2.1.7", "com.unity.purchasing": "2.0.3", "com.unity.render-pipelines.high-definition": "4.10.0-preview", + "com.unity.shadergraph": "4.10.0-preview", "com.unity.textmeshpro": "1.4.1", "com.unity.visualeffectgraph": "4.10.0-preview", "jp.keijiro.klak.spout": "file:/../../../../../_Package/KlakSpout",