diff --git a/GS1PinataSmackdown_Submission.pdf b/GS1PinataSmackdown_Submission.pdf new file mode 100644 index 0000000..e85c36e Binary files /dev/null and b/GS1PinataSmackdown_Submission.pdf differ diff --git a/Pinata_Data/PlayerConnectionConfigFile b/Pinata_Data/PlayerConnectionConfigFile index 75b766d..509d207 100644 --- a/Pinata_Data/PlayerConnectionConfigFile +++ b/Pinata_Data/PlayerConnectionConfigFile @@ -1 +1 @@ -listen 3396129451 0 0 \ No newline at end of file +listen 1859183214 0 0 \ No newline at end of file diff --git a/Pinata_Data/level0 b/Pinata_Data/level0 new file mode 100644 index 0000000..8265284 Binary files /dev/null and b/Pinata_Data/level0 differ diff --git a/Pinata_Data/level1 b/Pinata_Data/level1 new file mode 100644 index 0000000..52fc9b5 Binary files /dev/null and b/Pinata_Data/level1 differ diff --git a/Pinata_Data/mainData b/Pinata_Data/mainData index 12c0890..8471bf8 100644 Binary files a/Pinata_Data/mainData and b/Pinata_Data/mainData differ diff --git a/Pinata_Data/output_log.txt b/Pinata_Data/output_log.txt deleted file mode 100644 index c25f78a..0000000 --- a/Pinata_Data/output_log.txt +++ /dev/null @@ -1,18 +0,0 @@ -Initialize engine version: 4.6.4f1 (99f88340878d) -GfxDevice: creating device client; threaded=1 -Direct3D: - Version: Direct3D 11.0 [level 11.0] - Renderer: Intel(R) HD Graphics Family (ID=0xa16) - Vendor: Intel - VRAM: 896 MB -Begin MonoManager ReloadAssembly -Platform assembly: C:\Users\Joshua\Documents\pi-ata-smackdown\Pinata_Data\Managed\UnityEngine.dll (this message is harmless) -Loading C:\Users\Joshua\Documents\pi-ata-smackdown\Pinata_Data\Managed\UnityEngine.dll into Unity Child Domain -Platform assembly: C:\Users\Joshua\Documents\pi-ata-smackdown\Pinata_Data\Managed\Assembly-CSharp.dll (this message is harmless) -Loading C:\Users\Joshua\Documents\pi-ata-smackdown\Pinata_Data\Managed\Assembly-CSharp.dll into Unity Child Domain -Platform assembly: C:\Users\Joshua\Documents\pi-ata-smackdown\Pinata_Data\Managed\UnityEngine.UI.dll (this message is harmless) -Loading C:\Users\Joshua\Documents\pi-ata-smackdown\Pinata_Data\Managed\UnityEngine.UI.dll into Unity Child Domain -- Completed reload, in 0.203 seconds -desktop: 2160x1440 59Hz; virtual: 2160x1440 at 0,0 - Initializing input. - Input initialized. diff --git a/Pinata_Data/sharedassets0.assets b/Pinata_Data/sharedassets0.assets index 5c3315a..5f2b372 100644 Binary files a/Pinata_Data/sharedassets0.assets and b/Pinata_Data/sharedassets0.assets differ diff --git a/Pinata_Data/sharedassets1.assets b/Pinata_Data/sharedassets1.assets new file mode 100644 index 0000000..cb1d7ba Binary files /dev/null and b/Pinata_Data/sharedassets1.assets differ diff --git a/Pinata_Data/sharedassets2.assets b/Pinata_Data/sharedassets2.assets new file mode 100644 index 0000000..c7bd6f1 Binary files /dev/null and b/Pinata_Data/sharedassets2.assets differ diff --git a/playable/Assets/Scenes/Menu_Scene.unity b/playable/Assets/Scenes/Menu_Scene.unity index e994a2d..eb3c6c2 100644 Binary files a/playable/Assets/Scenes/Menu_Scene.unity and b/playable/Assets/Scenes/Menu_Scene.unity differ diff --git a/playable/Assets/Scripts/menuContrller.cs b/playable/Assets/Scripts/menuContrller.cs index 0d453ac..d5c8aa8 100644 --- a/playable/Assets/Scripts/menuContrller.cs +++ b/playable/Assets/Scripts/menuContrller.cs @@ -56,9 +56,22 @@ public class menuContrller : MonoBehaviour { if (Input.GetAxisRaw ("Vertical_P4") == 1) { p4Enabled = true; btn_4player.GetComponent ().color = Color.green; - + } + if (Input.GetButtonDown ("start") && menu.activeSelf) + panelSelect ("levelSelect"); + if (Input.GetButtonDown ("start") && levelSelect.activeSelf) { + int tempRand = Mathf.RoundToInt(Random.Range (1,3)); + if (tempRand == 2) + levelStart("Level1"); + else + levelStart("Level2"); + } + + + + } @@ -159,4 +172,8 @@ public class menuContrller : MonoBehaviour { control.confetti = Mathf.RoundToInt (confetti); } + public void exit(){ + Application.Quit (); + } + } \ No newline at end of file diff --git a/playable/Assets/Scripts/playerController.cs b/playable/Assets/Scripts/playerController.cs index 4fa1461..5fe60cc 100644 --- a/playable/Assets/Scripts/playerController.cs +++ b/playable/Assets/Scripts/playerController.cs @@ -95,7 +95,7 @@ public class playerController : MonoBehaviour { gameOverDisplay.enabled = true; gameOverDisplay.text = ""+ gameObject.name + " Wins"; Time.timeScale = 0; - if (Input.anyKeyDown){ + if (Input.GetKeyDown("start")){ Time.timeScale = 1.0f; Application.LoadLevel("Menu_Scene"); }