Fix: Add rock, rain cd, menu design etc.

deliteam · May 3, 2023 · 5023e7e · 5023e7e
1 parent d4947a3
commit 5023e7e
Show file tree

Hide file tree

Showing 15 changed files with 2,252 additions and 478 deletions.
diff --git a/LD53/Assets/Art/controls_button.psb b/LD53/Assets/Art/controls_button.psb
diff --git a/LD53/Assets/Art/controls_button.psb.meta b/LD53/Assets/Art/controls_button.psb.meta
diff --git a/LD53/Assets/Art/white_kb.png b/LD53/Assets/Art/white_kb.png
diff --git a/LD53/Assets/Art/white_kb.png.meta b/LD53/Assets/Art/white_kb.png.meta
diff --git a/LD53/Assets/Code/Pause.cs b/LD53/Assets/Code/Pause.cs
@@ -5,11 +5,11 @@
 
 public class Pause : MonoBehaviour
 {
-
+    [SerializeField] GameObject controlsPanel;
 
     void Update()
     {
-        if (Input.GetKeyDown(KeyCode.Escape))
+        if (Input.GetKeyDown(KeyCode.Escape) && !controlsPanel.activeSelf)
         {
             SceneManager.LoadScene("Menu_Start");
         }

diff --git a/LD53/Assets/Code/TwitchIntegration.cs b/LD53/Assets/Code/TwitchIntegration.cs
@@ -41,7 +41,7 @@ void Start()
     }
 
     private IEnumerator ResetRainToggle() {
-        yield return new WaitForSeconds(120.0f);
+        yield return new WaitForSeconds(10.0f);
 
         canToggleRain = true;
     }

diff --git a/LD53/Assets/Controls.cs b/LD53/Assets/Controls.cs
@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Controls : MonoBehaviour
+{
+    [SerializeField] GameObject controlsPanel;
+
+    void Start()
+    {
+        controlsPanel.SetActive(false);
+    }
+
+    public void OpenPanel()
+    {
+        if (controlsPanel.activeSelf == false)
+        {
+            controlsPanel.SetActive(true);
+        }
+        else if (controlsPanel.activeSelf == true)
+        {
+            controlsPanel.SetActive(false);
+        }
+    }
+}
diff --git a/LD53/Assets/Controls.cs.meta b/LD53/Assets/Controls.cs.meta
diff --git a/LD53/Assets/RainMaker/Demo/PhysicsMaterialStart.physicsMaterial2D b/LD53/Assets/RainMaker/Demo/PhysicsMaterialStart.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: PhysicsMaterialStart
+  friction: 0
+  bounciness: 0
diff --git a/LD53/Assets/RainMaker/Demo/PhysicsMaterialStart.physicsMaterial2D.meta b/LD53/Assets/RainMaker/Demo/PhysicsMaterialStart.physicsMaterial2D.meta