From eff38cca28e00a9049ab4817ecac6edc71e9b335 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Sat, 5 Dec 2020 19:52:15 -0500 Subject: Upgraded to Unity 2019.4.16 --- Assets/Scripts/PauseMenu.cs | 12 +++++---- Packages/manifest.json | 6 ++--- Packages/packages-lock.json | 13 +++++----- ProjectSettings/PackageManagerSettings.asset | 38 ++++++++++++++++++++++++++++ ProjectSettings/ProjectVersion.txt | 4 +-- 5 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 ProjectSettings/PackageManagerSettings.asset diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs index 284756f..2183c52 100644 --- a/Assets/Scripts/PauseMenu.cs +++ b/Assets/Scripts/PauseMenu.cs @@ -8,18 +8,20 @@ public class PauseMenu : MonoBehaviour public bool lockCursor = true; public GameObject panel; - private int counter; + private int m_counter; // Update is called once per frame - public void showhidePanel() + public void ShowhidePanel() { - counter++; - if (counter % 2 == 1) + m_counter++; + if (m_counter % 2 == 1) { panel.gameObject.SetActive(true); + Time.timeScale = 0; } else { panel.gameObject.SetActive(false); + Time.timeScale = 1; } } @@ -28,7 +30,7 @@ public class PauseMenu : MonoBehaviour if (Input.GetKeyDown(KeyCode.Escape)) { lockCursor = !lockCursor; - showhidePanel(); + ShowhidePanel(); } diff --git a/Packages/manifest.json b/Packages/manifest.json index 562e643..786536a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,13 +1,13 @@ { "dependencies": { - "com.unity.ads": "3.4.7", + "com.unity.ads": "3.5.2", "com.unity.collab-proxy": "1.2.16", "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.2.1", + "com.unity.ide.vscode": "1.2.3", "com.unity.inputsystem": "1.0.0", "com.unity.probuilder": "4.2.3", "com.unity.progrids": "3.0.3-preview.6", - "com.unity.test-framework": "1.1.16", + "com.unity.test-framework": "1.1.19", "com.unity.textmeshpro": "2.0.1", "com.unity.timeline": "1.2.13", "com.unity.ugui": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index eb4830e..d7a1f57 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.ads": { - "version": "3.4.7", + "version": "3.5.2", "depth": 0, "source": "registry", "dependencies": { @@ -17,7 +17,7 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.0", + "version": "1.0.5", "depth": 1, "source": "registry", "dependencies": {}, @@ -33,7 +33,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.1", + "version": "1.2.3", "depth": 0, "source": "registry", "dependencies": {}, @@ -72,11 +72,11 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.16", + "version": "1.1.19", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.0", + "com.unity.ext.nunit": "1.0.5", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, @@ -103,7 +103,8 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.modules.ui": "1.0.0" + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" } }, "com.unity.modules.ai": { diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 0000000..ca9e773 --- /dev/null +++ b/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,38 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_ScopedRegistriesSettingsExpanded: 1 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_ErrorMessage: + m_Original: + m_Id: + m_Name: + m_Url: + m_Scopes: [] + m_IsDefault: 0 + m_Modified: 0 + m_Name: + m_Url: + m_Scopes: + - + m_SelectedScopeIndex: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index cb55a75..5767309 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.8f1 -m_EditorVersionWithRevision: 2019.4.8f1 (60781d942082) +m_EditorVersion: 2019.4.16f1 +m_EditorVersionWithRevision: 2019.4.16f1 (e05b6e02d63e) -- cgit v1.2.3