Merge pull request #22 from ALEXTANGXIAO/TEngine_v_3.0.0

TEngine v 3.0.0
2025-08-14 16:51:28 +00:00 · 2023-04-18 20:03:29 +08:00
parent 264626c7dd db2ee2cd77
commit 7eaa932984
11 changed files with 460 additions and 4 deletions
--- a/Assets/AssetRaw/UI/LogUI.prefab
+++ b/Assets/AssetRaw/UI/LogUI.prefab
@@ -0,0 +1,378 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2683445925571829816
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2683445925571829817}
+  - component: {fileID: 2683445925571829820}
+  - component: {fileID: 2683445925571829823}
+  - component: {fileID: 2683445925571829822}
+  m_Layer: 5
+  m_Name: LogUI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2683445925571829817
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2683445925571829816}
+  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:
+  - {fileID: 2683445927021212027}
+  - {fileID: 2683445926897574365}
+  - {fileID: 6164213652418733423}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &2683445925571829820
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2683445925571829816}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &2683445925571829823
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2683445925571829816}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!114 &2683445925571829822
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2683445925571829816}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!1 &2683445926897574364
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2683445926897574365}
+  - component: {fileID: 2683445926897574339}
+  - component: {fileID: 2683445926897574338}
+  m_Layer: 5
+  m_Name: m_textError
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2683445926897574365
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2683445926897574364}
+  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: 2683445925571829817}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -40, y: -40}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2683445926897574339
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2683445926897574364}
+  m_CullTransparentMesh: 1
+--- !u!114 &2683445926897574338
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2683445926897574364}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 1, b: 0.25490198, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!1 &2683445927021212026
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2683445927021212027}
+  - component: {fileID: 2683445927021212025}
+  - component: {fileID: 2683445927021212024}
+  m_Layer: 5
+  m_Name: Panel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2683445927021212027
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2683445927021212026}
+  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: 2683445925571829817}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2683445927021212025
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2683445927021212026}
+  m_CullTransparentMesh: 1
+--- !u!114 &2683445927021212024
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2683445927021212026}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.34901962}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4229713281919198382
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6164213652418733423}
+  - component: {fileID: 9023329926868908831}
+  - component: {fileID: 5643637730633076069}
+  - component: {fileID: 6030240422437967231}
+  m_Layer: 5
+  m_Name: m_btnClose
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6164213652418733423
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4229713281919198382}
+  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: 2683445925571829817}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9023329926868908831
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4229713281919198382}
+  m_CullTransparentMesh: 1
+--- !u!114 &5643637730633076069
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4229713281919198382}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.007843138}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6030240422437967231
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4229713281919198382}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5643637730633076069}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
--- a/Assets/AssetRaw/UI/LogUI.prefab.meta
+++ b/Assets/AssetRaw/UI/LogUI.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ad23fce0bd282924fa4aedb4da24684f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/GameScripts/HotFix/GameLogic/ErrorLogger.meta
+++ b/Assets/GameScripts/HotFix/GameLogic/ErrorLogger.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6fca85e737d54de0a3ed4bd7e7836fa4
+timeCreated: 1681807710
--- a/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/ErrorLogger.cs
+++ b/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/ErrorLogger.cs
@@ -0,0 +1,26 @@
+using UnityEngine;
+
+namespace GameLogic
+{
+    public class ErrorLogger
+    {
+        public ErrorLogger()
+        {
+            Application.logMessageReceived += LogHandler;
+        }
+
+        ~ErrorLogger()
+        {
+            Application.logMessageReceived -= LogHandler;
+        }
+
+        private void LogHandler(string condition, string stacktrace, LogType type)
+        {
+            if (type == LogType.Exception)
+            {
+                string des = $"客户端报错, \n#内容#：---{condition} \n#位置#：---{stacktrace}";
+                GameModule.UI.ShowUI<LogUI>(des);
+            }
+        }
+    }
+}
--- a/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/ErrorLogger.cs.meta
+++ b/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/ErrorLogger.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9ccc9fc5faf14d93baec285acaa97907
+timeCreated: 1681807720
--- a/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/LogUI.cs
+++ b/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/LogUI.cs
@@ -0,0 +1,33 @@
+using UnityEngine.UI;
+using TEngine;
+
+namespace GameLogic
+{
+    [Window(UILayer.System)]
+    class LogUI : UIWindow
+    {
+        #region 脚本工具生成的代码
+        private Text m_textError;
+        private Button m_btnClose;
+        public override void ScriptGenerator()
+        {
+            m_textError = FindChildComponent<Text>("m_textError");
+            m_btnClose = FindChildComponent<Button>("m_btnClose");
+            m_btnClose.onClick.AddListener(OnClickCloseBtn);
+        }
+        #endregion
+
+        #region 事件
+
+        private void OnClickCloseBtn()
+        {
+            Close();
+        }
+        #endregion
+
+        public override void OnRefresh()
+        {
+            m_textError.text = UserData.ToString();
+        }
+    }
+}
--- a/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/LogUI.cs.meta
+++ b/Assets/GameScripts/HotFix/GameLogic/ErrorLogger/LogUI.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: faa647c543e54de9b2d55e189aef0eff
+timeCreated: 1681807986
--- a/Assets/GameScripts/HotFix/GameLogic/GameLogic.asmdef
+++ b/Assets/GameScripts/HotFix/GameLogic/GameLogic.asmdef
@@ -5,7 +5,8 @@
        "GUID:b48be955427611241bcb6f2a07949c5b",
        "GUID:08c3762f54316454ca6b6fbcb22b40e5",
        "GUID:a90b2d3377c5e4a4db95cc44fb82045e",
-        "GUID:aa06d4cc755c979489c256c1bcca1dfb"
+        "GUID:aa06d4cc755c979489c256c1bcca1dfb",
+        "GUID:6055be8ebefd69e48b49212b09b47b2f"
    ],
    "includePlatforms": [],
    "excludePlatforms": [],
--- a/Assets/GameScripts/HotFix/GameLogic/UI/Common/ImageBackGroundStretch.cs
+++ b/Assets/GameScripts/HotFix/GameLogic/UI/Common/ImageBackGroundStretch.cs
@@ -1,6 +1,6 @@
 using UnityEngine;

-namespace GameMain
+namespace GameLogic
 {
    /// <summary>
    /// 背景图片等比拉伸
--- a/Assets/GameScripts/HotFix/GameLogic/UI/Common/SafeTop.cs
+++ b/Assets/GameScripts/HotFix/GameLogic/UI/Common/SafeTop.cs
@@ -1,7 +1,7 @@
 using UnityEngine;
 using TEngine;

-namespace GameMain
+namespace GameLogic
 {
    public class SafeTop : MonoBehaviour
    {
--- a/Assets/TEngine/Runtime/GameFramework/Log/TEngineLogHelper.cs
+++ b/Assets/TEngine/Runtime/GameFramework/Log/TEngineLogHelper.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Diagnostics;
 using System.Text;
 using Debug = UnityEngine.Debug;
@@ -69,7 +70,7 @@ namespace TEngine
                    _stringBuilder.AppendFormat(
                        bColor
                            ? "<color=#0099bc><b>[TEngine] ► </b></color><color=gray><b>[INFO] ► </b></color>[{0}] - <color=#00FF18>{1}</color>"
-                            : "<color=#0099bc><b>[TEngine] ► </b></color><color=#00FF18><b>[SUCCESSED] ► </b></color>[{0}] - {1}",
+                            : "<color=#0099bc><b>[TEngine] ► </b></color><color=#00FF18><b>[SUCCESSES] ► </b></color>[{0}] - {1}",
                        timeNow, logString);
                    break;
                case LogLevel.INFO:
@@ -160,6 +161,7 @@ namespace TEngine
            else if (type == LogLevel.EXCEPTION)
            {
                Debug.LogError(logStr);
+                throw new Exception(logStr);
            }
        }