diff --git a/Assets/UnityTest/ZXL/Scene/Main.unity b/Assets/UnityTest/ZXL/Scene/Main.unity index 7144c7a..ad0943a 100644 --- a/Assets/UnityTest/ZXL/Scene/Main.unity +++ b/Assets/UnityTest/ZXL/Scene/Main.unity @@ -29950,6 +29950,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 410c143c96354285abf864ad1f7f28db, type: 3} m_Name: m_EditorClassIdentifier: + uiType: 3 left: role: {fileID: 1265401989} content: {fileID: 1272850033} @@ -39624,7 +39625,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 188a37a0916d47e8bb368b803dc1041a, type: 3} m_Name: m_EditorClassIdentifier: - text: {fileID: 0} + uiType: 2 + text: {fileID: 145330838} --- !u!1 &1249638670 GameObject: m_ObjectHideFlags: 0 @@ -42869,6 +42871,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2e775744d67d4d7d83432cdd23929ad6, type: 3} m_Name: m_EditorClassIdentifier: + uiType: 0 images: - {fileID: 1862209240} - {fileID: 842584874} @@ -45621,6 +45624,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b967c97a49204ffb827fdc272dc04f79, type: 3} m_Name: m_EditorClassIdentifier: + uiType: 1 titleText: {fileID: 1430372477} contentText: {fileID: 74636445} btnLeft: {fileID: 1508883186} @@ -59939,6 +59943,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1864616516} + - component: {fileID: 1864616517} m_Layer: 0 m_Name: UI m_TagString: Untagged @@ -59962,6 +59967,36 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1864616517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864616515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f649c2f837524dc68a634d0ea3844730, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + uiObjectData: + - uiType: 0 + ui: {fileID: 1352941224} + - uiType: 0 + ui: {fileID: 1448946252} + - uiType: 0 + ui: {fileID: 1248219822} + - uiType: 0 + ui: {fileID: 834112896} --- !u!1 &1866609136 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/UnityTest/ZXL/Scripts/DialogueUI.cs b/Assets/UnityTest/ZXL/Scripts/DialogueUI.cs index 6e00c0a..52c5bc3 100644 --- a/Assets/UnityTest/ZXL/Scripts/DialogueUI.cs +++ b/Assets/UnityTest/ZXL/Scripts/DialogueUI.cs @@ -6,7 +6,7 @@ using UnityEngine.UI; namespace UnityTest.ZXL { - public class DialogueUI : MonoBehaviour + public class DialogueUI : UI { public DialogueStr left; public DialogueStr right; diff --git a/Assets/UnityTest/ZXL/Scripts/UI/ChapterUI.cs b/Assets/UnityTest/ZXL/Scripts/UI/ChapterUI.cs index 73888ac..951b8fd 100644 --- a/Assets/UnityTest/ZXL/Scripts/UI/ChapterUI.cs +++ b/Assets/UnityTest/ZXL/Scripts/UI/ChapterUI.cs @@ -7,7 +7,7 @@ using UnityEngine.UI; namespace UnityTest.ZXL { //章节 - public class ChapterUI : MonoBehaviour + public class ChapterUI : UI { public List images = new List(); public Image blackImage; diff --git a/Assets/UnityTest/ZXL/Scripts/UI/StrongTipsUI.cs b/Assets/UnityTest/ZXL/Scripts/UI/StrongTipsUI.cs index 794f21e..341e8d0 100644 --- a/Assets/UnityTest/ZXL/Scripts/UI/StrongTipsUI.cs +++ b/Assets/UnityTest/ZXL/Scripts/UI/StrongTipsUI.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; namespace UnityTest.ZXL { //强提示 - public class StrongTipsUI : MonoBehaviour + public class StrongTipsUI : UI { public TextMeshProUGUI titleText; public TextMeshProUGUI contentText; diff --git a/Assets/UnityTest/ZXL/Scripts/UI/UI.cs b/Assets/UnityTest/ZXL/Scripts/UI/UI.cs new file mode 100644 index 0000000..8d825d2 --- /dev/null +++ b/Assets/UnityTest/ZXL/Scripts/UI/UI.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +namespace UnityTest.ZXL +{ + public class UI : MonoBehaviour + { + public UIType uiType; + } +} \ No newline at end of file diff --git a/Assets/UnityTest/ZXL/Scripts/UI/UI.cs.meta b/Assets/UnityTest/ZXL/Scripts/UI/UI.cs.meta new file mode 100644 index 0000000..b5a2613 --- /dev/null +++ b/Assets/UnityTest/ZXL/Scripts/UI/UI.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 059209d21f9f470295c74db08ab385b4 +timeCreated: 1694589070 \ No newline at end of file diff --git a/Assets/UnityTest/ZXL/Scripts/UI/UIManager.cs b/Assets/UnityTest/ZXL/Scripts/UI/UIManager.cs index 7c2b8af..635276d 100644 --- a/Assets/UnityTest/ZXL/Scripts/UI/UIManager.cs +++ b/Assets/UnityTest/ZXL/Scripts/UI/UIManager.cs @@ -1,25 +1,47 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using Sirenix.OdinInspector; using UnityEngine; namespace UnityTest.ZXL { - public class UIManager : SerializedMonoBehaviour + public class UIManager : BaseAutoMono { public List uiObjectData = new List(); - - + + public void ShowUI(UIType uiType) + { + } + + public void HideUI(UIType uiType) + { + } + +#if UNITY_EDITOR + [Button] + void Add() + { + var uis = this.gameObject.GetComponentAllChild(); + foreach (var ui in uis) + { + uiObjectData.Add(new UIObjectData() {uiType = ui.uiType, ui = ui}); + } + } +#endif } public enum UIType { - + Chapter, //章节 + StrongTips, //强提示 + WeakTips, //弱提示 + Dialogue, //对话 } - + [System.Serializable] public struct UIObjectData { - public string uiName; - public GameObject ui; + public UIType uiType; + public UI ui; } } \ No newline at end of file diff --git a/Assets/UnityTest/ZXL/Scripts/UI/WeakTipsUI.cs b/Assets/UnityTest/ZXL/Scripts/UI/WeakTipsUI.cs index 9d6b501..ab626cc 100644 --- a/Assets/UnityTest/ZXL/Scripts/UI/WeakTipsUI.cs +++ b/Assets/UnityTest/ZXL/Scripts/UI/WeakTipsUI.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; namespace UnityTest.ZXL { // 若提示 - public class WeakTipsUI : MonoBehaviour + public class WeakTipsUI : UI { public TextMeshProUGUI text;