diff --git a/Assets/Art Assets/Physics Materials.meta b/Assets/Art Assets/Physics Materials.meta new file mode 100644 index 0000000..0cf5777 --- /dev/null +++ b/Assets/Art Assets/Physics Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d69a20d5ff9e3c749b989a33b44247d8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Physics Materials/Slippy.physicsMaterial2D b/Assets/Art Assets/Physics Materials/Slippy.physicsMaterial2D new file mode 100644 index 0000000..115e324 --- /dev/null +++ b/Assets/Art Assets/Physics Materials/Slippy.physicsMaterial2D @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Slippy + friction: 0 + bounciness: 0 diff --git a/Assets/Art Assets/Physics Materials/Slippy.physicsMaterial2D.meta b/Assets/Art Assets/Physics Materials/Slippy.physicsMaterial2D.meta new file mode 100644 index 0000000..81c8b2e --- /dev/null +++ b/Assets/Art Assets/Physics Materials/Slippy.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c2f9af082941ef45abc8e6a22e1c9ef +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Josh Test Scene.unity b/Assets/Scenes/Josh Test Scene.unity index 3e3e0d6..7f6109f 100644 --- a/Assets/Scenes/Josh Test Scene.unity +++ b/Assets/Scenes/Josh Test Scene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00035ec7aa7c804a8d832138b2dba68bb14958d748b1b83423d38af5173219fb -size 151215 +oid sha256:19b3f850ca069bbe22d4c53554f26c04caad832d9b0c3e97d449a0ba13466007 +size 152408 diff --git a/Assets/Scripts/Character/CharacterInputController.cs b/Assets/Scripts/Character/CharacterInputController.cs index c9a1148..bb707de 100644 --- a/Assets/Scripts/Character/CharacterInputController.cs +++ b/Assets/Scripts/Character/CharacterInputController.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.InputSystem; +using Variables; using NaughtyAttributes; public class CharacterInputController : MonoBehaviour @@ -11,7 +12,10 @@ public class CharacterInputController : MonoBehaviour private CharacterController2D m_characterController; [SerializeField] - private Material m_Darkness; + private Reference m_playerInput; + + [SerializeField,BoxGroup("Settings")] + private float m_speed = 2.0f; [ShowNonSerializedField] private Vector2 m_movement; @@ -33,7 +37,8 @@ public class CharacterInputController : MonoBehaviour private void Update() { - m_characterController.Move(m_movement.x,false ,m_jump); + m_characterController.Move(m_movement.x * m_speed,false ,m_jump); + m_playerInput.Value = m_movement.magnitude != 0 || m_jump; } diff --git a/Assets/Scripts/DarknessController.cs b/Assets/Scripts/DarknessController.cs index 4c3ed7f..cf731af 100644 --- a/Assets/Scripts/DarknessController.cs +++ b/Assets/Scripts/DarknessController.cs @@ -19,19 +19,26 @@ public class DarknessController : MonoBehaviour [SerializeField, BoxGroup("Settings")] private float m_lightSpeed = 1.0f; + [SerializeField, BoxGroup("Settings")] + private AnimationCurve m_lightCurve = AnimationCurve.Linear(0,0,1,1); + + + [ShowNonSerializedField] + private float m_currentDarknessLevel = 1; [ShowNonSerializedField] - private float m_currentDarknessLevel; private bool m_isDarknessChanging; private void OnEnable() { m_isInputDown.OnValueChanged += OnInputChange; + m_darknessMat.SetFloat("_Apply",1); } private void OnDisable() { m_isInputDown.OnValueChanged -= OnInputChange; + m_darknessMat.SetFloat("_Apply", 1); } @@ -39,9 +46,17 @@ public class DarknessController : MonoBehaviour { StopAllCoroutines(); if (value) - StartCoroutine(ChangeDarkness(0, m_darknessSpeed)); + { if (!m_isDarknessChanging) + { + StartCoroutine(ChangeDarkness(0, m_darknessSpeed)); + } + else + { + StartCoroutine(ChangeDarkness(0, 0)); + } + } else - StartCoroutine(ChangeDarkness(1, m_lightSpeed)); + StartCoroutine(ChangeDarkness(1, m_lightSpeed, m_lightCurve)); } @@ -52,24 +67,26 @@ public class DarknessController : MonoBehaviour private IEnumerator ChangeDarkness(float end, float time, AnimationCurve curve) { + float start = m_currentDarknessLevel; float elapsedTime = 0; - time = Mathf.InverseLerp(start, end, m_currentDarknessLevel); + time = Mathf.InverseLerp(end, start, m_currentDarknessLevel) * time; m_isDarknessChanging = true; - while(elapsedTime < time) + while(elapsedTime < time || time != 0) { - m_currentDarknessLevel = Mathf.Lerp(start, end, curve.Evaluate(elapsedTime / time)); m_darknessMat.SetFloat("_Apply", m_currentDarknessLevel); yield return new WaitForEndOfFrame(); elapsedTime += Time.deltaTime; } - m_isDarknessChanging = false; m_currentDarknessLevel = end; + m_darknessMat.SetFloat("_Apply", m_currentDarknessLevel); + m_isDarknessChanging = false; + } diff --git a/Assets/Scripts/Shaders/Image.mat b/Assets/Scripts/Shaders/Image.mat index 09d0e14..bf2644e 100644 --- a/Assets/Scripts/Shaders/Image.mat +++ b/Assets/Scripts/Shaders/Image.mat @@ -79,7 +79,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _BackgroundColor: {r: 0.764151, g: 0, b: 0.08963457, a: 1} + - _BackgroundColor: {r: 0.026432894, g: 0.08926159, b: 0.16981131, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MaskColor: {r: 0.61624897, g: 1, b: 0, a: 1} diff --git a/Assets/Variables.meta b/Assets/Variables.meta new file mode 100644 index 0000000..0ab28ce --- /dev/null +++ b/Assets/Variables.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 23f2f909519e9d94c8a6e49f00f4e3e2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Variables/Runtime.meta b/Assets/Variables/Runtime.meta new file mode 100644 index 0000000..ac9eb3e --- /dev/null +++ b/Assets/Variables/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2928fecd42630e34db83a083cc910604 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Variables/Runtime/isPlayerInput.asset b/Assets/Variables/Runtime/isPlayerInput.asset new file mode 100644 index 0000000..ba41e45 --- /dev/null +++ b/Assets/Variables/Runtime/isPlayerInput.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d5361ded0d0fd2665a0c4c61809eee6d61de0a4ea419d1f97254df6479ec3d6 +size 467 diff --git a/Assets/Variables/Runtime/isPlayerInput.asset.meta b/Assets/Variables/Runtime/isPlayerInput.asset.meta new file mode 100644 index 0000000..2cff7c4 --- /dev/null +++ b/Assets/Variables/Runtime/isPlayerInput.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae129d59580dbe94fa385299e3dfb47d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index bfd2526..ea3643d 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d57a0fe55659c33879e8b70bc01c5ea9cdf082069dab649905c6c5138531e6eb -size 2028 +oid sha256:3a8e2e9bd61287ae7c08f7d35e50636b97a7d4709935798bae84f05fd3e6e52f +size 2029 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index ffb579f..2b60943 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf15b83d74d494b1484ec1afbb8345c30b45f4298f2c6b0056bf962e069ad17d -size 1464 +oid sha256:92f3a7854ff154bf16f03324b545c3ed591f36b9ce898066a37b8dbb360aa71e +size 1408