From cc5654b9edb9177ddcaaf3c1af6bf489884f0c27 Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Fri, 21 Apr 2023 10:55:12 +0800 Subject: [PATCH] [+] UI ErrorLog [+] UI ErrorLog --- Assets/TEngine/Editor/Inspector/UIModuleInspector.cs | 3 +++ .../Runtime/GameFramework/UI}/ErrorLogger.meta | 0 .../Runtime/GameFramework/UI}/ErrorLogger/ErrorLogger.cs | 2 +- .../GameFramework/UI}/ErrorLogger/ErrorLogger.cs.meta | 0 .../Runtime/GameFramework/UI}/ErrorLogger/LogUI.cs | 4 +--- .../Runtime/GameFramework/UI}/ErrorLogger/LogUI.cs.meta | 0 Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs | 7 +++++++ 7 files changed, 12 insertions(+), 4 deletions(-) rename Assets/{GameScripts/HotFix/GameLogic => TEngine/Runtime/GameFramework/UI}/ErrorLogger.meta (100%) rename Assets/{GameScripts/HotFix/GameLogic => TEngine/Runtime/GameFramework/UI}/ErrorLogger/ErrorLogger.cs (96%) rename Assets/{GameScripts/HotFix/GameLogic => TEngine/Runtime/GameFramework/UI}/ErrorLogger/ErrorLogger.cs.meta (100%) rename Assets/{GameScripts/HotFix/GameLogic => TEngine/Runtime/GameFramework/UI}/ErrorLogger/LogUI.cs (96%) rename Assets/{GameScripts/HotFix/GameLogic => TEngine/Runtime/GameFramework/UI}/ErrorLogger/LogUI.cs.meta (100%) diff --git a/Assets/TEngine/Editor/Inspector/UIModuleInspector.cs b/Assets/TEngine/Editor/Inspector/UIModuleInspector.cs index fa418502..4a65ab7e 100644 --- a/Assets/TEngine/Editor/Inspector/UIModuleInspector.cs +++ b/Assets/TEngine/Editor/Inspector/UIModuleInspector.cs @@ -6,6 +6,7 @@ namespace TEngine.Editor.Inspector internal sealed class UIModuleInspector : GameFrameworkInspector { private SerializedProperty m_InstanceRoot = null; + private SerializedProperty m_enableErrorLog = null; private SerializedProperty m_dontDestroyUIRoot = null; private SerializedProperty m_UICamera = null; @@ -20,6 +21,7 @@ namespace TEngine.Editor.Inspector EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode); { EditorGUILayout.PropertyField(m_InstanceRoot); + EditorGUILayout.PropertyField(m_enableErrorLog); EditorGUILayout.PropertyField(m_dontDestroyUIRoot); EditorGUILayout.PropertyField(m_UICamera); } @@ -40,6 +42,7 @@ namespace TEngine.Editor.Inspector private void OnEnable() { m_InstanceRoot = serializedObject.FindProperty("m_InstanceRoot"); + m_enableErrorLog = serializedObject.FindProperty("m_enableErrorLog"); m_dontDestroyUIRoot = serializedObject.FindProperty("m_dontDestroyUIRoot"); m_UICamera = serializedObject.FindProperty("m_UICamera"); diff --git a/Assets/GameScripts/HotFix/GameLogic/ErrorLogger.meta b/Assets/TEngine/Runtime/GameFramework/UI/ErrorLogger.meta similarity index 100% rename from Assets/GameScripts/HotFix/GameLogic/ErrorLogger.meta rename to Assets/TEngine/Runtime/GameFramework/UI/ErrorLogger.meta diff --git a/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/ErrorLogger.cs b/Assets/TEngine/Runtime/GameFramework/UI/ErrorLogger/ErrorLogger.cs similarity index 96% rename from Assets/GameScripts/HotFix/GameLogic/ErrorLogger/ErrorLogger.cs rename to Assets/TEngine/Runtime/GameFramework/UI/ErrorLogger/ErrorLogger.cs index 0fceb93e..e6b57449 100644 --- a/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/ErrorLogger.cs +++ b/Assets/TEngine/Runtime/GameFramework/UI/ErrorLogger/ErrorLogger.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace GameLogic +namespace TEngine { public class ErrorLogger { diff --git a/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/ErrorLogger.cs.meta b/Assets/TEngine/Runtime/GameFramework/UI/ErrorLogger/ErrorLogger.cs.meta similarity index 100% rename from Assets/GameScripts/HotFix/GameLogic/ErrorLogger/ErrorLogger.cs.meta rename to Assets/TEngine/Runtime/GameFramework/UI/ErrorLogger/ErrorLogger.cs.meta diff --git a/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/LogUI.cs b/Assets/TEngine/Runtime/GameFramework/UI/ErrorLogger/LogUI.cs similarity index 96% rename from Assets/GameScripts/HotFix/GameLogic/ErrorLogger/LogUI.cs rename to Assets/TEngine/Runtime/GameFramework/UI/ErrorLogger/LogUI.cs index f7e9ae64..f794c015 100644 --- a/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/LogUI.cs +++ b/Assets/TEngine/Runtime/GameFramework/UI/ErrorLogger/LogUI.cs @@ -1,9 +1,8 @@ using System; using Cysharp.Threading.Tasks; using UnityEngine.UI; -using TEngine; -namespace GameLogic +namespace TEngine { [Window(UILayer.System)] class LogUI : UIWindow @@ -32,6 +31,5 @@ namespace GameLogic { m_textError.text = UserData.ToString(); } - } } diff --git a/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/LogUI.cs.meta b/Assets/TEngine/Runtime/GameFramework/UI/ErrorLogger/LogUI.cs.meta similarity index 100% rename from Assets/GameScripts/HotFix/GameLogic/ErrorLogger/LogUI.cs.meta rename to Assets/TEngine/Runtime/GameFramework/UI/ErrorLogger/LogUI.cs.meta diff --git a/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs b/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs index b552aebb..8ecb0665 100644 --- a/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs +++ b/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs @@ -18,6 +18,8 @@ namespace TEngine [SerializeField] private bool m_dontDestroyUIRoot = true; + [SerializeField] private bool m_enableErrorLog = true; + [SerializeField] private Camera m_UICamera = null; private readonly List _stack = new List(100); @@ -61,6 +63,11 @@ namespace TEngine m_InstanceRoot.gameObject.layer = LayerMask.NameToLayer("UI"); UIRootStatic = m_InstanceRoot; + + if (m_enableErrorLog) + { + ErrorLogger errorLogger = new ErrorLogger(); + } } private void OnDestroy()