From c07524df9f89bf566e4837237e411eb4e38133d2 Mon Sep 17 00:00:00 2001 From: excitedneon Date: Tue, 9 May 2017 14:04:29 +0300 Subject: [PATCH 1/2] Tweak and rename quality settings --- ProjectSettings/QualitySettings.asset | 104 +++++++------------------- 1 file changed, 26 insertions(+), 78 deletions(-) diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 1b445c7..6877e52 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,10 +4,10 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 5 + m_CurrentQuality: 3 m_QualitySettings: - serializedVersion: 2 - name: Fastest + name: Toaster pixelLightCount: 0 shadows: 0 shadowResolution: 0 @@ -18,7 +18,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 1 - textureQuality: 1 + textureQuality: 3 anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 @@ -33,61 +33,9 @@ QualitySettings: asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 - name: Fast - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.4 - maximumLODLevel: 0 - particleRaycastBudget: 16 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Simple - pixelLightCount: 1 - shadows: 1 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 1 - lodBias: 0.7 - maximumLODLevel: 0 - particleRaycastBudget: 64 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Good + name: Optimized pixelLightCount: 2 - shadows: 2 + shadows: 1 shadowResolution: 1 shadowProjection: 1 shadowCascades: 2 @@ -96,12 +44,12 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 2 - textureQuality: 0 + textureQuality: 1 anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 softVegetation: 1 - realtimeReflectionProbes: 1 + realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 1 vSyncCount: 1 lodBias: 1 @@ -111,7 +59,7 @@ QualitySettings: asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 - name: Beautiful + name: Balanced pixelLightCount: 3 shadows: 2 shadowResolution: 2 @@ -137,8 +85,8 @@ QualitySettings: asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 - name: Fantastic - pixelLightCount: 4 + name: Looking Good + pixelLightCount: 6 shadows: 2 shadowResolution: 2 shadowProjection: 1 @@ -150,7 +98,7 @@ QualitySettings: blendWeights: 4 textureQuality: 0 anisotropicTextures: 2 - antiAliasing: 2 + antiAliasing: 8 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 @@ -163,18 +111,18 @@ QualitySettings: asyncUploadBufferSize: 4 excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: - Android: 2 - Nintendo 3DS: 5 - PS4: 5 - PSM: 5 - PSP2: 2 - Samsung TV: 2 - Standalone: 5 - Tizen: 2 - Web: 5 - WebGL: 3 - WiiU: 5 - Windows Store Apps: 5 - XboxOne: 5 - iPhone: 2 - tvOS: 2 + Android: 0 + Nintendo 3DS: 3 + PS4: 3 + PSM: 3 + PSP2: 0 + Samsung TV: 0 + Standalone: 3 + Tizen: 0 + Web: 3 + WebGL: 1 + WiiU: 3 + Windows Store Apps: 3 + XboxOne: 3 + iPhone: 0 + tvOS: 0 From 54946df09748b49f161a9fc7ecdc71fd77d87eda Mon Sep 17 00:00:00 2001 From: excitedneon Date: Tue, 9 May 2017 17:15:07 +0300 Subject: [PATCH 2/2] 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