修改Debug工具

Resources/UI/Console.prefab

@@ -174,7 +174,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &422381412483780943
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1425,7 +1425,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -1521,7 +1521,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
   m_MinWidth: -1
-  m_MinHeight: -1
+  m_MinHeight: 80
   m_PreferredWidth: -1
   m_PreferredHeight: 100
   m_FlexibleWidth: -1
@@ -2200,7 +2200,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -2999,6 +2999,7 @@ GameObject:
   - component: {fileID: 4729699525819985522}
   - component: {fileID: 8860455315290877675}
   - component: {fileID: 5820508368243838493}
+  - component: {fileID: 919599457488568932}
   m_Layer: 5
   m_Name: Console
   m_TagString: Untagged
@@ -3077,6 +3078,26 @@ MonoBehaviour:
   m_logItem: {fileID: 4986082269114511332}
   m_logInfoText: {fileID: 158377702976253081}
   m_logInfoContent: {fileID: 4712303639915398071}
+--- !u!114 &919599457488568932
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7901705949282892813}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: 1
+  m_FlexibleHeight: 1
+  m_LayoutPriority: 1
 --- !u!1 &8049699809490860672
 GameObject:
   m_ObjectHideFlags: 0
@@ -3241,7 +3262,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7222317201223020142
 RectTransform:
   m_ObjectHideFlags: 0

Resources/UI/DebugPanel.prefab

@@ -133,7 +133,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
   m_MinWidth: -1
-  m_MinHeight: -1
+  m_MinHeight: 80
   m_PreferredWidth: -1
   m_PreferredHeight: 100
   m_FlexibleWidth: -1
@@ -333,7 +333,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -387,7 +387,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_AspectMode: 1
+  m_AspectMode: 3
   m_AspectRatio: 1.7777778
 --- !u!1 &1987371793023134104
 GameObject:
@@ -501,10 +501,10 @@ RectTransform:
   m_Father: {fileID: 1987371792633695863}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1987371793039076130
 MonoBehaviour:

Runtime/Scripts/Resource/LoadResHandle.cs

@@ -34,14 +34,14 @@ namespace TFramework
         /// <summary>
         /// ¼ÓÔØÍê³Éʼþ
         /// </summary>
-        public TFuncAsync<T,bool> OnLoadOver;
+        public TAction<T> OnLoadOver;
 
         public LoadResHandle()
         {
 
         }
 
-        public LoadResHandle(ResLoadMode resLoadMode, string resourePath, string assetbundleName, string assetPath, TAction<float> onLoading = null, TFuncAsync<T, bool> onLoadOver = null)
+        public LoadResHandle(ResLoadMode resLoadMode, string resourePath, string assetbundleName, string assetPath, TAction<float> onLoading = null, TAction<T> onLoadOver = null)
         {
             LoadMode = resLoadMode;
             ResourcePath = resourePath;
@@ -57,7 +57,7 @@ namespace TFramework
         /// <param name="resourePath"></param>
         /// <param name="onLoading"></param>
         /// <param name="onLoadOver"></param>
-        public LoadResHandle(string resourePath, TAction<float> onLoading = null, TFuncAsync<T, bool> onLoadOver = null)
+        public LoadResHandle(string resourePath, TAction<float> onLoading = null, TAction<T> onLoadOver = null)
         {
             LoadMode = ResLoadMode.Resourece;
             ResourcePath = resourePath;
@@ -73,7 +73,7 @@ namespace TFramework
         /// <param name="assetPath"></param>
         /// <param name="onLoading"></param>
         /// <param name="onLoadOver"></param>
-        public LoadResHandle(string assetbundleName, string assetPath, TAction<float> onLoading = null, TFuncAsync<T, bool> onLoadOver = null)
+        public LoadResHandle(string assetbundleName, string assetPath, TAction<float> onLoading = null, TAction<T> onLoadOver = null)
         {
             LoadMode = ResLoadMode.AssetBundle;
             AssetBundleName = assetbundleName;
@@ -82,7 +82,7 @@ namespace TFramework
             OnLoadOver = onLoadOver;
         }
 
-        public LoadResHandle(UIResourceAttribute attribute, TAction<float> onLoading = null, TFuncAsync<T, bool> onLoadOver = null)
+        public LoadResHandle(UIResourceAttribute attribute, TAction<float> onLoading = null, TAction<T> onLoadOver = null)
         {
             LoadMode = attribute.LoadMode;
             ResourcePath = attribute.ResourcePath;

Runtime/Scripts/Resource/ResourceManager.cs

@@ -189,7 +189,7 @@ namespace TFramework
         /// <param name="onLoading">加载中事件</param>
         /// <param name="onLoadDone">加载完成事件</param>
         /// <returns></returns>
-        public async UniTask<Scene> LoadSceneAsync(string scenePath, TAction<float> OnLoading, TFuncAsync<Scene, bool> OnLoadOver, LoadSceneMode loadSceneMode = LoadSceneMode.Single)
+        public async UniTask<Scene> LoadSceneAsync(string scenePath, TAction<float> OnLoading, TAction<Scene> OnLoadOver, LoadSceneMode loadSceneMode = LoadSceneMode.Single)
         {
            return  await LoadScene(scenePath, ResLoadMode.Resourece, "", OnLoading, OnLoadOver, loadSceneMode);
         }
@@ -207,7 +207,7 @@ namespace TFramework
             return await LoadScene(resHandle.AssetPath,resHandle.LoadMode,resHandle.AssetBundleName,resHandle.OnLoading,resHandle.OnLoadOver, loadSceneMode);
         }
 
-        private async UniTask<Scene> LoadScene(string scenePath, ResLoadMode loadMode ,string assetBundleName ,TAction<float> OnLoading,TFuncAsync<Scene, bool> OnLoadOver, LoadSceneMode loadSceneMode)
+        private async UniTask<Scene> LoadScene(string scenePath, ResLoadMode loadMode ,string assetBundleName ,TAction<float> OnLoading,TAction<Scene> OnLoadOver, LoadSceneMode loadSceneMode)
         {
             if (SceneManager.GetSceneByPath(scenePath) == CurrentScene)
             {
@@ -249,19 +249,12 @@ namespace TFramework
                 await UniTask.Yield();
             }
             Debug.Log($"加载场景{scenePath}完成");
-            OnLoading?.Invoke(1);
-            if(OnLoadOver != null)
-            {
-                if (await OnLoadOver.Invoke(SceneManager.GetSceneByPath(scenePath)))
-                {
-                    ao.allowSceneActivation = true;
-                }
-            }
-            else
-                ao.allowSceneActivation = true;
+           
+           ao.allowSceneActivation = true;
 
             await ao.ToUniTask();
-
+            OnLoading?.Invoke(1);
+            OnLoadOver?.Invoke(SceneManager.GetSceneByPath(scenePath));
             SceneManager.SetActiveScene(SceneManager.GetSceneByPath(scenePath));
             CurrentScene = SceneManager.GetActiveScene();
             return CurrentScene;