添加Debug工具

Editor/CreateScript/Template/UIBaseScript.txt

@@ -28,7 +28,7 @@ public partial class #ClassName :BasePanel
         base.OnEnter(args);
     }
 
-    public override void OnExit(IPanelData args = null)
+    public override void OnExit(IPanelData args = null,bool isDestroy=false)
     {
         base.OnExit(args);
     }

Editor/Inspector/MianInspector.cs

@@ -11,10 +11,12 @@ public class MianInspector:TEditor
 {
     private SerializedProperty _doNotDestroy;
     private SerializedProperty _ManagerList;
+    private SerializedProperty _IsEnableDebug;
     private ReorderableList _managerReorderable;
 
     private GUIContent dndGC = new GUIContent("跳场景不销毁");
     private GUIContent mListGC = new GUIContent("管理器注册表");
+    private GUIContent dbGC = new GUIContent("启用Debug工具");
     List<BaseManager> monos = new List<BaseManager>();
     List<Type> magTypes;
 
@@ -22,6 +24,7 @@ public class MianInspector:TEditor
     {
         _doNotDestroy = serializedObject.FindProperty("doNotDestroy");
         _ManagerList = serializedObject.FindProperty("m_ManagerList");
+        _IsEnableDebug = serializedObject.FindProperty("IsEnableDebug");
         _managerReorderable = new ReorderableList(serializedObject, _ManagerList);
 
         magTypes = GlobalTool.GetTypesInRunTimeAssemblies(type =>
@@ -81,6 +84,7 @@ public class MianInspector:TEditor
         serializedObject.Update();
         EditorGUILayout.PropertyField(_doNotDestroy,dndGC);
         _managerReorderable.DoLayoutList();
+        EditorGUILayout.PropertyField(_IsEnableDebug,dbGC);
         serializedObject.ApplyModifiedProperties();
     }
 }

Editor/Inspector/UIBehaviourInspector.cs

@@ -20,6 +20,8 @@ namespace TFramework
         SerializedProperty parnetPanel;
         Component[] behaviours;
         ReorderableList variableList;
+        SerializedProperty useResInfos;
+        ReorderableList useResList;
 
         List<string> anims = new List<string>();
         int select = 0;
@@ -41,6 +43,7 @@ namespace TFramework
             isScriptUse = serializedObject.FindProperty("isScriptUse");
             variableInfos = serializedObject.FindProperty("variableInfos");
             parnetPanel = serializedObject.FindProperty("parnetPanel");
+            useResInfos = serializedObject.FindProperty("useResInfos");
 
             if (string.IsNullOrEmpty(m_id.stringValue))
             {
@@ -226,6 +229,33 @@ namespace TFramework
                 AssetDatabase.Refresh();
                 ReorderableList.defaultBehaviours.DoRemoveButton(list);
             };
+
+            useResList = new ReorderableList(serializedObject, useResInfos, false, true, true, true);
+            useResList.drawHeaderCallback = rect =>
+            {
+                GUI.Label(rect, "使用资源列表");
+            };
+            useResList.drawElementCallback = (rect, index, isActive, isFocused) =>
+            {
+                SerializedProperty property = useResInfos.GetArrayElementAtIndex(index);
+                SerializedProperty resObj = property.FindPropertyRelative("resObj");
+                SerializedProperty resName = property.FindPropertyRelative("resName");
+                float width = rect.width / 2;
+                rect.width = 63;
+                GUI.Label(rect, "资源名：");
+                rect.x += 63;
+                rect.width = width - 63;
+                resName.stringValue = EditorGUI.TextField(rect, resName.stringValue);
+                
+                rect.x += rect.width + 3;
+                rect.width = 43;
+                GUI.Label(rect, "资源：");
+                rect.x += 43;
+                rect.width = width - 40;
+                resObj.objectReferenceValue = EditorGUI.ObjectField(rect, resObj.objectReferenceValue, typeof(Object), true);
+            };
+
+
             if (!string.IsNullOrEmpty(parnetPanel.stringValue))
                 scriptText = AssetDatabase.LoadAssetAtPath<TextAsset>(scriptPathDic[parnetPanel.stringValue]).text;
         }
@@ -275,6 +305,7 @@ namespace TFramework
                     variableList.DoLayoutList();
                 }
             }
+            useResList.DoLayoutList();
             serializedObject.ApplyModifiedProperties();
         }
     }

Editor/Tool/Preference.cs

@@ -28,10 +28,17 @@ namespace TFramework
         private void OnEnable()
         {
             preferenceData = AssetDatabase.LoadAssetAtPath<PreferenceData>(DATAPATH);
+            if(preferenceData == null )
+            {
+                preferenceData = CreateInstance<PreferenceData>();
+                AssetDatabase.CreateAsset(preferenceData, DATAPATH);
+                AssetDatabase.SaveAssets();
+            }
         }
 
         private void OnGUI()
         {
+            if (preferenceData == null) return;
             using(new EditorGUILayout.HorizontalScope())
             {
                 GUILayout.Label("自动保存");
@@ -81,6 +88,7 @@ namespace TFramework
 
         private void SaveData()
         {
+            if (preferenceData == null) return;
             EditorUtility.SetDirty(preferenceData);
             AssetDatabase.SaveAssets();
         }

Editor/Tool/PreferenceExecutor.cs

@@ -46,6 +46,7 @@ namespace TFramework
         [RuntimeInitializeOnLoadMethod]
         private static void OnEditorRunTime()
         {
+            if (preferenceData == null) return;
             if (preferenceData.m_isAlwaysFormAssignScene)
                 if (!string.IsNullOrEmpty(preferenceData.m_assignScene) && SceneManager.GetActiveScene().path != preferenceData.m_assignScene)
                 {

Editor/UserInfo/UserData.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8c9bb4c17e498c64795a47665878144c
+guid: be8d41c132cdeb04bbf228513b4e7f03
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Editor/Data/PreferenceData.asset.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: e6cf376989d7df349858d35d364f9378
-NativeFormatImporter:
+guid: 84359794051c0d5479df5bec1a9d6078
+PrefabImporter:
   externalObjects: {}
-  mainObjectFileID: 11400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Resources/UI/DebugPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5c53e66f64c90a846bf233e970d55636
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Resources/gantanhao.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 75a5a3ebeafb90e4cbac695e54f3fc66
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Resources/调试图标.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 6fb18b2b72fa4c44fa4a461226731adc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/Scripts/Debug/Component.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7e93deb34708e464e9dd79d8eb20ef27
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/Scripts/Debug/Component/BaseComponent.cs

@@ -0,0 +1,12 @@
+using TFramework;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BaseComponent : MonoBehaviour
+{
+    public virtual void Init()
+    {
+
+    }
+}

Runtime/Scripts/Debug/Component/BaseComponent.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 22a476855037f934db871f61a6ca86ef
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/Scripts/Debug/Component/Console.cs

@@ -0,0 +1,155 @@
+using TFramework;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using System;
+
+namespace TFramework
+{
+    public class Console : BaseComponent
+    {
+        public Toggle m_infoTog;
+        public Text m_infoCountText;
+        public Toggle m_warningTog;
+        public Text m_warningCountText;
+        public Toggle m_errorTog;
+        public Text m_errorCountText;
+        public Button m_clearBtn;
+
+        public Toggle m_logItem;
+        private List<Toggle> m_logItems = new List<Toggle>();
+
+        public InputField m_logInfoText;
+        public Text m_logInfoContent;
+
+        private List<ConsoleLog> _infoLogs = new List<ConsoleLog>();
+        private List<ConsoleLog> _errorLogs = new List<ConsoleLog>();
+        private List<ConsoleLog> _warningLogs = new List<ConsoleLog>();
+
+        private List<ConsoleLog> _logBuffers = new List<ConsoleLog>();
+
+        string msg;
+        bool _isDestroy = false;
+        // Start is called before the first frame update
+        void Start()
+        {
+            //m_logInfoText.onValueChanged.AddListener(st =>
+            //{
+            //    if (st != msg)
+            //        m_logInfoText.text = msg;
+            //});
+        }
+
+        public override void Init()
+        {
+            base.Init();
+            Clear();
+            Application.logMessageReceived += OnLogMessageReceived;
+            m_clearBtn.onClick.AddListener(Clear);
+
+            m_infoTog.onValueChanged.AddListener(isOn => Refresh());
+            m_warningTog.onValueChanged.AddListener(isOn => Refresh());
+            m_errorTog.onValueChanged.AddListener(isOn => Refresh());
+
+            Main.Instance.Delay(0.2f, () =>
+            {
+                m_infoTog.isOn = true;
+                m_warningTog.isOn = true;
+                m_errorTog.isOn = true;
+            });
+        }
+
+        private void Refresh()
+        {
+            m_logItems.ForEach(i => i.SetActive(false));
+            msg = string.Empty;
+            m_logInfoText.text = string.Empty;
+            _logBuffers.Clear();
+            if(m_infoTog.isOn)
+                _logBuffers.AddRange(_infoLogs);
+            if(m_warningTog.isOn)
+                _logBuffers.AddRange(_warningLogs);
+            if( m_errorTog.isOn)
+                _logBuffers.AddRange(_errorLogs);
+
+            _logBuffers.Sort((a,b)=>a.Time.CompareTo(b.Time));
+
+            for (int i = 0; i < _logBuffers.Count; i++)
+            {
+                if (m_logItems.Count <= i)
+                {
+                    m_logItems.Add(m_logItem.Clone(m_logItem.transform.parent));
+                }
+                int index = i;
+                m_logItems[i].gameObject.SetActive(true);
+                m_logItems[i].GetChildComponent<Text>("Label").text = $"<color={(_logBuffers[i].Type == LogType.Log ? "white" : (_logBuffers[i].Type==LogType.Warning?"yellow":"red"))}>{_logBuffers[i].Name}</color>";
+                m_logItems[i].onValueChanged.RemoveAllListeners();
+                m_logItems[i].onValueChanged.AddListener (isOn =>
+                {
+                    if (isOn)
+                    {
+                        msg = $"<color={(_logBuffers[index].Type == LogType.Log ? "white" : (_logBuffers[index].Type == LogType.Warning ? "yellow" : "red"))}>{_logBuffers[index].Message}</color>\n{_logBuffers[index].StackTrace}";
+                        m_logInfoContent.text = $"{_logBuffers[index].Message}\n{_logBuffers[index].StackTrace}";
+                        m_logInfoText.text = msg;
+                    }
+                });
+            }
+        }
+
+        private void OnLogMessageReceived(string condition, string stackTrace, LogType type)
+        {
+            ConsoleLog log = new ConsoleLog();
+            log.Time = DateTime.Now;
+            log.Message = condition;
+            log.StackTrace = stackTrace;
+            if (type == LogType.Assert)
+            {
+                log.Type = LogType.Error;
+                _errorLogs.Add(log);
+            }
+            else if (type == LogType.Exception || type == LogType.Error)
+            {
+                log.Type = LogType.Error;
+                _errorLogs.Add(log);
+            }
+            else if (type == LogType.Warning)
+            {
+                log.Type = LogType.Warning;
+               _warningLogs.Add(log);
+            }
+            else if (type == LogType.Log)
+            {
+                log.Type = LogType.Log;
+                _infoLogs.Add(log);
+            }
+            log.Name = string.Format("[{0}] [{1}] {2}", log.Type, log.Time.ToString("HH:mm:ss"), log.Message);
+            if (_isDestroy||m_errorCountText==null||m_infoCountText==null|m_warningCountText==null) return;
+            m_errorCountText.text = _errorLogs.Count < 99 ? _errorLogs.Count.ToString() : "99+";
+            m_infoCountText.text = _infoLogs.Count < 99 ? _infoLogs.Count.ToString() : "99+";
+            m_warningCountText.text = _warningLogs.Count < 99 ? _warningLogs.Count.ToString() : "99+";
+            Refresh();
+        }
+
+        private void Clear()
+        {
+            _infoLogs.Clear();
+            _warningLogs.Clear();
+            _errorLogs.Clear();
+            m_errorCountText.text = string.Empty;
+            m_infoCountText.text = string.Empty;
+            m_warningCountText.text = string.Empty;
+            m_logItems.ForEach(i=>i.SetActive(false));
+            m_logInfoText.text = string.Empty;
+            m_infoCountText.text = string.Empty;
+        }
+
+
+        private void OnDestroy()
+        {
+            _isDestroy = true;
+            Application.logMessageReceived -= OnLogMessageReceived;
+        }
+    }
+
+}

Runtime/Scripts/Debug/Component/Console.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 78099562789a0c14ea9526215f292ed4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/Scripts/Debug/Component/ConsoleLog.cs

@@ -0,0 +1,22 @@
+using TFramework;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System;
+
+namespace TFramework
+{
+    public class ConsoleLog:IReference
+    {
+        public string Name;
+        public DateTime Time;
+        public LogType Type;
+        public string Message;
+        public string StackTrace;
+
+        public void Reset()
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}

Runtime/Scripts/Debug/Component/ConsoleLog.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4409ebf2dc200b84caf57cb44f5977c5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/Scripts/Debug/DebugComponent.cs

@@ -0,0 +1,32 @@
+using TFramework;
+using UnityEngine;
+using System;
+using Object = UnityEngine.Object;
+using System.Collections.Generic;
+
+
+namespace TFramework
+{
+    public class DebugComponent : MonoBehaviour
+    {
+        [Serializable]
+        public struct ComponentInfo
+        {
+            public string m_name;
+            public BaseComponent m_prefab;
+        }
+
+        [SerializeField]
+        ComponentInfo[] m_components;
+
+        public ComponentInfo[] Components => m_components;
+
+        private int _curIndex;
+
+        public void Awake()
+        {
+
+        }
+
+    }
+}

Runtime/Scripts/Debug/DebugComponent.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4ff9dc173186e314995ab1bc66401cc8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/Scripts/Debug/DebugPanel.Designer.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using UnityEngine.UI;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using TFramework;
@@ -6,11 +7,23 @@ using TFramework;
 public partial class DebugPanel :BasePanel
 {
     #region 组件变量
+    private Text FPS_Text;
+    private Button CloseBtn_Button;
+    private Toggle ItmeBar_Toggle;
+    private RectTransform Max_RectTransform;
+    private DebugComponent Content_DebugComponent;
+    private DragIcon Min_DragIcon;
     #endregion
 
     public override void OnInit()
     {
         base.OnInit();
+        Min_DragIcon = GetComponentInUIID<DragIcon>("Min_126B08D6222D");
+        Content_DebugComponent = GetComponentInUIID<DebugComponent>("Content_126B08D69D47");
+        Max_RectTransform = GetComponentInUIID<RectTransform>("Max_126B08D60A6A");
+        ItmeBar_Toggle = GetComponentInUIID<Toggle>("ItmeBar_126B08D602FA");
+        CloseBtn_Button = GetComponentInUIID<Button>("CloseBtn_126B08D60287");
+        FPS_Text = GetComponentInUIID<Text>("FPS_126B08D60241");
         Init();
     }
 }

Runtime/Scripts/Debug/DebugPanel.cs

@@ -1,7 +1,8 @@
 using System.Collections;
 using System.Collections.Generic;
-using UnityEngine;
 using TFramework;
+using UnityEngine;
+using UnityEngine.UI;
 
 public class DebugPanelData : PanelData
 {
@@ -15,12 +16,61 @@ public class DebugPanelData : PanelData
  加载方式（对应前面路径）
  UI作用域（决定该UI面板挂载在那个Canvas下）
  */
-[UIResource("#","#.assetbundle","Assets/../#.prefab",ResLoadMode.Resourece,UIManager.DEFAULTDOMAIN)]
+[UIResource("UI/DebugPanel",UIManager.DEFAULTDOMAIN)]
 public partial class DebugPanel :BasePanel
 {
+    public override bool StickyTopic => true;
+
+    FPS fPS = new FPS();
+
+    private List<BaseComponent> m_componentsList = new List<BaseComponent>();
+
+
     public void Init()
     {
-        
+        fPS.onUpdateFPS = (f) => FPS_Text.text =  $"<color={(f<60?"red": "#00FF1A")}>{f.ToString("F2")}</color>";
+        CloseBtn_Button.onClick.AddListener(() =>
+        {
+            Max_RectTransform.SetActive(false);
+            Min_DragIcon.SetActive(true);
+        });
+
+        Min_DragIcon.onClick = () =>
+        {
+            Max_RectTransform.SetActive(true);
+            Min_DragIcon.SetActive(false);
+        };
+
+        for (int i = 0; i < Content_DebugComponent.Components.Length; i++)
+        {
+            m_componentsList.Add(Content_DebugComponent.Components[i].m_prefab.Clone(Content_DebugComponent.transform));
+            m_componentsList[i].Init();
+        }
+
+        for (int i = 0; i < Content_DebugComponent.Components.Length; i++)
+        {
+            if (ItmeBar_Toggle.transform.parent.childCount <= i)
+            {
+                ItmeBar_Toggle.Clone(ItmeBar_Toggle.transform.parent,true);
+            }
+            ItmeBar_Toggle.transform.parent.GetChild(i).GetChildComponent<Text>("Label").text = Content_DebugComponent.Components[i].m_name;
+            int index = i;
+            ItmeBar_Toggle.transform.parent.GetChild(i).GetComponent<Toggle>().onValueChanged.AddListener(isOn =>
+            {
+                if (isOn)
+                {
+                   ChangeView(index);
+                }
+            });
+            ItmeBar_Toggle.transform.parent.GetChild(i).SetActive(true);
+        } 
+    }
+
+
+    public void ChangeView(int index)
+    {
+        m_componentsList.ForEach(c => c.SetActive(false));
+        m_componentsList[index].SetActive(true);
     }
 
     public override void OnEnter(IPanelData args = null)
@@ -28,8 +78,16 @@ public partial class DebugPanel :BasePanel
         base.OnEnter(args);
     }
 
-    public override void OnExit(IPanelData args = null)
+    public override void OnExit(IPanelData args = null, bool isDestroy = false)
     {
+        if(isDestroy)
+        {
+            for (int i = 0; i < m_componentsList.Count;)
+            {
+                GameObject.Destroy(m_componentsList[i]);
+                m_componentsList.Remove(m_componentsList[i]);
+            }
+        }
         base.OnExit(args);
     }
 }

Runtime/Scripts/Debug/DragIcon.cs

@@ -0,0 +1,42 @@
+using TFramework;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+public class DragIcon : MonoBehaviour, IDragHandler, IBeginDragHandler, IEndDragHandler, IPointerClickHandler
+{
+    public TAction onClick;
+    private bool _isDrag;
+
+    private RectTransform _selfRect;
+    private Canvas _canvas;
+
+    private void Start()
+    {
+        _selfRect = GetComponent<RectTransform>();
+        _canvas = GetComponentInParent<Canvas>();
+    }
+
+    public void OnBeginDrag(PointerEventData eventData)
+    {
+        
+    }
+
+    public void OnDrag(PointerEventData eventData)
+    {
+        _isDrag = true;
+        _selfRect.anchoredPosition += eventData.delta / _canvas.scaleFactor;
+    }
+
+    public void OnEndDrag(PointerEventData eventData)
+    {
+        
+    }
+
+    public void OnPointerClick(PointerEventData eventData)
+    {
+        if (!_isDrag)
+            onClick?.Invoke();
+        else
+            _isDrag = false;
+    }
+}

Runtime/Scripts/Debug/DragIcon.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f87f04fcbd3210746a0c14a6da52c573
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/Scripts/Main/Main.cs

@@ -16,7 +16,7 @@ namespace TFramework
         [SerializeField]
         internal List<BaseManager> m_ManagerList = new List<BaseManager>();
 
-        //public bool IsEnableDebug;
+        public bool IsEnableDebug;
 
         /// <summary>
         /// 供非Mono脚本使用Update事件
@@ -31,7 +31,8 @@ namespace TFramework
         // Start is called before the first frame update
         void Start()
         {
-            
+            if (IsEnableDebug)
+                GetMagr<UIManager>().OpenUI<DebugPanel>();
         }
 
         // Update is called once per frame
@@ -40,6 +41,25 @@ namespace TFramework
             onUpdate?.Invoke();
         }
 
+        private void OnValidate()
+        {
+            if(IsEnableDebug)
+            {
+                if(m_ManagerList.Count <= 0||m_ManagerList.Find(m=>m is UIManager)==null)
+                {
+                    Log.Error("启用Debug工具失败，Debug工具依赖UIManager,请先注册UIManager");
+                    IsEnableDebug = false;
+                }
+            }
+        }
+
+        protected override void OnDestroy()
+        {
+            if (IsEnableDebug)
+                GetMagr<UIManager>().CloseUI<DebugPanel>(true);
+            base.OnDestroy();
+        }
+
         /// <summary>
         /// 获取指定类型管理器
         /// </summary>

Runtime/Scripts/Net/NetHelper.cs

@@ -141,5 +141,7 @@ namespace TFramework
             m_headerKey = headerKey;
             m_headerValue = headerValue;
         }
+
+        public static Header DefaultJsonHeader = new Header("Content-Type", "application/json");
     }
 }

Runtime/Scripts/Resource/ResourceManager.cs

@@ -1,6 +1,8 @@
+using Cysharp.Threading.Tasks;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
@@ -51,7 +53,9 @@ namespace TFramework
 #if UNITY_EDITOR
                 if (AssetConfig.RuntimeMode == UpdateMode.Editor)
                     return UnityEditor.AssetDatabase.LoadAssetAtPath<T>(assetPath);
+
 #endif
+                assetBundleName = assetBundleName.ToLower();
                 if (AssetBundleManifest == null)
                 {
                     if (!AssetBundles.ContainsKey(AssetConfig.AssetBundleManifestName))
@@ -134,8 +138,8 @@ namespace TFramework
                 else
                 {
                     //等待相关依赖资源的加载
-                    yield return LoadDependenciesAssetBundleAsync(resHandle.AssetBundleName);
-                    yield return LoadAssetBundleAsync(resHandle.AssetBundleName, resHandle.OnLoading);
+                    yield return LoadDependenciesAssetBundleAsync(resHandle.AssetBundleName.ToLower());
+                    yield return LoadAssetBundleAsync(resHandle.AssetBundleName.ToLower(), resHandle.OnLoading);
                     if (AssetBundles.ContainsKey(resHandle.AssetBundleName.ToLower()))
                     {
                         //asset = AssetBundles[resHandle.AssetBundleName].LoadAsset<T>(resHandle.AssetPath);
@@ -222,7 +226,7 @@ namespace TFramework
             }
             else
             {
-                yield return LoadDependenciesAssetBundleAsync(assetBundleName);
+                yield return LoadDependenciesAssetBundleAsync(assetBundleName.ToLower());
 #if UNITY_EDITOR
                 if (AssetConfig.RuntimeMode == UpdateMode.Editor)
                 {
@@ -240,13 +244,14 @@ namespace TFramework
                 }
                 else
                 {
-                    yield return LoadAssetBundleAsync(assetBundleName, OnLoading);
+                    yield return LoadAssetBundleAsync(assetBundleName.ToLower(), OnLoading);
                     AsyncOperation ao = SceneManager.LoadSceneAsync(scenePath, loadSceneMode);
                     while (!ao.isDone)
                     {
                         OnLoading?.Invoke(ao.progress);
                         yield return null;
                     }
+                    Debug.Log($"加载场景{scenePath}完成");
                 }
 #else
                     yield return LoadAssetBundleAsync(assetBundleName, OnLoading);
@@ -258,6 +263,7 @@ namespace TFramework
                     }
 #endif
             }
+            Debug.Log($"加载场景{scenePath}完成");
             OnLoading?.Invoke(1);
             OnLoadOver?.Invoke(SceneManager.GetSceneByPath(scenePath));
             CurrentScene = SceneManager.GetActiveScene();
@@ -305,6 +311,7 @@ namespace TFramework
         /// <returns></returns>
         public Coroutine UnloadSceneAsync(Scene scene, TAction<float> OnUnloading = null, TAction OnUnloadOver = null)
         {
+            Debug.Log($"卸载场景{scene.name}");
             return StartCoroutine(UnloadScene(scene, OnUnloading, OnUnloadOver));
         }
 
@@ -329,6 +336,7 @@ namespace TFramework
             }
             else
             {
+                assetBundleName = assetBundleName.ToLower();
                 if (AssetBundles.ContainsKey(assetBundleName))
                 {
                     AssetBundles[assetBundleName].Unload(unloadAllLoadedObjects);
@@ -338,6 +346,17 @@ namespace TFramework
             }
         }
 
+        public async UniTask UnLoadAllABAssetAsync(bool unloadAllLoadedObjects = false)
+        {
+            List<string> keys = new List<string>(AssetBundles.Keys);
+            for (int i = 0; i < keys.Count; i++)
+            {
+                Debug.Log($"卸载AB包{keys[i]}");
+                await AssetBundles[keys[i]].UnloadAsync(unloadAllLoadedObjects);
+                AssetBundles.Remove(keys[i]);
+            }
+        }
+
         /// <summary>
         /// 异步加载AB包清单
         /// </summary>
@@ -353,7 +372,6 @@ namespace TFramework
                 if (AssetBundleManifest == null)
                 {
                     yield return LoadAssetBundleAsync(AssetConfig.AssetBundleManifestName, null);
-
                     if (AssetBundles.ContainsKey(AssetConfig.AssetBundleManifestName))
                     {
                         AssetBundleManifest = AssetBundles[AssetConfig.AssetBundleManifestName].LoadAsset<AssetBundleManifest>("AssetBundleManifest");
@@ -373,7 +391,6 @@ namespace TFramework
         /// <returns>协程迭代器</returns>
         private IEnumerator LoadAssetBundleAsync(string assetBundleName, TAction<float> onLoading)
         {
-            assetBundleName = assetBundleName.ToLower();
             if (!AssetBundles.ContainsKey(assetBundleName))
             {
                 AssetBundleCreateRequest abRequst = AssetBundle.LoadFromFileAsync(AssetConfig.AssetBundleRootPath + assetBundleName);
@@ -405,7 +422,6 @@ namespace TFramework
             if (AssetConfig.RuntimeMode != UpdateMode.Editor)
             {
                 yield return LoadAssetBundleManifestAsync();
-
                 if (AssetBundleManifest != null)
                 {
                     string[] dependencies = AssetBundleManifest.GetAllDependencies(assetBundleName);
@@ -420,7 +436,6 @@ namespace TFramework
             }
 #else
                 yield return LoadAssetBundleManifestAsync();
-
                 if (AssetBundleManifest != null)
                 {
                     string[] dependencies = AssetBundleManifest.GetAllDependencies(assetBundleName);

Runtime/Scripts/UI/BasePanel.cs

@@ -6,7 +6,10 @@ using UnityEngine.UI;
 
 namespace TFramework
 {
-    public interface IPanelData:IReference { }
+    public interface IPanelData:IReference 
+    {
+        public void Recycle();
+    }
 
     public class PanelData : IPanelData
     {
@@ -14,6 +17,8 @@ namespace TFramework
         {
             
         }
+
+        public void Recycle()=> Main.GetMagr<ReferencePoolManager>().Recycle(this);
     }
 
     public class BasePanel
@@ -24,6 +29,7 @@ namespace TFramework
         public GameObject UIEntity { get; set; }
 
         protected Dictionary<string, UIBehaviour> uiComponents;
+        protected Dictionary<GameObject, UIBehaviour> ui2gam;
 
         public virtual bool StickyTopic { get; protected set; } = false;
 
@@ -35,6 +41,7 @@ namespace TFramework
         public virtual void OnInit()
         {
             uiComponents = new Dictionary<string, UIBehaviour>();
+            ui2gam = new Dictionary<GameObject, UIBehaviour>();
             GetAllUIBehaviour();
         }
 
@@ -65,7 +72,7 @@ namespace TFramework
         /// <summary>
         /// 退出界面 界面关闭
         /// </summary>
-        public virtual void OnExit(IPanelData args = null)
+        public virtual void OnExit(IPanelData args = null,bool isDestroy=false)
         {
             IsOpen = false;
         }
@@ -80,7 +87,10 @@ namespace TFramework
                 if (uiComponents.ContainsKey(item.ID))
                     throw new UnityException($"在同一个Panel下发现相同的UIBehaviourID：{item.ID}");
                 else
+                {
                     uiComponents.Add(item.ID, item);
+                    ui2gam.Add(item.gameObject, item);
+                }
             }
         }
 
@@ -110,6 +120,15 @@ namespace TFramework
             return GetUIBehaviour(uiId)?.GetComponent(type);
         }
 
+        protected T GetUseRes<T>(GameObject ui,string resName) where T : UnityEngine.Object
+        {
+            if (ui2gam.ContainsKey(ui))
+                return ui2gam[ui].GetRes(resName) as T;
+
+            Debug.Log($"对象{ui.name}的资源列表中没有名字为{resName}的资源");
+            return null;
+        }
+
         /// <summary>
         /// 切换语言
         /// </summary>

Runtime/Scripts/UI/FixScreenRatio.cs

@@ -6,81 +6,101 @@
     UnityVersion: 2021.3.13f1
     功能：UI适配
 *****************************************************/
-using TFramework;
+using System;
 using System.Collections;
-using UnityEngine;
 using System.Collections.Generic;
+using TFramework;
+using UnityEngine;
 using UnityEngine.UI;
 
 namespace TFramework
 {
     public class FixScreenRatio : MonoBehaviour
     {
-        CanvasScaler canvasScaler;
-        float rateW = 1.0f;
-        float rateH = 1.0f;
-        private int cachedWidth = 0;
-        private int cachedHeight = 0;
-
-        public static float windowRate = 1.0f;
-        public static float screenRate = 1.0f;
-        public static float width = 1920f;
-        public static float height = 1080f;
+        public enum Orientation
+        {
+            Portrait,
+            Landscape
+        }
 
-        [System.NonSerialized]
-        public bool IsUpdatePerFrame = true;
+        public float defaultModifier = 0.5f;
+        public Vector2 currentRes = new Vector2();
+        public Vector2 newRes = new Vector2();
+        public float refWidth = 480;
+        public float refHeight = 320;
+        public Orientation refOrientation = Orientation.Portrait;
 
-        private void Awake()
+        void OnEnable()
         {
-            Screen.autorotateToPortrait = false;
-            Screen.autorotateToPortraitUpsideDown = false;
-
-            canvasScaler = GetComponent<CanvasScaler>();
-            screenRate = width / height;
+            // Initially update scale
+            newRes.x = Screen.width;
+            newRes.y = Screen.height;
+            UpdateScaling();
         }
 
-        private void Update()
+        void Update()
         {
-            if (IsUpdatePerFrame)
+            // Update if resolution has changed
+            newRes.x = Screen.width;
+            newRes.y = Screen.height;
+            if (newRes != currentRes)
             {
-                if (cachedWidth != Screen.width || cachedHeight != Screen.height)
-                {
-                    UpdateWhenScreenChange();
-                }
+                UpdateScaling();
             }
         }
 
-        public void UpdateWhenScreenChange()
+        private void OnValidate()
         {
-            cachedWidth = Screen.width;
-            cachedHeight = Screen.height;
-            Scale();
+            UpdateScaling();
         }
 
-        void Scale()
+        /// <summary>
+        /// Handles updating of the canvas scale based on device resolution
+        /// </summary>
+        public virtual void UpdateScaling()
         {
-            rateW = Screen.width / width;
-            rateH = Screen.height / height;
+            currentRes = newRes;
 
-            if (rateW > rateH)
+            // Determine platform specific resolution multiplier
+            float multiplier = 1f;
+#if UNITY_ANDROID || UNITY_IOS
+            switch (refOrientation)
             {
-                //以高度适配
-                windowRate = rateH;
+                case Orientation.Portrait:
+                    multiplier = 1f + ((((float)currentRes.y - refHeight) / refHeight) * defaultModifier);
+                    break;
+                case Orientation.Landscape:
+                    multiplier = 1f + ((((float)currentRes.x - refWidth) / refWidth) * defaultModifier);
+                    break;
+            }
+#else
+        // For desktop platforms we scale based on the largest value out of width & height
+        if (currentRes.x > currentRes.y)
+        {
+            multiplier = 1f + ((((float)currentRes.y - refHeight) / refHeight) * defaultModifier);
+        }
+        else
+        {
+            multiplier = 1f + ((((float)currentRes.x - refWidth) / refWidth) * defaultModifier);
+        }
+#endif
 
-                if (canvasScaler != null)
-                {
-                    canvasScaler.matchWidthOrHeight = 1;
-                }
+            // Modify multiplier based on initial value.
+            if (multiplier < 0.5f) // Ceil to 0.5 if less than 0.5
+            {
+                multiplier = 0.5f;
+            }
+            else if (multiplier < 2f) // Calc to the nearest 0.5 if less than 2
+            {
+                multiplier = Mathf.Max(1f, (float)(Math.Round(((double)multiplier * 2), MidpointRounding.AwayFromZero) / 2));
             }
-            else
+            else // Otherwise if larger than 2 then round
             {
-                //以宽度适配
-                windowRate = rateW;
-                if (canvasScaler != null)
-                {
-                    canvasScaler.matchWidthOrHeight = 0;
-                }
+                multiplier = (float)Math.Round(multiplier, MidpointRounding.AwayFromZero);
             }
+
+            // Apply new scale factor to canvas 
+            GetComponent<CanvasScaler>().scaleFactor = multiplier;
         }
     }
 }

Runtime/Scripts/UI/UIBehaviour.cs

@@ -52,6 +52,9 @@ namespace TFramework
         [SerializeField]
         private string parnetPanel;
 
+        [SerializeField]
+        private List<UseResInfo> useResInfos;
+
         public override void Start()
         {
             base.Start();
@@ -69,6 +72,11 @@ namespace TFramework
                 uIAnim.DisableAnim(rectTransform);
         }
 
+        public UnityEngine.Object GetRes(string resName)
+        {
+            return useResInfos.Find(p => p.resName.Equals(resName))?.resObj;
+        }
+
 
         #region Text
  
@@ -93,4 +101,11 @@ namespace TFramework
         public string variableName;
         public string compentType;
     }
+
+    [Serializable]
+    public class UseResInfo
+    {
+        public UnityEngine.Object resObj;
+        public string resName;
+    }
 }

Runtime/Scripts/UI/UIManager.cs

@@ -146,6 +146,9 @@ namespace TFramework
         {
             BasePanel panel = GetAlreadyHavePanel(type.FullName);
             if (panel == null) return;
+
+            if (panel.UIEntity == null) return;
+
             if (panelStack.Peek() == panel)
                 CloseUI(args);
             else
@@ -159,7 +162,7 @@ namespace TFramework
                     if(toPanel.UIEntity!=null)
                     {
                         toPanel.UIEntity.SetActive(false);
-                        toPanel.OnExit(args);
+                        toPanel.OnExit(args,isDestroy);
                     }
                     for (int i = panelBuffer.Count - 1; i >= 0; i--)
                         panelStack.Push(panelBuffer[i]);

Runtime/Scripts/Utility/GlobalTool.cs

@@ -163,6 +163,42 @@ namespace TFramework
             texture2D.LoadImage(buff);
             return texture2D;
         }
+
+        /// <summary>
+        /// 将字节数转换为最合适的存储单位表示
+        /// </summary>
+        /// <param name="bytes">要转换的字节数</param>
+        /// <returns>带有单位的字符串表示，如"1KB"、"2.5MB"等</returns>
+        public static string CalculateStorageSize(long bytes)
+        {
+            // 定义单位换算系数
+            const long kb = 1024;
+            const long mb = kb * 1024;
+            const long gb = mb * 1024;
+
+            // 根据数值大小选择合适的单位
+            if (bytes >= gb)
+            {
+                double value = (double)bytes / gb;
+                // 如果是整数则不显示小数
+                return value % 1 == 0 ? $"{(long)value}G" : $"{value:F1}G";
+            }
+            else if (bytes >= mb)
+            {
+                double value = (double)bytes / mb;
+                return value % 1 == 0 ? $"{(long)value}M" : $"{value:F1}M";
+            }
+            else if (bytes >= kb)
+            {
+                double value = (double)bytes / kb;
+                return value % 1 == 0 ? $"{(long)value}K" : $"{value:F1}K";
+            }
+            else
+            {
+                // 小于1KB的情况直接返回字节数
+                return $"{bytes}B";
+            }
+        }
         #endregion
 
         #region 截屏