From 54946df09748b49f161a9fc7ecdc71fd77d87eda Mon Sep 17 00:00:00 2001 From: excitedneon Date: Tue, 9 May 2017 17:15:07 +0300 Subject: [PATCH] Fix accidental command bug in the console and unlink from Unity Services --- Assets/Scenes/TestMap.unity | 13 +------------ Assets/Scripts/Console/DebugConsole.cs | 6 ++++++ ProjectSettings/InputManager.asset | 16 ++++++++++++++++ ProjectSettings/ProjectSettings.asset | 9 ++++++--- 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/Assets/Scenes/TestMap.unity b/Assets/Scenes/TestMap.unity index 4a9ee1e..683930c 100644 --- a/Assets/Scenes/TestMap.unity +++ b/Assets/Scenes/TestMap.unity @@ -194,18 +194,7 @@ MonoBehaviour: m_CharacterLimit: 0 m_OnEndEdit: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1463006271} - m_MethodName: CallCommand - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_OnValueChanged: diff --git a/Assets/Scripts/Console/DebugConsole.cs b/Assets/Scripts/Console/DebugConsole.cs index e8879ee..176851e 100644 --- a/Assets/Scripts/Console/DebugConsole.cs +++ b/Assets/Scripts/Console/DebugConsole.cs @@ -138,9 +138,15 @@ namespace Cyber.Console { } private void Update() { + // Inputs if (Input.GetButtonDown("Console Toggle")) { Visible = !Visible; } + if (Input.GetButtonDown("Enter Command")) { + CallCommand(); + } + + // Slide up/down animation RectTransform Rect = Panel.GetComponent(); Vector2 OffsetMin = Rect.offsetMin; if (Visible) { diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 415c823..7d89d18 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -117,6 +117,22 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: Enter Command + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: return + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 - serializedVersion: 3 m_Name: Mouse X descriptiveName: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a479e44..d11c406 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -579,12 +579,15 @@ PlayerSettings: daydreamIconForeground: {fileID: 0} daydreamIconBackground: {fileID: 0} cloudServicesEnabled: + Build: 0 Collab: 0 + ErrorHub: 0 + Hub: 0 UNet: 1 facebookSdkVersion: 7.9.1 apiCompatibilityLevel: 2 - cloudProjectId: ce574e88-0640-4292-be86-1e81238c639e - projectName: Cyber - organizationId: exne + cloudProjectId: + projectName: + organizationId: cloudEnabled: 0 enableNewInputSystem: 0