diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index 4d50356..56c9997 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -190,7 +190,6 @@ GameObject: - component: {fileID: 151858422} - component: {fileID: 151858421} - component: {fileID: 151858426} - - component: {fileID: 151858425} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -261,22 +260,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &151858425 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 151858420} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} - m_Name: - m_EditorClassIdentifier: - sharedProfile: {fileID: 11400000, guid: 79182fbaf32faca4ca265d09dbd05840, type: 2} - isGlobal: 1 - blendDistance: 0 - weight: 1 - priority: 0 --- !u!114 &151858426 MonoBehaviour: m_ObjectHideFlags: 0 @@ -457,7 +440,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &343589998 GameObject: @@ -573,6 +556,129 @@ MonoBehaviour: uniformBuffer: {fileID: 441718966} cosineGradient: {fileID: 11400000, guid: 2138651e11178d04ba510ef9164baf46, type: 2} debug: +--- !u!1 &368967883 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 368967886} + - component: {fileID: 368967885} + - component: {fileID: 368967884} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &368967884 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 368967883} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 368967886} + volumeLayer: + serializedVersion: 2 + m_Bits: 4294967295 + stopNaNPropagation: 1 + antialiasingMode: 2 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 0 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: [] +--- !u!20 &368967885 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 368967883} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: 3 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 1 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 1 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &368967886 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 368967883} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.08047724, y: 0.520406, z: -0.95207787} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &386695295 GameObject: m_ObjectHideFlags: 0 @@ -620,7 +726,7 @@ Transform: - {fileID: 850228141} - {fileID: 1848145250} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &401185750 GameObject: @@ -652,7 +758,7 @@ Transform: - {fileID: 1579390333} - {fileID: 343589999} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &438615021 GameObject: @@ -866,7 +972,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: e20b89084b5b51a4aab2baf40768af49, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -918,7 +1024,65 @@ Transform: m_LocalScale: {x: 2, y: 2, z: 2} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &618046638 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 618046641} + - component: {fileID: 618046640} + - component: {fileID: 618046639} + m_Layer: 0 + m_Name: Post-process Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &618046639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 618046638} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + m_Name: + m_EditorClassIdentifier: + sharedProfile: {fileID: 11400000, guid: 79182fbaf32faca4ca265d09dbd05840, type: 2} + isGlobal: 1 + blendDistance: 0 + weight: 1 + priority: 0 +--- !u!65 &618046640 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 618046638} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!4 &618046641 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 618046638} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1.5566128} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &732632614 GameObject: @@ -952,7 +1116,7 @@ Transform: - {fileID: 1375512056} - {fileID: 1924148041} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &774429922 Prefab: @@ -1373,7 +1537,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 5, y: -30, z: 0} --- !u!1 &1196719910 GameObject: diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Ground.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Ground.mat new file mode 100644 index 0000000..52b9352 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Ground.mat @@ -0,0 +1,76 @@ +%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: Ground + m_Shader: {fileID: 46, 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: + - _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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.522 + - _GlossyReflections: 1 + - _Metallic: 0.414 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 0.9019608} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Ground.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Material/Ground.mat.meta new file mode 100644 index 0000000..c9c7c26 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Ground.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e20b89084b5b51a4aab2baf40768af49 +timeCreated: 1519781121 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/Snowflake.mat b/Unity_2018_Frozen/Assets/Frozen/Material/Snowflake.mat index eca2ca6..0a00373 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Material/Snowflake.mat +++ b/Unity_2018_Frozen/Assets/Frozen/Material/Snowflake.mat @@ -41,7 +41,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: b7b95dd54aad284499b5eb8ae14f1a6e, type: 3} + m_Texture: {fileID: 2800000, guid: f59ee687c02517e45819a3f0bcf97b7f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -64,7 +64,7 @@ Material: - _CameraNearFadeDistance: 1 - _ColorMode: 0 - _Cull: 0 - - _Cutoff: 0.408 + - _Cutoff: 0.068 - _DetailNormalMapScale: 1 - _DistortionBlend: 0.5 - _DistortionEnabled: 0 @@ -74,10 +74,10 @@ Material: - _EmissionEnabled: 0 - _FlipbookMode: 0 - _GlossMapScale: 1 - - _Glossiness: 0.342 + - _Glossiness: 0.501 - _GlossyReflections: 1 - _LightingEnabled: 1 - - _Metallic: 0.846 + - _Metallic: 0 - _Mode: 1 - _OcclusionStrength: 1 - _Parallax: 0.02 @@ -91,7 +91,7 @@ Material: - _ZWrite: 1 m_Colors: - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 7.763, g: 7.763, b: 7.763, a: 1} + - _Color: {r: 5.153, g: 5.153, b: 5.153, a: 1} - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.787, g: 0.787, b: 0.787, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} diff --git a/Unity_2018_Frozen/Assets/Frozen/ParticleUniforms.asset b/Unity_2018_Frozen/Assets/Frozen/ParticleUniforms.asset index 521afd3..2859616 100644 --- a/Unity_2018_Frozen/Assets/Frozen/ParticleUniforms.asset +++ b/Unity_2018_Frozen/Assets/Frozen/ParticleUniforms.asset @@ -13,13 +13,13 @@ MonoBehaviour: m_EditorClassIdentifier: numRate: 1 movement: 1 - geomSize: 0.079 + geomSize: 0.037 velocityDamping: 1 lifeDuration: 0 lifeVariation: 0 - convergence: 0.082 - homeStrength: 0 - noiseStrength: 0.064 + convergence: 0.053 + homeStrength: 0.116 + noiseStrength: 0.126 noiseSeed: 0.5 noiseTimeScale: 1 noiseFrequency: 0.29 diff --git a/Unity_2018_Frozen/Assets/Frozen/PostProcessingProfile.asset b/Unity_2018_Frozen/Assets/Frozen/PostProcessingProfile.asset index 0abf6c6..578de02 100644 --- a/Unity_2018_Frozen/Assets/Frozen/PostProcessingProfile.asset +++ b/Unity_2018_Frozen/Assets/Frozen/PostProcessingProfile.asset @@ -33,10 +33,10 @@ MonoBehaviour: value: 1 intensity: overrideState: 1 - value: 1 + value: 3 threshold: - overrideState: 0 - value: 1 + overrideState: 1 + value: 1.1 softKnee: overrideState: 0 value: 0.5 @@ -56,8 +56,8 @@ MonoBehaviour: overrideState: 1 value: {fileID: 2800000, guid: 3884f7a2d04ffe8409ad9200b275896f, type: 3} dirtIntensity: - overrideState: 0 - value: 0 + overrideState: 1 + value: 1 --- !u!114 &114157877957889540 MonoBehaviour: m_ObjectHideFlags: 3 @@ -345,7 +345,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a34fa72bd4185749832024e9c8010bf, type: 3} m_Name: ScreenSpaceReflections m_EditorClassIdentifier: - active: 1 + active: 0 enabled: overrideState: 1 value: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Snowflake.png b/Unity_2018_Frozen/Assets/Frozen/Texture/Snowflake.png deleted file mode 100644 index 773553c..0000000 Binary files a/Unity_2018_Frozen/Assets/Frozen/Texture/Snowflake.png and /dev/null differ diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Snowflake.tif b/Unity_2018_Frozen/Assets/Frozen/Texture/Snowflake.tif new file mode 100644 index 0000000..5c06d62 Binary files /dev/null and b/Unity_2018_Frozen/Assets/Frozen/Texture/Snowflake.tif differ diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/Snowflake.png.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/Snowflake.tif.meta similarity index 95% rename from Unity_2018_Frozen/Assets/Frozen/Texture/Snowflake.png.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/Snowflake.tif.meta index 5bd014b..4873d43 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/Snowflake.png.meta +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/Snowflake.tif.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: b7b95dd54aad284499b5eb8ae14f1a6e -timeCreated: 1519742554 +guid: f59ee687c02517e45819a3f0bcf97b7f +timeCreated: 1519781342 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -47,7 +47,7 @@ TextureImporter: spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0