diff --git a/Assets/Models.meta b/Assets/Images.meta similarity index 77% rename from Assets/Models.meta rename to Assets/Images.meta index 2b3ed45..c0b433d 100644 --- a/Assets/Models.meta +++ b/Assets/Images.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 681795e0efcef2f49b1daca1f3fa92ab +guid: 9c7a48c32b1629748933235962fbf113 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Images/1200px-Spotted_Salamander.jpg b/Assets/Images/1200px-Spotted_Salamander.jpg new file mode 100644 index 0000000..9792357 --- /dev/null +++ b/Assets/Images/1200px-Spotted_Salamander.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fc977391cb3813eee28a9ccf0c3d758f4cdea0648297990afb117f97ec9fe45 +size 70141 diff --git a/Assets/Images/1200px-Spotted_Salamander.jpg.meta b/Assets/Images/1200px-Spotted_Salamander.jpg.meta new file mode 100644 index 0000000..97f274f --- /dev/null +++ b/Assets/Images/1200px-Spotted_Salamander.jpg.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 42242cbb99690e141ae45601f72bf188 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + 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/Images/145900e22ca2f82b532ed29ac10b8609.jpg b/Assets/Images/145900e22ca2f82b532ed29ac10b8609.jpg new file mode 100644 index 0000000..28946e5 --- /dev/null +++ b/Assets/Images/145900e22ca2f82b532ed29ac10b8609.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34faed5ebf9faaa8b38e2cf10123b6591a57a6156f711722f554ca9588193005 +size 30088 diff --git a/Assets/Images/145900e22ca2f82b532ed29ac10b8609.jpg.meta b/Assets/Images/145900e22ca2f82b532ed29ac10b8609.jpg.meta new file mode 100644 index 0000000..811ce54 --- /dev/null +++ b/Assets/Images/145900e22ca2f82b532ed29ac10b8609.jpg.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 62c8fb3fcb39a1f4888f1ac24de5d6ef +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + 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/Images/160125-nabu-bergmolch-frank-derer3.jpeg b/Assets/Images/160125-nabu-bergmolch-frank-derer3.jpeg new file mode 100644 index 0000000..07973e9 --- /dev/null +++ b/Assets/Images/160125-nabu-bergmolch-frank-derer3.jpeg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf23ecd832fb615e12911cf3fc237275d3e32db87037f3dad46e1a0711d761f7 +size 65072 diff --git a/Assets/Images/160125-nabu-bergmolch-frank-derer3.jpeg.meta b/Assets/Images/160125-nabu-bergmolch-frank-derer3.jpeg.meta new file mode 100644 index 0000000..cd9ba60 --- /dev/null +++ b/Assets/Images/160125-nabu-bergmolch-frank-derer3.jpeg.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 03b60390d00be624099655e780f6f0f3 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + 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/Images/lurch-55239f68-e219-4378-a5f1-b67935159248.jpg b/Assets/Images/lurch-55239f68-e219-4378-a5f1-b67935159248.jpg new file mode 100644 index 0000000..26d920b --- /dev/null +++ b/Assets/Images/lurch-55239f68-e219-4378-a5f1-b67935159248.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81aeee2c4a7d2f77371711a76ad1965dbec73c96d1912d0a5d21d5ae6898113f +size 24294 diff --git a/Assets/Images/lurch-55239f68-e219-4378-a5f1-b67935159248.jpg.meta b/Assets/Images/lurch-55239f68-e219-4378-a5f1-b67935159248.jpg.meta new file mode 100644 index 0000000..639b7df --- /dev/null +++ b/Assets/Images/lurch-55239f68-e219-4378-a5f1-b67935159248.jpg.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 82c3cd09dd9fe5c4897a02712c694dbd +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + 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/MateSticky.mat b/Assets/Materials/MateSticky.mat new file mode 100644 index 0000000..7a62567 --- /dev/null +++ b/Assets/Materials/MateSticky.mat @@ -0,0 +1,76 @@ +%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: MateSticky + 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.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.3160963, g: 1, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/MateSticky.mat.meta b/Assets/Materials/MateSticky.mat.meta new file mode 100644 index 0000000..0d9a864 --- /dev/null +++ b/Assets/Materials/MateSticky.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff427efe044b7a442b1cfad6cc7eb9cd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Lurch.prefab b/Assets/Prefabs/Lurch.prefab index 23d35c1..20e454e 100644 --- a/Assets/Prefabs/Lurch.prefab +++ b/Assets/Prefabs/Lurch.prefab @@ -271,7 +271,7 @@ MonoBehaviour: fullyChargedColor: {r: 0.95649004, g: 0, b: 1, a: 0} normalSize: {x: 0, y: 0, z: 0} chargedSizeModifier: 0.5 - canStick: 1 + canStick: 0 cooldown: 0 - canGlide: 1 + canGlide: 0 glideForce: 3 diff --git a/Assets/Prefabs/Lurch_Mate.prefab b/Assets/Prefabs/Lurch_Mate.prefab new file mode 100644 index 0000000..2ca6e81 --- /dev/null +++ b/Assets/Prefabs/Lurch_Mate.prefab @@ -0,0 +1,143 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 0} + m_RootGameObject: {fileID: 1170736131268492} + m_IsPrefabAsset: 1 +--- !u!1 &1170736131268492 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4181691760578354} + - component: {fileID: 33120098320787614} + - component: {fileID: 23525098815683870} + - component: {fileID: 65561962252700638} + - component: {fileID: 54800564157605212} + - component: {fileID: 65310278326310722} + - component: {fileID: 114998550230745890} + m_Layer: 0 + m_Name: Lurch_Mate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4181691760578354 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1170736131268492} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.28, y: 0.288, z: -1.967} + m_LocalScale: {x: 1, y: 0.6, z: 2} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23525098815683870 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1170736131268492} + 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: ff427efe044b7a442b1cfad6cc7eb9cd, 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 &33120098320787614 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1170736131268492} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!54 &54800564157605212 +Rigidbody: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1170736131268492} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &65310278326310722 +BoxCollider: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1170736131268492} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 0.45734257, z: 1} + m_Center: {x: 0, y: -0.27132872, z: 0} +--- !u!65 &65561962252700638 +BoxCollider: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1170736131268492} + 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!114 &114998550230745890 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1170736131268492} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70076831801618547a292c354b3bba38, type: 3} + m_Name: + m_EditorClassIdentifier: + mateStick: 1 + mateGlide: 1 + mateGlow: 0 + cutscene: {fileID: 0} diff --git a/Assets/Prefabs/Lurch_Mate.prefab.meta b/Assets/Prefabs/Lurch_Mate.prefab.meta new file mode 100644 index 0000000..1a5ff5d --- /dev/null +++ b/Assets/Prefabs/Lurch_Mate.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee4009de840ac2b42901d59cebc5114a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ef7c6eb..36e47c4 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -351,6 +351,119 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &683171416 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 683171420} + - component: {fileID: 683171419} + - component: {fileID: 683171418} + - component: {fileID: 683171417} + - component: {fileID: 683171421} + m_Layer: 5 + m_Name: Cutscene_Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &683171417 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 683171416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &683171418 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 683171416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &683171419 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 683171416} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &683171420 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 683171416} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1236060855} + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &683171421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 683171416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 719609795ac17cf44ae9bbe0f5137724, type: 3} + m_Name: + m_EditorClassIdentifier: + theSprites: + - {fileID: 21300000, guid: 42242cbb99690e141ae45601f72bf188, type: 3} + - {fileID: 21300000, guid: 82c3cd09dd9fe5c4897a02712c694dbd, type: 3} + - {fileID: 21300000, guid: 03b60390d00be624099655e780f6f0f3, type: 3} + - {fileID: 21300000, guid: 62c8fb3fcb39a1f4888f1ac24de5d6ef, type: 3} + theBase: {fileID: 1236060856} + speed: 0.4 --- !u!1 &793616625 GameObject: m_ObjectHideFlags: 0 @@ -477,19 +590,187 @@ Prefab: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - - target: {fileID: 114123996009525022, guid: 8bcf2afca6664234f83b5ee8381b1975, - type: 2} - propertyPath: canGlide - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114123996009525022, guid: 8bcf2afca6664234f83b5ee8381b1975, - type: 2} - propertyPath: glideForce - value: 3 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bcf2afca6664234f83b5ee8381b1975, type: 2} m_IsPrefabAsset: 0 +--- !u!1 &1236060854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1236060855} + - component: {fileID: 1236060857} + - component: {fileID: 1236060856} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1236060855 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1236060854} + 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: 683171420} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 300, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1236060856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1236060854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1236060857 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1236060854} + m_CullTransparentMesh: 0 +--- !u!1001 &1537558739 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4181691760578354, guid: ee4009de840ac2b42901d59cebc5114a, type: 2} + propertyPath: m_LocalPosition.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 4181691760578354, guid: ee4009de840ac2b42901d59cebc5114a, type: 2} + propertyPath: m_LocalPosition.y + value: 0.288 + objectReference: {fileID: 0} + - target: {fileID: 4181691760578354, guid: ee4009de840ac2b42901d59cebc5114a, type: 2} + propertyPath: m_LocalPosition.z + value: -1.967 + objectReference: {fileID: 0} + - target: {fileID: 4181691760578354, guid: ee4009de840ac2b42901d59cebc5114a, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4181691760578354, guid: ee4009de840ac2b42901d59cebc5114a, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4181691760578354, guid: ee4009de840ac2b42901d59cebc5114a, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4181691760578354, guid: ee4009de840ac2b42901d59cebc5114a, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4181691760578354, guid: ee4009de840ac2b42901d59cebc5114a, type: 2} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 114998550230745890, guid: ee4009de840ac2b42901d59cebc5114a, + type: 2} + propertyPath: cutscene + value: + objectReference: {fileID: 683171416} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ee4009de840ac2b42901d59cebc5114a, type: 2} + m_IsPrefabAsset: 0 +--- !u!1 &1646461585 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1646461588} + - component: {fileID: 1646461587} + - component: {fileID: 1646461586} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1646461586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1646461585} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1646461587 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1646461585} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1646461588 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1646461585} + 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: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2030340302 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script.meta b/Assets/Scripts.meta similarity index 100% rename from Assets/Script.meta rename to Assets/Scripts.meta diff --git a/Assets/Scripts/CutscenePlayer.cs b/Assets/Scripts/CutscenePlayer.cs new file mode 100644 index 0000000..ba5085a --- /dev/null +++ b/Assets/Scripts/CutscenePlayer.cs @@ -0,0 +1,38 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class CutscenePlayer : MonoBehaviour { + + public Sprite[] theSprites; + public Image theBase; + public float speed = 1.0f; + private float TUNS = 0.0f; + private int i = 0; + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + if (i < theSprites.Length + 1) { + if (Time.time > TUNS) + { + i += 1; + + if(i < theSprites.Length) + theBase.sprite = theSprites[i]; + + TUNS = Time.time + speed; + } + } + else + { + this.gameObject.SetActive(false); + } + } +} diff --git a/Assets/Scripts/CutscenePlayer.cs.meta b/Assets/Scripts/CutscenePlayer.cs.meta new file mode 100644 index 0000000..d2b12a7 --- /dev/null +++ b/Assets/Scripts/CutscenePlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 719609795ac17cf44ae9bbe0f5137724 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/LurchMovement.cs b/Assets/Scripts/LurchMovement.cs similarity index 94% rename from Assets/Script/LurchMovement.cs rename to Assets/Scripts/LurchMovement.cs index d85c385..95b44ea 100644 --- a/Assets/Script/LurchMovement.cs +++ b/Assets/Scripts/LurchMovement.cs @@ -192,14 +192,16 @@ public class LurchMovement : MonoBehaviour { bool AmSticking() { - RaycastHit hit; - if (Physics.Raycast(theLurch.position, theLurch.forward, out hit, 1.4f)) - { - return true; - } - if (lurchBody.isKinematic) - { - return true; + if (canStick) { + RaycastHit hit; + if (Physics.Raycast(theLurch.position, theLurch.forward, out hit, 1.4f)) + { + return true; + } + if (lurchBody.isKinematic) + { + return true; + } } return false; diff --git a/Assets/Script/LurchMovement.cs.meta b/Assets/Scripts/LurchMovement.cs.meta similarity index 100% rename from Assets/Script/LurchMovement.cs.meta rename to Assets/Scripts/LurchMovement.cs.meta diff --git a/Assets/Script/LurchRespawn.cs b/Assets/Scripts/LurchRespawn.cs similarity index 100% rename from Assets/Script/LurchRespawn.cs rename to Assets/Scripts/LurchRespawn.cs diff --git a/Assets/Script/LurchRespawn.cs.meta b/Assets/Scripts/LurchRespawn.cs.meta similarity index 100% rename from Assets/Script/LurchRespawn.cs.meta rename to Assets/Scripts/LurchRespawn.cs.meta diff --git a/Assets/Scripts/MateMate.cs b/Assets/Scripts/MateMate.cs new file mode 100644 index 0000000..fbcf974 --- /dev/null +++ b/Assets/Scripts/MateMate.cs @@ -0,0 +1,39 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MateMate : MonoBehaviour { + + public bool mateStick; + public bool mateGlide; + public bool mateGlow; + + public GameObject cutscene; + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } + + private void OnTriggerEnter(Collider other) + { + if (other.transform.root.GetComponentInChildren()) + { + if(mateStick) + other.transform.root.GetComponentInChildren().canStick = true; + + if(mateGlide) + other.transform.root.GetComponentInChildren().canGlide = true; + + if(mateGlow) + //other.transform.root.GetComponentInChildren().canGlide = true; + + cutscene.SetActive(true); + } + } +} diff --git a/Assets/Scripts/MateMate.cs.meta b/Assets/Scripts/MateMate.cs.meta new file mode 100644 index 0000000..9f2c8fc --- /dev/null +++ b/Assets/Scripts/MateMate.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 70076831801618547a292c354b3bba38 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: