From df2584cc75e42b7dde37530e24bcd7864817b255 Mon Sep 17 00:00:00 2001 From: jreason Date: Sun, 30 Jan 2022 16:55:17 +1100 Subject: [PATCH 1/2] Renamed old levels --- Assets/Prefabs/2D Camera.prefab | 4 ++-- Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset | 2 +- Assets/Scenes/{Level 1.unity => OldLevel 1.unity} | 0 Assets/Scenes/{Level 1.unity.meta => OldLevel 1.unity.meta} | 0 Assets/Scenes/{Level 2.unity => OldLevel 2.unity} | 0 Assets/Scenes/{Level 2.unity.meta => OldLevel 2.unity.meta} | 0 Assets/Scenes/{Level 3.unity => OldLevel 3.unity} | 0 Assets/Scenes/{Level 3.unity.meta => OldLevel 3.unity.meta} | 0 Assets/Scripts/Character/CharacterInputController.cs | 6 ++++++ Assets/Scripts/LevelManager.cs | 2 +- 10 files changed, 10 insertions(+), 4 deletions(-) rename Assets/Scenes/{Level 1.unity => OldLevel 1.unity} (100%) rename Assets/Scenes/{Level 1.unity.meta => OldLevel 1.unity.meta} (100%) rename Assets/Scenes/{Level 2.unity => OldLevel 2.unity} (100%) rename Assets/Scenes/{Level 2.unity.meta => OldLevel 2.unity.meta} (100%) rename Assets/Scenes/{Level 3.unity => OldLevel 3.unity} (100%) rename Assets/Scenes/{Level 3.unity.meta => OldLevel 3.unity.meta} (100%) diff --git a/Assets/Prefabs/2D Camera.prefab b/Assets/Prefabs/2D Camera.prefab index 70ba2e6..0606794 100644 --- a/Assets/Prefabs/2D Camera.prefab +++ b/Assets/Prefabs/2D Camera.prefab @@ -866,8 +866,8 @@ MonoBehaviour: m_EditorClassIdentifier: Player: {fileID: 0} m_FollowStrength: 3 - m_FollowX: 0 - m_FollowY: 0 + m_FollowX: 1 + m_FollowY: 1 m_OffsetX: 0 m_OffsetY: 2 --- !u!114 &515301201 diff --git a/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset b/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset index 75be7e2..f44e743 100644 --- a/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset +++ b/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42777b1cdc258dc5a3fb8eedcc5977304f052f3d1af68bfdafa444f8eee85f2f +oid sha256:0bd3c929d343ed2398c9b353fbdfbe2aab314414a04b2af1588c89838719a6c8 size 1163 diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/OldLevel 1.unity similarity index 100% rename from Assets/Scenes/Level 1.unity rename to Assets/Scenes/OldLevel 1.unity diff --git a/Assets/Scenes/Level 1.unity.meta b/Assets/Scenes/OldLevel 1.unity.meta similarity index 100% rename from Assets/Scenes/Level 1.unity.meta rename to Assets/Scenes/OldLevel 1.unity.meta diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/OldLevel 2.unity similarity index 100% rename from Assets/Scenes/Level 2.unity rename to Assets/Scenes/OldLevel 2.unity diff --git a/Assets/Scenes/Level 2.unity.meta b/Assets/Scenes/OldLevel 2.unity.meta similarity index 100% rename from Assets/Scenes/Level 2.unity.meta rename to Assets/Scenes/OldLevel 2.unity.meta diff --git a/Assets/Scenes/Level 3.unity b/Assets/Scenes/OldLevel 3.unity similarity index 100% rename from Assets/Scenes/Level 3.unity rename to Assets/Scenes/OldLevel 3.unity diff --git a/Assets/Scenes/Level 3.unity.meta b/Assets/Scenes/OldLevel 3.unity.meta similarity index 100% rename from Assets/Scenes/Level 3.unity.meta rename to Assets/Scenes/OldLevel 3.unity.meta diff --git a/Assets/Scripts/Character/CharacterInputController.cs b/Assets/Scripts/Character/CharacterInputController.cs index 941e320..4279fbf 100644 --- a/Assets/Scripts/Character/CharacterInputController.cs +++ b/Assets/Scripts/Character/CharacterInputController.cs @@ -43,6 +43,12 @@ public class CharacterInputController : MonoBehaviour m_isVictory.OnValueChanged += OnVictory; } + private void OnDisable() + { + m_isPlayerDead.OnValueChanged -= OnDeath; + m_isVictory.OnValueChanged -= OnVictory; + } + public void OnMove(InputAction.CallbackContext context) { m_movement = context.ReadValue(); diff --git a/Assets/Scripts/LevelManager.cs b/Assets/Scripts/LevelManager.cs index feb5a66..f8c5414 100644 --- a/Assets/Scripts/LevelManager.cs +++ b/Assets/Scripts/LevelManager.cs @@ -143,7 +143,7 @@ public class LevelManager : MonoBehaviour { color.a = elapsedTime / fadeTime; m_backGround.color = color; - Debug.Log(color.a); + yield return new WaitForEndOfFrame(); elapsedTime += Time.deltaTime; } From c58c69d54886268b5865ac26da9993cda91851c9 Mon Sep 17 00:00:00 2001 From: jreason Date: Sun, 30 Jan 2022 16:59:48 +1100 Subject: [PATCH 2/2] Up the bloom ever so slightly Fixed camera in level 1 --- Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset | 4 ++-- Assets/Scenes/Official Levels/Level 1.unity | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset b/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset index c59d2da..3db1186 100644 --- a/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset +++ b/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:560537574e8f0662421d29463035c674a5f542270af0c0d8b6787617ef68dadd -size 3471 +oid sha256:cfba0fa241674fd226ccd96130bdb150b0e673dc92ee365946e2d089317a7b1a +size 3472 diff --git a/Assets/Scenes/Official Levels/Level 1.unity b/Assets/Scenes/Official Levels/Level 1.unity index a75a365..906ccbc 100644 --- a/Assets/Scenes/Official Levels/Level 1.unity +++ b/Assets/Scenes/Official Levels/Level 1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48909cfdfdff4b6287c7302b6941ef885d2326cc8afa0d8b890c102a66d84f45 -size 173901 +oid sha256:dbd11fcd140d341bc5560d41f286869e472d90a7bde29399e000dec6d332f6fd +size 174240