From 7257b4530300c8492a6726f2a97bb55cdea02859 Mon Sep 17 00:00:00 2001 From: Kotrba Filip Date: Sun, 2 Feb 2020 09:00:36 +0100 Subject: [PATCH] Add quit on escapeand get down move speed --- .../v16/Server/sqlite3/storage.ide | Bin 1294336 -> 1294336 bytes Assets/Scripts/PlayerManager.cs | 10 +++++++--- ProjectSettings/EditorBuildSettings.asset | 5 ++++- ProjectSettings/GraphicsSettings.asset | 3 +++ ProjectSettings/UnityConnectSettings.asset | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide b/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide index 934bc3cc8884c761cfb01fe0b0ae61cf1639e37b..565c2d74c2b42542264455751343e87990e53052 100644 GIT binary patch delta 5264 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 X*Ilt=(M@-1q2Yrc>Qg+Z0_Oh!iAd;D diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 83da803..77e4ba0 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -6,10 +6,10 @@ using UnityEngine.SceneManagement; public class PlayerManager : MonoBehaviour { - public float speed = 10; - public float runSpeed = 25; + public float speed = 8; + public float runSpeed = 20; public float rotateSpeed = 5; - public float mouseSensitive = 200; + public float mouseSensitive = 100; public float buildRate = 0.5f; public float health = 100; public float actualHealth = 100; @@ -45,6 +45,10 @@ public class PlayerManager : MonoBehaviour // Update is called once per frame void Update() { + if (Input.GetKeyDown(KeyCode.Escape)) + { + Application.Quit(0); + } guiManager.Wood.text = barricadeMaterials.ToString(); guiManager.Ammo.text = ammo.ToString(); Move(); diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0147887..5f64cc7 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,5 +4,8 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Scenes/PlayScene.unity + guid: 03f1c44c053777842ae209ed02a9a1dc m_configObjects: {} diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 43369e3..4706883 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -35,6 +35,9 @@ GraphicsSettings: - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 0e2a7e4..a711c05 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events