New COMMIT

SUPEZ · Jun 27, 2021 · 0fef6ce · 0fef6ce
1 parent cff4420
commit 0fef6ce
Show file tree

Hide file tree

Showing 39 changed files with 270 additions and 253 deletions.
diff --git a/Prototype/.idea/.idea.Prototype/.idea/encodings.xml b/Prototype/.idea/.idea.Prototype/.idea/encodings.xml
diff --git a/Prototype/.idea/.idea.Prototype/.idea/indexLayout.xml b/Prototype/.idea/.idea.Prototype/.idea/indexLayout.xml
diff --git a/Prototype/.idea/.idea.Prototype/.idea/projectSettingsUpdater.xml b/Prototype/.idea/.idea.Prototype/.idea/projectSettingsUpdater.xml
diff --git a/Prototype/.idea/.idea.Prototype/.idea/vcs.xml b/Prototype/.idea/.idea.Prototype/.idea/vcs.xml
diff --git a/Prototype/.idea/.idea.Prototype/.idea/workspace.xml b/Prototype/.idea/.idea.Prototype/.idea/workspace.xml
diff --git a/...type/Assets/Prefabs/goodSmile.prefab.meta → Prototype/Assets/Plugins.meta b/...type/Assets/Prefabs/goodSmile.prefab.meta → Prototype/Assets/Plugins.meta
diff --git a/Prototype/Assets/Plugins/Editor.meta b/Prototype/Assets/Plugins/Editor.meta
diff --git a/Prototype/Assets/Plugins/Editor/JetBrains.meta b/Prototype/Assets/Plugins/Editor/JetBrains.meta
diff --git a/Prototype/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll b/Prototype/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll
diff --git a/...ype/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll.meta b/...ype/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll.meta
diff --git a/Prototype/Assets/Prefabs/goodSmile.prefab b/Prototype/Assets/Prefabs/goodSmile.prefab
diff --git a/Prototype/Assets/Scenes/Main menu.unity b/Prototype/Assets/Scenes/Main menu.unity
@@ -232,6 +232,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6e92c96e95066574aa3130ef9cde1514, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  buttonType: 0
   sourceSound: {fileID: 1365437298}
 --- !u!1 &552923905
 GameObject:
@@ -539,6 +540,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6e92c96e95066574aa3130ef9cde1514, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  buttonType: 1
   sourceSound: {fileID: 1365437298}
 --- !u!1 &1170947644
 GameObject:
@@ -1080,6 +1082,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6e92c96e95066574aa3130ef9cde1514, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  buttonType: 4
   sourceSound: {fileID: 1365437298}
 --- !u!1 &1566214676
 GameObject:

diff --git a/Prototype/Assets/Scripts/Buttons.cs → Prototype/Assets/Scripts/Button.cs b/Prototype/Assets/Scripts/Buttons.cs → Prototype/Assets/Scripts/Button.cs
@@ -1,34 +1,35 @@
 using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
-public class Buttons : MonoBehaviour {
-
+public class Button : MonoBehaviour {
+    public enum ButtonType { Play, Tutorial, Market, Ads, Options, Main}
+    public ButtonType buttonType;
+
     public AudioSource sourceSound;
-     
+
     private IEnumerator OnMouseUpAsButton()
     {
         SoundEffect(sourceSound);
         yield return new WaitForSeconds(0.5f);
-        switch (gameObject.name)
+        switch (buttonType)
         {
-            case "PlayButton":                
+            case ButtonType.Play:                
                 SceneManager.LoadScene("Play");
                 break;
-            case "TutorialButton":
+            case ButtonType.Tutorial:
                 SceneManager.LoadScene("Tutorial");
                 break;
-            case "MarketButton":
+            case ButtonType.Market:
                 SceneManager.LoadScene("Market");
                 break;
-            case "AdsButton":
+            case ButtonType.Ads:
                 SceneManager.LoadScene("Ads");
                 break;
-            case "OptionsButton":
+            case ButtonType.Options:
                 SceneManager.LoadScene("Options");
                 break;
-            case "MainMenuButton":
+            case ButtonType.Main:
                 SceneManager.LoadScene("Main menu");
                 break;
 

diff --git a/Prototype/Assets/Scripts/Buttons.cs.meta → Prototype/Assets/Scripts/Button.cs.meta b/Prototype/Assets/Scripts/Buttons.cs.meta → Prototype/Assets/Scripts/Button.cs.meta
diff --git a/Prototype/Assets/Scripts/MaxGems.cs b/Prototype/Assets/Scripts/MaxGems.cs
@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.UI;
 
 public class MaxGems : MonoBehaviour {