diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index e1fa2540..07fdb286 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 @@ -680,8 +650,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: 3 + 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 @@ -978,8 +1004,8 @@ Transform: m_Children: - {fileID: 43232120} - {fileID: 1823887563} - - {fileID: 230270238} - {fileID: 23410075} + - {fileID: 1599070679} - {fileID: 1513514423} - {fileID: 2049602906} - {fileID: 1538699881} 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"); }