From cd127b928b7a7d979d51c903f03d6a67faa451a2 Mon Sep 17 00:00:00 2001 From: Eric Heine <erheine@nps.edu> Date: Thu, 31 Oct 2019 15:19:35 -0700 Subject: [PATCH] Missed a few things. --- Sane Eric's UI/Scriptable Variables/FloatVariableInput.cs | 6 +++--- Sane Eric's UI/Scriptable Variables/IntVariableInput.cs | 6 +++--- Sane Eric's UI/Shared.SEUI.asmdef | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Sane Eric's UI/Scriptable Variables/FloatVariableInput.cs b/Sane Eric's UI/Scriptable Variables/FloatVariableInput.cs index 53e0112..cea8441 100644 --- a/Sane Eric's UI/Scriptable Variables/FloatVariableInput.cs +++ b/Sane Eric's UI/Scriptable Variables/FloatVariableInput.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; using UnityEngine.Events; -using UnityEngine.UI; +using TMPro; using Shared.ScriptableVariables; namespace Shared.SEUI { @@ -12,7 +12,7 @@ namespace Shared.SEUI { public FloatVariable variable; [Tooltip("The input UI to edit the variable's value with")] - public InputField input; + public TMP_InputField input; // Temporary callback to bridge value changes in the UI and the variable private UnityAction<string> valueConverter; @@ -20,7 +20,7 @@ namespace Shared.SEUI { //--------------------------------------------------------------------------- void Start() { // Make sure the input handles the right content type - input.contentType = InputField.ContentType.DecimalNumber; + input.contentType = TMP_InputField.ContentType.DecimalNumber; } //--------------------------------------------------------------------------- diff --git a/Sane Eric's UI/Scriptable Variables/IntVariableInput.cs b/Sane Eric's UI/Scriptable Variables/IntVariableInput.cs index 90f579f..6ba9330 100644 --- a/Sane Eric's UI/Scriptable Variables/IntVariableInput.cs +++ b/Sane Eric's UI/Scriptable Variables/IntVariableInput.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; using UnityEngine.Events; -using UnityEngine.UI; +using TMPro; using Shared.ScriptableVariables; namespace Shared.SEUI { @@ -12,7 +12,7 @@ namespace Shared.SEUI { public IntVariable variable; [Tooltip("The input UI to edit the variable's value with")] - public InputField input; + public TMP_InputField input; // Temporary callback to bridge value changes in the UI and the variable private UnityAction<string> valueConverter; @@ -20,7 +20,7 @@ namespace Shared.SEUI { //--------------------------------------------------------------------------- void Start() { // Make sure the input handles the right content type - input.contentType = InputField.ContentType.IntegerNumber; + input.contentType = TMP_InputField.ContentType.IntegerNumber; } //--------------------------------------------------------------------------- diff --git a/Sane Eric's UI/Shared.SEUI.asmdef b/Sane Eric's UI/Shared.SEUI.asmdef index 1f7f1bd..19a6623 100644 --- a/Sane Eric's UI/Shared.SEUI.asmdef +++ b/Sane Eric's UI/Shared.SEUI.asmdef @@ -4,7 +4,7 @@ "GUID:6735fe1fe1dbd994a96eb9d888b81400", "Unity.TextMeshPro" ], - "optionalUnityReferences": [ "TestAssemblies" ], + "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, -- GitLab