From 00fa478ca73a8d8a029e31cb054413816697bf5e Mon Sep 17 00:00:00 2001 From: Richard Ott Date: Sat, 1 Sep 2018 19:27:39 +0200 Subject: [PATCH] Smal fixes + cloud/smoke texture --- Assets/Images/Cloud.png | 3 + Assets/Images/Cloud.png.meta | 99 +++++++++++++++++++++++++ Assets/Materials/CloudParticle.mat | 78 +++++++++++++++++++ Assets/Materials/CloudParticle.mat.meta | 8 ++ Assets/Scenes/SampleScene.unity | 82 +++++++++++++++++++- Assets/Scripts/LightLurch.cs | 1 + Assets/Scripts/MateMate.cs | 2 +- 7 files changed, 268 insertions(+), 5 deletions(-) create mode 100644 Assets/Images/Cloud.png create mode 100644 Assets/Images/Cloud.png.meta create mode 100644 Assets/Materials/CloudParticle.mat create mode 100644 Assets/Materials/CloudParticle.mat.meta diff --git a/Assets/Images/Cloud.png b/Assets/Images/Cloud.png new file mode 100644 index 0000000..ae43342 --- /dev/null +++ b/Assets/Images/Cloud.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2edd9586445c54963e51a100b4bdd0e232b36469c831f09bb54cb8434bf4086d +size 112780 diff --git a/Assets/Images/Cloud.png.meta b/Assets/Images/Cloud.png.meta new file mode 100644 index 0000000..25d3d5d --- /dev/null +++ b/Assets/Images/Cloud.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 5c016a4899bbd4a42be1711fc1fba3b6 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/CloudParticle.mat b/Assets/Materials/CloudParticle.mat new file mode 100644 index 0000000..a8d0d6d --- /dev/null +++ b/Assets/Materials/CloudParticle.mat @@ -0,0 +1,78 @@ +%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: CloudParticle + 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: + - _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: 2800000, guid: 5c016a4899bbd4a42be1711fc1fba3b6, type: 3} + 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.5 + - _GlossyReflections: 1 + - _InvFade: 1 + - _Metallic: 0 + - _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: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.11372549} diff --git a/Assets/Materials/CloudParticle.mat.meta b/Assets/Materials/CloudParticle.mat.meta new file mode 100644 index 0000000..0b48043 --- /dev/null +++ b/Assets/Materials/CloudParticle.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66c9f7c2a4e2874419692a479dbe44a9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 36e47c4..427745f 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -35,10 +35,10 @@ RenderSettings: m_DefaultReflectionMode: 0 m_DefaultReflectionResolution: 128 m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 + m_ReflectionIntensity: 0.49 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.3176099, g: 0.35463044, b: 0.41287512, a: 0.49} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -139,7 +139,7 @@ Light: serializedVersion: 8 m_Type: 1 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 + m_Intensity: 0.06 m_Range: 10 m_SpotAngle: 30 m_CookieSize: 10 @@ -558,6 +558,16 @@ Prefab: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 114003328164428386, guid: 8bcf2afca6664234f83b5ee8381b1975, + type: 2} + propertyPath: respawnPoints.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114729016115082176, guid: 8bcf2afca6664234f83b5ee8381b1975, + type: 2} + propertyPath: respawnPoints.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4211561106277860, guid: 8bcf2afca6664234f83b5ee8381b1975, type: 2} propertyPath: m_LocalPosition.x value: -0.23070383 @@ -590,7 +600,38 @@ Prefab: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 114729016115082176, guid: 8bcf2afca6664234f83b5ee8381b1975, + type: 2} + propertyPath: lowerBounds + value: + objectReference: {fileID: 793616629} + - target: {fileID: 114003328164428386, guid: 8bcf2afca6664234f83b5ee8381b1975, + type: 2} + propertyPath: respawnPoints.Array.data[0] + value: + objectReference: {fileID: 1748020841} + - target: {fileID: 114729016115082176, guid: 8bcf2afca6664234f83b5ee8381b1975, + type: 2} + propertyPath: respawnPoints.Array.data[0] + value: + objectReference: {fileID: 1748020841} + - target: {fileID: 114557432824313468, guid: 8bcf2afca6664234f83b5ee8381b1975, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 108062020484346290, guid: 8bcf2afca6664234f83b5ee8381b1975, + type: 2} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114729016115082176, guid: 8bcf2afca6664234f83b5ee8381b1975, + type: 2} + propertyPath: maxFallDist + value: 30 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 114003328164428386, guid: 8bcf2afca6664234f83b5ee8381b1975, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 8bcf2afca6664234f83b5ee8381b1975, type: 2} m_IsPrefabAsset: 0 --- !u!1 &1236060854 @@ -706,6 +747,11 @@ Prefab: propertyPath: cutscene value: objectReference: {fileID: 683171416} + - target: {fileID: 114998550230745890, guid: ee4009de840ac2b42901d59cebc5114a, + type: 2} + propertyPath: mateGlow + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ee4009de840ac2b42901d59cebc5114a, type: 2} m_IsPrefabAsset: 0 @@ -771,6 +817,34 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1748020841 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1748020842} + m_Layer: 0 + m_Name: SpawnPoint1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1748020842 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1748020841} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.69, y: 4.53, z: 2.44} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2030340302 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/LightLurch.cs b/Assets/Scripts/LightLurch.cs index fd6f820..41135ba 100644 --- a/Assets/Scripts/LightLurch.cs +++ b/Assets/Scripts/LightLurch.cs @@ -54,6 +54,7 @@ public class LightLurch : MonoBehaviour { lurchRenderer.material.SetColor("_EmissionColor", lightSource.color * (emissionMultiplier * emissionValue)); emissionValue = baseEmission; lurchRenderer.material.EnableKeyword("_EMISSION"); + lightSource.enabled = true; } // Update is called once per frame diff --git a/Assets/Scripts/MateMate.cs b/Assets/Scripts/MateMate.cs index fbcf974..ef55377 100644 --- a/Assets/Scripts/MateMate.cs +++ b/Assets/Scripts/MateMate.cs @@ -31,7 +31,7 @@ public class MateMate : MonoBehaviour { other.transform.root.GetComponentInChildren().canGlide = true; if(mateGlow) - //other.transform.root.GetComponentInChildren().canGlide = true; + other.transform.root.GetComponentInChildren().enabled = true; cutscene.SetActive(true); }