diff --git a/Assets/Scripts/ProjectBase/UIManager/BaseItem.cs b/Assets/Scripts/ProjectBase/UIManager/BaseItem.cs index 7d52ee6..efe97da 100644 --- a/Assets/Scripts/ProjectBase/UIManager/BaseItem.cs +++ b/Assets/Scripts/ProjectBase/UIManager/BaseItem.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; @@ -26,6 +27,7 @@ public class BaseItem : MonoBehaviour FindChildrenControl(); FindChildrenControl(); FindChildrenControl(); + FindChildrenControl(); } /// diff --git a/Assets/Scripts/ProjectBase/UIManager/BasePanel.cs b/Assets/Scripts/ProjectBase/UIManager/BasePanel.cs index fb478a1..dcfb829 100644 --- a/Assets/Scripts/ProjectBase/UIManager/BasePanel.cs +++ b/Assets/Scripts/ProjectBase/UIManager/BasePanel.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; @@ -25,6 +26,7 @@ public class BasePanel : MonoBehaviour FindChildrenControl(); FindChildrenControl(); FindChildrenControl(); + FindChildrenControl(); } /// diff --git a/Packages/manifest.json b/Packages/manifest.json index 677bc2e..c3f2a32 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -9,6 +9,7 @@ "com.unity.ide.vscode": "1.2.5", "com.unity.render-pipelines.universal": "12.1.14", "com.unity.test-framework": "1.1.33", + "com.unity.textmeshpro": "3.0.9", "com.unity.timeline": "1.6.5", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.9.2", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 7de2021..f4c3f1d 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -160,6 +160,15 @@ }, "url": "https://packages.unity.cn" }, + "com.unity.textmeshpro": { + "version": "3.0.9", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.cn" + }, "com.unity.timeline": { "version": "1.6.5", "depth": 0, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 92781d8..bd33611 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -723,7 +723,23 @@ PlayerSettings: webGLThreadsSupport: 0 webGLDecompressionFallback: 0 webGLPowerPreference: 2 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + Android: DOTWEEN + EmbeddedLinux: DOTWEEN + GameCoreScarlett: DOTWEEN + GameCoreXboxOne: DOTWEEN + LinuxHeadlessSimulation: DOTWEEN + Lumin: DOTWEEN + Nintendo Switch: DOTWEEN + PS4: DOTWEEN + PS5: DOTWEEN + Stadia: DOTWEEN + Standalone: DOTWEEN + WebGL: DOTWEEN + Windows Store Apps: DOTWEEN + XboxOne: DOTWEEN + iPhone: DOTWEEN + tvOS: DOTWEEN additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: