From 9f479e86a791754cc5cb06dcbb2902f51c6f8868 Mon Sep 17 00:00:00 2001 From: NIMFER Date: Sun, 29 Aug 2021 09:56:58 +0200 Subject: [PATCH] exit app using escape --- Assets/Input/PlayerControls.cs | 29 +++++++++++++++++++ Assets/Input/PlayerControls.inputactions | 19 ++++++++++++ .../FMOD/lib/win/x86_64/fmodstudioL.dll.meta | 3 +- Assets/Scripts/Dobber.cs | 4 ++- .../com.unity.probuilder/Settings.json | 5 ++++ ProjectSettings/ProjectSettings.asset | 6 ++-- fmod_editor.log | 10 ++++++- 7 files changed, 70 insertions(+), 6 deletions(-) diff --git a/Assets/Input/PlayerControls.cs b/Assets/Input/PlayerControls.cs index 9924571..5248cc8 100644 --- a/Assets/Input/PlayerControls.cs +++ b/Assets/Input/PlayerControls.cs @@ -201,6 +201,14 @@ public class @PlayerControls : IInputActionCollection, IDisposable ""expectedControlType"": ""Button"", ""processors"": """", ""interactions"": """" + }, + { + ""name"": ""ExitGame"", + ""type"": ""Button"", + ""id"": ""57948248-2c31-479b-a019-a542ee8d719f"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """" } ], ""bindings"": [ @@ -324,6 +332,17 @@ public class @PlayerControls : IInputActionCollection, IDisposable ""action"": ""InteractAlt"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""b53fd03a-58d9-460b-8ec9-ea527d8ff73a"", + ""path"": ""/escape"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""ExitGame"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] }, @@ -509,6 +528,7 @@ public class @PlayerControls : IInputActionCollection, IDisposable m_DobberControls_InteractAlt = m_DobberControls.FindAction("InteractAlt", throwIfNotFound: true); m_DobberControls_Attack = m_DobberControls.FindAction("Attack", throwIfNotFound: true); m_DobberControls_ArmTrap = m_DobberControls.FindAction("ArmTrap", throwIfNotFound: true); + m_DobberControls_ExitGame = m_DobberControls.FindAction("ExitGame", throwIfNotFound: true); // RobberControls m_RobberControls = asset.FindActionMap("RobberControls", throwIfNotFound: true); m_RobberControls_Walk = m_RobberControls.FindAction("Walk", throwIfNotFound: true); @@ -629,6 +649,7 @@ public class @PlayerControls : IInputActionCollection, IDisposable private readonly InputAction m_DobberControls_InteractAlt; private readonly InputAction m_DobberControls_Attack; private readonly InputAction m_DobberControls_ArmTrap; + private readonly InputAction m_DobberControls_ExitGame; public struct DobberControlsActions { private @PlayerControls m_Wrapper; @@ -640,6 +661,7 @@ public class @PlayerControls : IInputActionCollection, IDisposable public InputAction @InteractAlt => m_Wrapper.m_DobberControls_InteractAlt; public InputAction @Attack => m_Wrapper.m_DobberControls_Attack; public InputAction @ArmTrap => m_Wrapper.m_DobberControls_ArmTrap; + public InputAction @ExitGame => m_Wrapper.m_DobberControls_ExitGame; public InputActionMap Get() { return m_Wrapper.m_DobberControls; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -670,6 +692,9 @@ public class @PlayerControls : IInputActionCollection, IDisposable @ArmTrap.started -= m_Wrapper.m_DobberControlsActionsCallbackInterface.OnArmTrap; @ArmTrap.performed -= m_Wrapper.m_DobberControlsActionsCallbackInterface.OnArmTrap; @ArmTrap.canceled -= m_Wrapper.m_DobberControlsActionsCallbackInterface.OnArmTrap; + @ExitGame.started -= m_Wrapper.m_DobberControlsActionsCallbackInterface.OnExitGame; + @ExitGame.performed -= m_Wrapper.m_DobberControlsActionsCallbackInterface.OnExitGame; + @ExitGame.canceled -= m_Wrapper.m_DobberControlsActionsCallbackInterface.OnExitGame; } m_Wrapper.m_DobberControlsActionsCallbackInterface = instance; if (instance != null) @@ -695,6 +720,9 @@ public class @PlayerControls : IInputActionCollection, IDisposable @ArmTrap.started += instance.OnArmTrap; @ArmTrap.performed += instance.OnArmTrap; @ArmTrap.canceled += instance.OnArmTrap; + @ExitGame.started += instance.OnExitGame; + @ExitGame.performed += instance.OnExitGame; + @ExitGame.canceled += instance.OnExitGame; } } } @@ -789,6 +817,7 @@ public class @PlayerControls : IInputActionCollection, IDisposable void OnInteractAlt(InputAction.CallbackContext context); void OnAttack(InputAction.CallbackContext context); void OnArmTrap(InputAction.CallbackContext context); + void OnExitGame(InputAction.CallbackContext context); } public interface IRobberControlsActions { diff --git a/Assets/Input/PlayerControls.inputactions b/Assets/Input/PlayerControls.inputactions index 45ed976..1c10d4f 100644 --- a/Assets/Input/PlayerControls.inputactions +++ b/Assets/Input/PlayerControls.inputactions @@ -188,6 +188,14 @@ "expectedControlType": "Button", "processors": "", "interactions": "" + }, + { + "name": "ExitGame", + "type": "Button", + "id": "57948248-2c31-479b-a019-a542ee8d719f", + "expectedControlType": "Button", + "processors": "", + "interactions": "" } ], "bindings": [ @@ -311,6 +319,17 @@ "action": "InteractAlt", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "b53fd03a-58d9-460b-8ec9-ea527d8ff73a", + "path": "/escape", + "interactions": "", + "processors": "", + "groups": "", + "action": "ExitGame", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/Assets/Plugins/FMOD/lib/win/x86_64/fmodstudioL.dll.meta b/Assets/Plugins/FMOD/lib/win/x86_64/fmodstudioL.dll.meta index d5c96ca..c0770a2 100644 --- a/Assets/Plugins/FMOD/lib/win/x86_64/fmodstudioL.dll.meta +++ b/Assets/Plugins/FMOD/lib/win/x86_64/fmodstudioL.dll.meta @@ -22,11 +22,12 @@ PluginImporter: enabled: 1 settings: CPU: x86_64 + DefaultValueInitialized: true OS: Windows - first: Standalone: Win64 second: - enabled: 1 + enabled: 0 settings: {} userData: assetBundleName: diff --git a/Assets/Scripts/Dobber.cs b/Assets/Scripts/Dobber.cs index d3f3f53..0d11837 100644 --- a/Assets/Scripts/Dobber.cs +++ b/Assets/Scripts/Dobber.cs @@ -38,7 +38,9 @@ public class Dobber : MonoBehaviour { #region calls to other voids Inputs(); -#endregion + #endregion + + inputReferences.playerControls.DobberControls.ExitGame.performed += ctx => { Application.Quit(); }; } //this void assignes values to input virables diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 5b9d746..eb9a6eb 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -53,6 +53,11 @@ "key": "editor.autoRecalculateCollisions", "value": "{\"m_Value\":false}" }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.stripProBuilderScriptsOnBuild", + "value": "{\"m_Value\":true}" + }, { "type": "UnityEngine.ProBuilder.SelectionModifierBehavior, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.rectSelectModifier", diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index b04a996..2936a83 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -42,8 +42,8 @@ PlayerSettings: m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1024 - defaultScreenHeight: 768 + defaultScreenWidth: 1280 + defaultScreenHeight: 720 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 @@ -127,7 +127,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1 + bundleVersion: test preloadedAssets: - {fileID: 11400000, guid: ad76045632be0b24da9b262655368913, type: 2} metroInputSource: 0 diff --git a/fmod_editor.log b/fmod_editor.log index 2558458..9043181 100644 --- a/fmod_editor.log +++ b/fmod_editor.log @@ -7,7 +7,7 @@ [LOG] OutputWASAPI::init : Output buffer size: 4096 samples, latency: 0.00ms, period: 10.00ms, DSP buffer: 1024 * 4 [LOG] Thread::initThread : Init FMOD stream thread. Affinity: 0x8000000000000003, Priority: 0xFFFF7FFB, Stack Size: 98304, Semaphore: No, Sleep Time: 10, Looping: Yes. [LOG] Thread::initThread : Init FMOD mixer thread. Affinity: 0x8000000000000001, Priority: 0xFFFF7FFA, Stack Size: 81920, Semaphore: No, Sleep Time: 0, Looping: Yes. -[LOG] AsyncManager::init : manager 000001D51720A658 isAsync 0 updatePeriod 0.02 +[LOG] AsyncManager::init : manager 00000273ED9BC8F8 isAsync 0 updatePeriod 0.02 [LOG] AsyncManager::init : done [LOG] PlaybackSystem::init : [LOG] Thread::initThread : Init FMOD Studio sample load thread. Affinity: 0x8000000000000003, Priority: 0xFFFF7FFD, Stack Size: 98304, Semaphore: No, Sleep Time: 1, Looping: No. @@ -18,3 +18,11 @@ [LOG] Manager::readBank : fileversion = 135, compatVersion = 132 (oldest = 44, newest = 135) [LOG] Manager::readBank : fileversion = 135, compatVersion = 132 (oldest = 44, newest = 135) [LOG] PlaybackSystem::acquireMasterBus : Setting master channel group format to 6 +[LOG] Manager::readBank : fileversion = 135, compatVersion = 132 (oldest = 44, newest = 135) +[LOG] Manager::readBank : fileversion = 135, compatVersion = 132 (oldest = 44, newest = 135) +[LOG] Manager::readBank : fileversion = 135, compatVersion = 132 (oldest = 44, newest = 135) +[LOG] PlaybackSystem::acquireMasterBus : Setting master channel group format to 6 +[LOG] Manager::readBank : fileversion = 135, compatVersion = 132 (oldest = 44, newest = 135) +[LOG] Manager::readBank : fileversion = 135, compatVersion = 132 (oldest = 44, newest = 135) +[LOG] Manager::readBank : fileversion = 135, compatVersion = 132 (oldest = 44, newest = 135) +[LOG] PlaybackSystem::acquireMasterBus : Setting master channel group format to 6