diff --git a/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset b/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset index c565f96..abfa0d7 100644 --- a/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset +++ b/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: PhotonServerSettings m_EditorClassIdentifier: AppSettings: - AppIdRealtime: 64ae6543-12d2-495a-b1e4-7b52432c4ce3 + AppIdRealtime: 6208473f-0bd0-4fda-94b2-4c2008e2c9a4 AppIdFusion: AppIdChat: AppIdVoice: diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 7e9f9f5..1ed3451 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -3972,7 +3972,6 @@ GameObject: m_Component: - component: {fileID: 1877307837} - component: {fileID: 1877307836} - - component: {fileID: 1877307835} - component: {fileID: 1877307834} m_Layer: 0 m_Name: arenaCam @@ -4025,14 +4024,6 @@ MonoBehaviour: mipBias: 0 varianceClampScale: 0.9 contrastAdaptiveSharpening: 0 ---- !u!81 &1877307835 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1877307833} - m_Enabled: 1 --- !u!20 &1877307836 Camera: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index ad1686f..3d34084 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -13,6 +13,7 @@ using UnityEngine.SceneManagement; public class GameManager : MonoBehaviourPunCallbacks, IOnEventCallback { + const int TIMEOUT_TIME = 120; const int START_WAIT_TIME = 10; const byte GAME_START_CODE = 1; @@ -129,12 +130,12 @@ public class GameManager : MonoBehaviourPunCallbacks, IOnEventCallback { startTimer = START_WAIT_TIME; mp_status_txt.text = "Waiting for an opponent\n"; - if(timeoutTimer < 60){ + if(timeoutTimer < TIMEOUT_TIME){ if(timedOut){ mp_status_txt.text += "Requesting Refund... Please Wait"; }else{ timeoutTimer+=Time.deltaTime; - mp_status_txt.text += "Time Remaining: " + (60 - timeoutTimer).ToString("n0") + " Seconds"; + mp_status_txt.text += "Time Remaining: " + (TIMEOUT_TIME - timeoutTimer).ToString("n0") + " Seconds"; } }else{ StartCoroutine(SubmitRefundReq()); diff --git a/Assets/Scripts/SnakeController.cs b/Assets/Scripts/SnakeController.cs index 00adefc..a9b8874 100644 --- a/Assets/Scripts/SnakeController.cs +++ b/Assets/Scripts/SnakeController.cs @@ -97,6 +97,8 @@ public class SnakeController : MonoBehaviourPunCallbacks PhotonNetwork.LocalPlayer.CustomProperties.Add("score",Score); } PhotonNetwork.LocalPlayer.SetCustomProperties(PhotonNetwork.LocalPlayer.CustomProperties); + + SFXManager.instance.PlayCrunch(); } List moveInputQueue =new List(); @@ -105,6 +107,8 @@ public class SnakeController : MonoBehaviourPunCallbacks return; } moveInputQueue.Add(newDir); + + SFXManager.instance.PlayTurn(); } bool queueNewPiece = false; @@ -192,6 +196,7 @@ public class SnakeController : MonoBehaviourPunCallbacks Debug.Log($"Crashed into {obstacle.name}", gameObject); isDead = true; gameManager.OnGameOver(); + SFXManager.instance.PlayDeath(); } } diff --git a/Packages/manifest.json b/Packages/manifest.json index 6149bc7..2ce7ee1 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -9,6 +9,7 @@ "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.5", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.9.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index c46a1ea..34e49cc 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -214,6 +214,22 @@ "com.unity.searcher": "4.9.2" } }, + "com.unity.sysroot": { + "version": "2.0.10", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.9", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.33", "depth": 0, @@ -246,6 +262,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.win-x86_64-linux-x86_64": { + "version": "2.0.10", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10", + "com.unity.sysroot.linux-x86_64": "2.0.9" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 0,