Merge branch 'main' of http://git.joshuareason.com/Jam/GGJ_2022 into main

Assets/Art Assets/Physics Materials.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d69a20d5ff9e3c749b989a33b44247d8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

Assets/Art Assets/Physics Materials/Slippy.physicsMaterial2D.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6c2f9af082941ef45abc8e6a22e1c9ef
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 6200000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Josh Test Scene.unity (Stored with Git LFS)

+size 152408

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<bool> 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;
     }
 
 

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;
+        
     }
 
 

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}

Assets/Variables.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 23f2f909519e9d94c8a6e49f00f4e3e2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Variables/Runtime.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2928fecd42630e34db83a083cc910604
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Variables/Runtime/isPlayerInput.asset (Stored with Git LFS)

+size 467

Assets/Variables/Runtime/isPlayerInput.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae129d59580dbe94fa385299e3dfb47d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/Physics2DSettings.asset (Stored with Git LFS)

+size 2029

ProjectSettings/QualitySettings.asset (Stored with Git LFS)

+size 1408