From 48194276a7ee75577d2caddafb71b053888ed276 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 30 Jan 2022 13:26:52 +1100 Subject: [PATCH 1/4] Platform mover --- .../Chars/Moose Angel/face_mask_0.png.meta | 144 ------------------ Assets/Scenes/Level 2.unity | 4 +- Assets/Scenes/WalljumpTest.unity | 4 +- Assets/Scripts/PlatformMover.cs | 30 ++++ Assets/Scripts/PlatformMover.cs.meta | 11 ++ 5 files changed, 45 insertions(+), 148 deletions(-) delete mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta create mode 100644 Assets/Scripts/PlatformMover.cs create mode 100644 Assets/Scripts/PlatformMover.cs.meta diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta deleted file mode 100644 index 3203616..0000000 --- a/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta +++ /dev/null @@ -1,144 +0,0 @@ -fileFormatVersion: 2 -guid: 59dd813e4bd61114da8ecacf6b2f6061 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - 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 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 2 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index 208efde..7425011 100644 --- a/Assets/Scenes/Level 2.unity +++ b/Assets/Scenes/Level 2.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eca0f48288f2244de93949aafed1a6fb1269abd1dba6ec53d13194cf3b9c7a00 -size 440802 +oid sha256:688956b336ae1fe48d882f2e73ecb64b54790f9bc2eb21aa0e228bf9ec0b770d +size 444596 diff --git a/Assets/Scenes/WalljumpTest.unity b/Assets/Scenes/WalljumpTest.unity index 98c09f1..3f6890f 100644 --- a/Assets/Scenes/WalljumpTest.unity +++ b/Assets/Scenes/WalljumpTest.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74dadf0e7abae9aa3eb00726859b73a50e45d849720fc434d3a27f6faf54b6b6 -size 1728849 +oid sha256:3b53772d9a9f66ad6819f67005db77162cb086ebf7bc819d3d73d1f0af8ea4fb +size 1740290 diff --git a/Assets/Scripts/PlatformMover.cs b/Assets/Scripts/PlatformMover.cs new file mode 100644 index 0000000..cd91b60 --- /dev/null +++ b/Assets/Scripts/PlatformMover.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlatformMover : MonoBehaviour +{ + [SerializeField] private Transform m_StartPos; + [SerializeField] private Transform m_EndPos; + [SerializeField] private float m_Duration = 2f; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + transform.position = Vector2.Lerp(m_StartPos.position, m_EndPos.position, Mathf.PingPong(Time.deltaTime * m_Duration, 1.0f)); + } + +#if UNITY_EDITOR + private void OnDrawGizmos() + { + Gizmos.color = Color.green; + Gizmos.DrawLine(m_StartPos.position, m_EndPos.position); + } +#endif +} diff --git a/Assets/Scripts/PlatformMover.cs.meta b/Assets/Scripts/PlatformMover.cs.meta new file mode 100644 index 0000000..c648773 --- /dev/null +++ b/Assets/Scripts/PlatformMover.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e37b7702510697041a7ae1a25956385b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From a5a31d0962fede90f6d2123a92bb84cfd4c4d964 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 30 Jan 2022 13:34:43 +1100 Subject: [PATCH 2/4] Moving platforms fixed Level 2 ground fixed --- Assets/Scenes/Level 2.unity | 4 ++-- Assets/Scripts/PlatformMover.cs | 2 +- Assets/Variables/Runtime/freezePlayer.asset | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index 7425011..6de99e9 100644 --- a/Assets/Scenes/Level 2.unity +++ b/Assets/Scenes/Level 2.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:688956b336ae1fe48d882f2e73ecb64b54790f9bc2eb21aa0e228bf9ec0b770d -size 444596 +oid sha256:a682cca83f7ccc5ce655eccc527b7dfc5712f70e820adde94bb3da99407916dc +size 442128 diff --git a/Assets/Scripts/PlatformMover.cs b/Assets/Scripts/PlatformMover.cs index cd91b60..a088f83 100644 --- a/Assets/Scripts/PlatformMover.cs +++ b/Assets/Scripts/PlatformMover.cs @@ -17,7 +17,7 @@ public class PlatformMover : MonoBehaviour // Update is called once per frame void Update() { - transform.position = Vector2.Lerp(m_StartPos.position, m_EndPos.position, Mathf.PingPong(Time.deltaTime * m_Duration, 1.0f)); + transform.position = Vector2.Lerp(m_StartPos.position, m_EndPos.position, (Mathf.Sin(Time.time * m_Duration) + 1.0f) / 2.0f); } #if UNITY_EDITOR diff --git a/Assets/Variables/Runtime/freezePlayer.asset b/Assets/Variables/Runtime/freezePlayer.asset index f616f65..a81d699 100644 --- a/Assets/Variables/Runtime/freezePlayer.asset +++ b/Assets/Variables/Runtime/freezePlayer.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f374dd84929158d72abba2b7081384c232df90b4e44faaabd3958edc540e7783 +oid sha256:466fdb9107b37543a2ad85e238da069372b91af9605c5eeabd8ce9114f1801eb size 466 From f1e07f21286206fd19b7daccac33bd895749a3b7 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 30 Jan 2022 13:55:28 +1100 Subject: [PATCH 3/4] Platform now moves player --- Assets/Scenes/Level 2.unity | 4 ++-- Assets/Scripts/PlatformMover.cs | 28 ++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index 6de99e9..87387aa 100644 --- a/Assets/Scenes/Level 2.unity +++ b/Assets/Scenes/Level 2.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a682cca83f7ccc5ce655eccc527b7dfc5712f70e820adde94bb3da99407916dc -size 442128 +oid sha256:eb66543789d5acb4f3c8de12d0afaa162d47a93c1b6e058fe981c22a4f214228 +size 441461 diff --git a/Assets/Scripts/PlatformMover.cs b/Assets/Scripts/PlatformMover.cs index a088f83..376085b 100644 --- a/Assets/Scripts/PlatformMover.cs +++ b/Assets/Scripts/PlatformMover.cs @@ -8,16 +8,32 @@ public class PlatformMover : MonoBehaviour [SerializeField] private Transform m_EndPos; [SerializeField] private float m_Duration = 2f; - // Start is called before the first frame update - void Start() + private Transform m_OldParent; + + private void Update() { - + transform.position = Vector2.Lerp(m_StartPos.position, m_EndPos.position, (Mathf.Sin(Time.time * m_Duration) + 1.0f) / 2.0f); } - // Update is called once per frame - void Update() + private void OnCollisionEnter2D(Collision2D collision) { - transform.position = Vector2.Lerp(m_StartPos.position, m_EndPos.position, (Mathf.Sin(Time.time * m_Duration) + 1.0f) / 2.0f); + var playerController = collision.gameObject.GetComponent(); + if(playerController) + { + m_OldParent = playerController.transform.parent; + playerController.transform.parent = transform; + } + } + + private void OnCollisionExit2D(Collision2D collision) + { + var playerController = collision.gameObject.GetComponent(); + if(playerController) + { + playerController.transform.parent = m_OldParent; + m_OldParent = null; + } + } #if UNITY_EDITOR From 4ab8037bb9c8d3da3983f5e23a695cc4a284d4f3 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 30 Jan 2022 14:04:01 +1100 Subject: [PATCH 4/4] Improved camera follower y tracking --- Assets/Scenes/Level 2.unity | 4 ++-- Assets/Scripts/CameraFollower.cs | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index 87387aa..3979e39 100644 --- a/Assets/Scenes/Level 2.unity +++ b/Assets/Scenes/Level 2.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb66543789d5acb4f3c8de12d0afaa162d47a93c1b6e058fe981c22a4f214228 -size 441461 +oid sha256:1b8d5f220a9df00668e007c4e8b89fefb31291288671038e64e13db4016cf830 +size 441491 diff --git a/Assets/Scripts/CameraFollower.cs b/Assets/Scripts/CameraFollower.cs index 7472137..1695ac9 100644 --- a/Assets/Scripts/CameraFollower.cs +++ b/Assets/Scripts/CameraFollower.cs @@ -9,6 +9,8 @@ public class CameraFollower : MonoBehaviour [SerializeField] private float m_FollowStrength = 3f; [SerializeField] private bool m_FollowX = true; [SerializeField] private bool m_FollowY = false; + [SerializeField] private float m_OffsetX = 0f; + [SerializeField] private float m_OffsetY = 2.0f; private Camera m_Camera; @@ -22,8 +24,8 @@ public class CameraFollower : MonoBehaviour if(Mathf.Abs(Player.transform.position.x - m_Camera.transform.position.x) > m_FollowStrength) { m_Camera.transform.Translate( - m_FollowX ? (m_FollowStrength + Player.transform.position.x - m_Camera.transform.position.x) * Time.deltaTime : 0, - m_FollowY ? (m_FollowStrength + Player.transform.position.y - m_Camera.transform.position.y) * Time.deltaTime : 0, + (m_FollowX ? (m_FollowStrength + Player.transform.position.x - m_Camera.transform.position.x - m_OffsetX) * Time.deltaTime : 0), + (m_FollowY ? (m_FollowStrength + Player.transform.position.y - m_Camera.transform.position.y - m_OffsetY) * Time.deltaTime : 0), 0); } }