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 
UIModule
This commit is contained in:
ALEXTANG
2023-04-04 11:51:33 +08:00
parent 41a0243d91
commit 9b041b2dc7
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/TEngine/Editor/Inspector/UIComponentInspector.cs → Assets/TEngine/Editor/Inspector/UIModuleInspector.cs
View File

@@ -2,8 +2,8 @@
namespace TEngine.Editor.Inspector namespace TEngine.Editor.Inspector
{ {
[CustomEditor(typeof(UIComponent))] [CustomEditor(typeof(UIModule))]
internal sealed class UIComponentInspector : GameFrameworkInspector internal sealed class UIModuleInspector : GameFrameworkInspector
{ {
private SerializedProperty m_InstanceRoot = null; private SerializedProperty m_InstanceRoot = null;
private SerializedProperty m_UICamera = null; private SerializedProperty m_UICamera = null;
@@ -18,7 +18,7 @@ namespace TEngine.Editor.Inspector
serializedObject.Update(); serializedObject.Update();
UIComponent t = (UIComponent)target; UIModule t = (UIModule)target;
EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode); EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode);
{ {

0
Assets/TEngine/Editor/Inspector/UIComponentInspector.cs.meta → Assets/TEngine/Editor/Inspector/UIModuleInspector.cs.meta
View File

2
Assets/TEngine/Runtime/GameFramework/UI/UIGroup/UIComponent.UIGroup.cs
View File

@@ -3,7 +3,7 @@ using UnityEngine;
namespace TEngine namespace TEngine
{ {
public sealed partial class UIComponent : GameFrameworkComponent public sealed partial class UIModule : GameFrameworkComponent
{ {
[Serializable] [Serializable]
private sealed class UIGroup private sealed class UIGroup

4
Assets/TEngine/Runtime/GameFramework/UI/UIComponent.cs → Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs
View File

@@ -16,10 +16,10 @@ namespace TEngine
} }
/// <summary> /// <summary>
/// UI组件。 /// UI模块。
/// </summary> /// </summary>
[DisallowMultipleComponent] [DisallowMultipleComponent]
public sealed partial class UIComponent : GameFrameworkComponent public sealed partial class UIModule : GameFrameworkComponent
{ {
private const int DefaultPriority = 0; private const int DefaultPriority = 0;

0
Assets/TEngine/Runtime/GameFramework/UI/UIComponent.cs.meta → Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs.meta
View File

2
Assets/TEngine/Runtime/GameFramework/UI/UIWidget.cs
View File

@@ -175,7 +175,7 @@ namespace TEngine
for (var index = 0; index < listCanvas.Length; index++) for (var index = 0; index < listCanvas.Length; index++)
{ {
var childCanvas = listCanvas[index]; var childCanvas = listCanvas[index];
childCanvas.sortingOrder = parentCanvas.sortingOrder + childCanvas.sortingOrder % UIComponent.WINDOW_DEEP; childCanvas.sortingOrder = parentCanvas.sortingOrder + childCanvas.sortingOrder % UIModule.WINDOW_DEEP;
} }
} }
#endregion #endregion

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

@@ -139,7 +139,7 @@ namespace TEngine
{ {
if (_canvas != null) if (_canvas != null)
{ {
return _canvas.gameObject.layer == UIComponent.WINDOW_SHOW_LAYER; return _canvas.gameObject.layer == UIModule.WINDOW_SHOW_LAYER;
} }
else else
{ {
@@ -151,7 +151,7 @@ namespace TEngine
{ {
if (_canvas != null) if (_canvas != null)
{ {
int setLayer = value ? UIComponent.WINDOW_SHOW_LAYER : UIComponent.WINDOW_HIDE_LAYER; int setLayer = value ? UIModule.WINDOW_SHOW_LAYER : UIModule.WINDOW_HIDE_LAYER;
if (_canvas.gameObject.layer == setLayer) if (_canvas.gameObject.layer == setLayer)
return; return;
@@ -361,7 +361,7 @@ namespace TEngine
} }
// 实例化对象 // 实例化对象
_panel = handle.InstantiateSync(UIComponent.UIRootStatic); _panel = handle.InstantiateSync(UIModule.UIRootStatic);
_panel.transform.localPosition = Vector3.zero; _panel.transform.localPosition = Vector3.zero;
// 获取组件 // 获取组件

6
Assets/TEngine/Runtime/GameModule.cs
View File

@@ -40,9 +40,9 @@ public class GameModule:MonoBehaviour
public static SettingComponent Setting { get; private set; } public static SettingComponent Setting { get; private set; }
/// <summary> /// <summary>
/// 获取界面组件。 /// 获取UI模块。
/// </summary> /// </summary>
public static UIComponent UI { get; private set; } public static UIModule UI { get; private set; }
#endregion #endregion
@@ -57,7 +57,7 @@ public class GameModule:MonoBehaviour
ObjectPool = Get<ObjectPoolComponent>(); ObjectPool = Get<ObjectPoolComponent>();
Resource = Get<ResourceComponent>(); Resource = Get<ResourceComponent>();
Setting = Get<SettingComponent>(); Setting = Get<SettingComponent>();
UI = Get<UIComponent>(); UI = Get<UIModule>();
} }
public static void InitCustomComponents() public static void InitCustomComponents()