From 323d05c53f0b07b80374446179e17958bb6db2e7 Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Wed, 19 Apr 2023 15:26:17 +0800 Subject: [PATCH 1/4] Update ScriptGenerator.cs --- Assets/TEngine/Editor/UI/ScriptGenerator.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/TEngine/Editor/UI/ScriptGenerator.cs b/Assets/TEngine/Editor/UI/ScriptGenerator.cs index f815fa12..e385b213 100644 --- a/Assets/TEngine/Editor/UI/ScriptGenerator.cs +++ b/Assets/TEngine/Editor/UI/ScriptGenerator.cs @@ -60,6 +60,7 @@ namespace TEngine.Editor.UI strFile.Append("using TEngine;\n\n"); strFile.Append("namespace GameMain\n"); strFile.Append("{\n"); + strFile.Append("\t[Window(UILayer.UI)]\n"); strFile.Append("\tclass " + root.name + " : UIWindow\n"); strFile.Append("\t{\n"); } From 979a2039cf2166b228c7ca9583aaafd2484932b1 Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Wed, 19 Apr 2023 15:26:36 +0800 Subject: [PATCH 2/4] Update main.unity --- Assets/Scenes/main.unity | 61 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index e1fa2540..92a511ba 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -680,8 +680,64 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1587cae710f84819b0056e98344f204d, type: 3} m_Name: m_EditorClassIdentifier: - m_AvailableProcedureTypeNames: [] - m_EntranceProcedureTypeName: + m_AvailableProcedureTypeNames: + - GameMain.ProcedureClearCache + - GameMain.ProcedureCreateDownloader + - GameMain.ProcedureDownloadFile + - GameMain.ProcedureDownloadOver + - GameMain.ProcedureInitPackage + - GameMain.ProcedureInitResources + - GameMain.ProcedureLaunch + - GameMain.ProcedureLoadAssembly + - GameMain.ProcedurePreload + - GameMain.ProcedureSplash + - GameMain.ProcedureStartGame + - GameMain.ProcedureUpdateManifest + - GameMain.ProcedureUpdateVersion + m_EntranceProcedureTypeName: GameMain.ProcedureLaunch +--- !u!1 &1599070678 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1599070679} + - component: {fileID: 1599070680} + m_Layer: 0 + m_Name: Timer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1599070679 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1599070678} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2061060682} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1599070680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1599070678} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 281867d7790648b4aa5342077ba3e5e1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1729961658 GameObject: m_ObjectHideFlags: 0 @@ -986,6 +1042,7 @@ Transform: - {fileID: 1176880018} - {fileID: 1947304785} - {fileID: 2108959336} + - {fileID: 1599070679} m_Father: {fileID: 1729961660} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} From 8b1880b4fbf690398363aabaf1ecee43f3af1eef Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Wed, 19 Apr 2023 15:27:17 +0800 Subject: [PATCH 3/4] Update main.unity --- Assets/Scenes/main.unity | 47 +++++++--------------------------------- 1 file changed, 8 insertions(+), 39 deletions(-) diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index 92a511ba..ab453f7a 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -152,7 +152,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &23410076 MonoBehaviour: @@ -420,36 +420,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!1 &230270237 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 230270238} - m_Layer: 0 - m_Name: Entity - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &230270238 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 230270237} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2061060682} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &828420965 GameObject: m_ObjectHideFlags: 0 @@ -578,7 +548,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1176880019 MonoBehaviour: @@ -621,7 +591,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1513514424 MonoBehaviour: @@ -666,7 +636,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1538699882 MonoBehaviour: @@ -724,7 +694,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1599070680 MonoBehaviour: @@ -854,7 +824,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1947304786 MonoBehaviour: @@ -981,7 +951,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2049602907 MonoBehaviour: @@ -1034,7 +1004,6 @@ Transform: m_Children: - {fileID: 43232120} - {fileID: 1823887563} - - {fileID: 230270238} - {fileID: 23410075} - {fileID: 1513514423} - {fileID: 2049602906} @@ -1097,7 +1066,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2108959337 MonoBehaviour: From 6cccf0b80f9ccd4f0f40c9cf58d7f19b588531b4 Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Wed, 19 Apr 2023 15:27:35 +0800 Subject: [PATCH 4/4] Update main.unity --- Assets/Scenes/main.unity | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index ab453f7a..07fdb286 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -548,7 +548,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1176880019 MonoBehaviour: @@ -591,7 +591,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1513514424 MonoBehaviour: @@ -636,7 +636,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1538699882 MonoBehaviour: @@ -689,12 +689,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1599070678} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 9 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1599070680 MonoBehaviour: @@ -824,7 +824,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1947304786 MonoBehaviour: @@ -951,7 +951,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2049602907 MonoBehaviour: @@ -1005,13 +1005,13 @@ Transform: - {fileID: 43232120} - {fileID: 1823887563} - {fileID: 23410075} + - {fileID: 1599070679} - {fileID: 1513514423} - {fileID: 2049602906} - {fileID: 1538699881} - {fileID: 1176880018} - {fileID: 1947304785} - {fileID: 2108959336} - - {fileID: 1599070679} m_Father: {fileID: 1729961660} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1066,7 +1066,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2061060682} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2108959337 MonoBehaviour: