AlphaaeGameStudio/TEngine
1
0
Fork 0
mirror of https://github.com/Alex-Rachel/TEngine.git synced 2025-08-14 16:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

UIModule

Browse Source
This commit is contained in:
ALEXTANG
2023-04-10 21:01:45 +08:00
parent 51b2eaf6b4
commit bd68a143c5
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/TEngine/Editor/Inspector/UIModuleInspector.cs
View File

@@ -6,6 +6,7 @@ namespace TEngine.Editor.Inspector
internal sealed class UIModuleInspector : GameFrameworkInspector internal sealed class UIModuleInspector : GameFrameworkInspector
{ {
private SerializedProperty m_InstanceRoot = null; private SerializedProperty m_InstanceRoot = null;
private SerializedProperty m_dontDestroyUIRoot = null;
private SerializedProperty m_UICamera = null; private SerializedProperty m_UICamera = null;
private SerializedProperty m_UIGroups = null; private SerializedProperty m_UIGroups = null;
@@ -23,6 +24,7 @@ namespace TEngine.Editor.Inspector
EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode); EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode);
{ {
EditorGUILayout.PropertyField(m_InstanceRoot); EditorGUILayout.PropertyField(m_InstanceRoot);
EditorGUILayout.PropertyField(m_dontDestroyUIRoot);
EditorGUILayout.PropertyField(m_UICamera); EditorGUILayout.PropertyField(m_UICamera);
m_UIWindowHelperInfo.Draw(); m_UIWindowHelperInfo.Draw();
m_UIGroupHelperInfo.Draw(); m_UIGroupHelperInfo.Draw();
@@ -50,6 +52,7 @@ namespace TEngine.Editor.Inspector
private void OnEnable() private void OnEnable()
{ {
m_InstanceRoot = serializedObject.FindProperty("m_InstanceRoot"); m_InstanceRoot = serializedObject.FindProperty("m_InstanceRoot");
m_dontDestroyUIRoot = serializedObject.FindProperty("m_dontDestroyUIRoot");
m_UICamera = serializedObject.FindProperty("m_UICamera"); m_UICamera = serializedObject.FindProperty("m_UICamera");
m_UIGroups = serializedObject.FindProperty("m_UIGroups"); m_UIGroups = serializedObject.FindProperty("m_UIGroups");

6
Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs
View File

@@ -25,6 +25,8 @@ namespace TEngine
[SerializeField] private Transform m_InstanceRoot = null; [SerializeField] private Transform m_InstanceRoot = null;
[SerializeField] private bool m_dontDestroyUIRoot = true;
[SerializeField] private Camera m_UICamera = null; [SerializeField] private Camera m_UICamera = null;
[SerializeField] private string m_UIWindowHelperTypeName = "TEngine.DefaultUIWindowHelper"; [SerializeField] private string m_UIWindowHelperTypeName = "TEngine.DefaultUIWindowHelper";
@@ -88,6 +90,10 @@ namespace TEngine
m_InstanceRoot.SetParent(gameObject.transform); m_InstanceRoot.SetParent(gameObject.transform);
m_InstanceRoot.localScale = Vector3.one; m_InstanceRoot.localScale = Vector3.one;
} }
else if (m_dontDestroyUIRoot)
{
DontDestroyOnLoad(m_InstanceRoot.parent);
}
m_InstanceRoot.gameObject.layer = LayerMask.NameToLayer("UI"); m_InstanceRoot.gameObject.layer = LayerMask.NameToLayer("UI");
UIRootStatic = m_InstanceRoot; UIRootStatic = m_InstanceRoot;