From d3272e1bb199c9c87146ee8dc92370da121fe1b4 Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Wed, 26 Apr 2023 13:30:23 +0800 Subject: [PATCH] [+] Update Procedure Path And asmdef [+] Update Procedure Path And asmdef --- .../Main/{Procedure/Procedure.asmdef => GameMain.asmdef} | 2 +- .../Procedure.asmdef.meta => GameMain.asmdef.meta} | 0 Assets/GameScripts/Main/{Procedure => }/Launcher.meta | 0 .../GameScripts/Main/{Procedure => }/Launcher/Resources.meta | 0 .../Main/{Procedure => }/Launcher/Resources/AssetLoad.meta | 0 .../Launcher/Resources/AssetLoad/UILoad.prefab | 0 .../Launcher/Resources/AssetLoad/UILoad.prefab.meta | 0 .../Launcher/Resources/AssetLoad/UILoadTip.prefab | 0 .../Launcher/Resources/AssetLoad/UILoadTip.prefab.meta | 0 .../Launcher/Resources/AssetLoad/UILoadUpdate.prefab | 0 .../Launcher/Resources/AssetLoad/UILoadUpdate.prefab.meta | 0 .../GameScripts/Main/{Procedure => }/Launcher/Scripts.meta | 0 .../Main/{Procedure => }/Launcher/Scripts/UI.meta | 0 .../Main/{Procedure => }/Launcher/Scripts/UI/LoadStyle.cs | 0 .../{Procedure => }/Launcher/Scripts/UI/LoadStyle.cs.meta | 0 .../Main/{Procedure => }/Launcher/Scripts/UI/LoadText.cs | 0 .../{Procedure => }/Launcher/Scripts/UI/LoadText.cs.meta | 0 .../{Procedure => }/Launcher/Scripts/UI/LoadUpdateLogic.cs | 0 .../Launcher/Scripts/UI/LoadUpdateLogic.cs.meta | 0 .../Main/{Procedure => }/Launcher/Scripts/UI/UIBase.cs | 0 .../Main/{Procedure => }/Launcher/Scripts/UI/UIBase.cs.meta | 0 .../Main/{Procedure => }/Launcher/Scripts/UI/UIDefine.cs | 0 .../{Procedure => }/Launcher/Scripts/UI/UIDefine.cs.meta | 0 .../Main/{Procedure => }/Launcher/Scripts/UI/UILoadMgr.cs | 0 .../{Procedure => }/Launcher/Scripts/UI/UILoadMgr.cs.meta | 0 .../Main/{Procedure => }/Launcher/Scripts/UI/UILoadTip.cs | 0 .../{Procedure => }/Launcher/Scripts/UI/UILoadTip.cs.meta | 0 .../Main/{Procedure => }/Launcher/Scripts/UI/UILoadUpdate.cs | 0 .../{Procedure => }/Launcher/Scripts/UI/UILoadUpdate.cs.meta | 0 Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs | 5 ----- Assets/Scenes/main.unity | 1 + Assets/TEngine/Editor/Utility/Type.cs | 3 +-- .../GameFramework/Network/Kcp/Core/SimpleKcpClient.cs | 2 +- 33 files changed, 4 insertions(+), 9 deletions(-) rename Assets/GameScripts/Main/{Procedure/Procedure.asmdef => GameMain.asmdef} (94%) rename Assets/GameScripts/Main/{Procedure/Procedure.asmdef.meta => GameMain.asmdef.meta} (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Resources.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Resources/AssetLoad.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Resources/AssetLoad/UILoad.prefab (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Resources/AssetLoad/UILoad.prefab.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Resources/AssetLoad/UILoadTip.prefab (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Resources/AssetLoad/UILoadTip.prefab.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Resources/AssetLoad/UILoadUpdate.prefab (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Resources/AssetLoad/UILoadUpdate.prefab.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/LoadStyle.cs (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/LoadStyle.cs.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/LoadText.cs (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/LoadText.cs.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/LoadUpdateLogic.cs (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/LoadUpdateLogic.cs.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/UIBase.cs (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/UIBase.cs.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/UIDefine.cs (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/UIDefine.cs.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/UILoadMgr.cs (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/UILoadMgr.cs.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/UILoadTip.cs (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/UILoadTip.cs.meta (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/UILoadUpdate.cs (100%) rename Assets/GameScripts/Main/{Procedure => }/Launcher/Scripts/UI/UILoadUpdate.cs.meta (100%) diff --git a/Assets/GameScripts/Main/Procedure/Procedure.asmdef b/Assets/GameScripts/Main/GameMain.asmdef similarity index 94% rename from Assets/GameScripts/Main/Procedure/Procedure.asmdef rename to Assets/GameScripts/Main/GameMain.asmdef index d6bbed25..277607f2 100644 --- a/Assets/GameScripts/Main/Procedure/Procedure.asmdef +++ b/Assets/GameScripts/Main/GameMain.asmdef @@ -1,5 +1,5 @@ { - "name": "Procedure", + "name": "GameMain", "rootNamespace": "", "references": [ "GUID:aa06d4cc755c979489c256c1bcca1dfb", diff --git a/Assets/GameScripts/Main/Procedure/Procedure.asmdef.meta b/Assets/GameScripts/Main/GameMain.asmdef.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Procedure.asmdef.meta rename to Assets/GameScripts/Main/GameMain.asmdef.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher.meta b/Assets/GameScripts/Main/Launcher.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher.meta rename to Assets/GameScripts/Main/Launcher.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Resources.meta b/Assets/GameScripts/Main/Launcher/Resources.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Resources.meta rename to Assets/GameScripts/Main/Launcher/Resources.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad.meta b/Assets/GameScripts/Main/Launcher/Resources/AssetLoad.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad.meta rename to Assets/GameScripts/Main/Launcher/Resources/AssetLoad.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoad.prefab b/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoad.prefab similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoad.prefab rename to Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoad.prefab diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoad.prefab.meta b/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoad.prefab.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoad.prefab.meta rename to Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoad.prefab.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadTip.prefab b/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadTip.prefab similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadTip.prefab rename to Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadTip.prefab diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadTip.prefab.meta b/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadTip.prefab.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadTip.prefab.meta rename to Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadTip.prefab.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadUpdate.prefab b/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadUpdate.prefab similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadUpdate.prefab rename to Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadUpdate.prefab diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadUpdate.prefab.meta b/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadUpdate.prefab.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadUpdate.prefab.meta rename to Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadUpdate.prefab.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts.meta b/Assets/GameScripts/Main/Launcher/Scripts.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts.meta rename to Assets/GameScripts/Main/Launcher/Scripts.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI.meta b/Assets/GameScripts/Main/Launcher/Scripts/UI.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI.meta rename to Assets/GameScripts/Main/Launcher/Scripts/UI.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadStyle.cs b/Assets/GameScripts/Main/Launcher/Scripts/UI/LoadStyle.cs similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadStyle.cs rename to Assets/GameScripts/Main/Launcher/Scripts/UI/LoadStyle.cs diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadStyle.cs.meta b/Assets/GameScripts/Main/Launcher/Scripts/UI/LoadStyle.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadStyle.cs.meta rename to Assets/GameScripts/Main/Launcher/Scripts/UI/LoadStyle.cs.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadText.cs b/Assets/GameScripts/Main/Launcher/Scripts/UI/LoadText.cs similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadText.cs rename to Assets/GameScripts/Main/Launcher/Scripts/UI/LoadText.cs diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadText.cs.meta b/Assets/GameScripts/Main/Launcher/Scripts/UI/LoadText.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadText.cs.meta rename to Assets/GameScripts/Main/Launcher/Scripts/UI/LoadText.cs.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadUpdateLogic.cs b/Assets/GameScripts/Main/Launcher/Scripts/UI/LoadUpdateLogic.cs similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadUpdateLogic.cs rename to Assets/GameScripts/Main/Launcher/Scripts/UI/LoadUpdateLogic.cs diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadUpdateLogic.cs.meta b/Assets/GameScripts/Main/Launcher/Scripts/UI/LoadUpdateLogic.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadUpdateLogic.cs.meta rename to Assets/GameScripts/Main/Launcher/Scripts/UI/LoadUpdateLogic.cs.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIBase.cs b/Assets/GameScripts/Main/Launcher/Scripts/UI/UIBase.cs similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIBase.cs rename to Assets/GameScripts/Main/Launcher/Scripts/UI/UIBase.cs diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIBase.cs.meta b/Assets/GameScripts/Main/Launcher/Scripts/UI/UIBase.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIBase.cs.meta rename to Assets/GameScripts/Main/Launcher/Scripts/UI/UIBase.cs.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIDefine.cs b/Assets/GameScripts/Main/Launcher/Scripts/UI/UIDefine.cs similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIDefine.cs rename to Assets/GameScripts/Main/Launcher/Scripts/UI/UIDefine.cs diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIDefine.cs.meta b/Assets/GameScripts/Main/Launcher/Scripts/UI/UIDefine.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIDefine.cs.meta rename to Assets/GameScripts/Main/Launcher/Scripts/UI/UIDefine.cs.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadMgr.cs b/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadMgr.cs similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadMgr.cs rename to Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadMgr.cs diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadMgr.cs.meta b/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadMgr.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadMgr.cs.meta rename to Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadMgr.cs.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadTip.cs b/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadTip.cs similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadTip.cs rename to Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadTip.cs diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadTip.cs.meta b/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadTip.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadTip.cs.meta rename to Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadTip.cs.meta diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadUpdate.cs b/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadUpdate.cs similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadUpdate.cs rename to Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadUpdate.cs diff --git a/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadUpdate.cs.meta b/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadUpdate.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadUpdate.cs.meta rename to Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadUpdate.cs.meta diff --git a/Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs b/Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs index b61fed1b..156fc850 100644 --- a/Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs +++ b/Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs @@ -111,11 +111,6 @@ namespace GameMain private void AllAssemblyLoadComplete() { - if (GameModule.Resource.playMode == EPlayMode.EditorSimulateMode) - { - ChangeState(m_procedureOwner); - return; - } if (m_MainLogicAssembly == null) { Log.Fatal($"Main logic assembly missing."); diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index e748a221..cc5abde9 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -246,6 +246,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_InstanceRoot: {fileID: 88107082} m_dontDestroyUIRoot: 1 + m_enableErrorLog: 1 m_UICamera: {fileID: 110205813} --- !u!1 &88107081 GameObject: diff --git a/Assets/TEngine/Editor/Utility/Type.cs b/Assets/TEngine/Editor/Utility/Type.cs index c6d223d4..28647799 100644 --- a/Assets/TEngine/Editor/Utility/Type.cs +++ b/Assets/TEngine/Editor/Utility/Type.cs @@ -13,7 +13,7 @@ namespace TEngine.Editor "TEngine.Runtime", "Assembly-CSharp", "GameMain.Runtime", - + "GameMain", "GameBase", "GameLogic", "GameProto", @@ -26,7 +26,6 @@ namespace TEngine.Editor "Assembly-CSharp", "TEngine.Editor", "Assembly-CSharp-Editor", - "GameMain.Runtime", "GameMain", "GameMain.Editor", "GameBase", diff --git a/Assets/TEngine/Runtime/GameFramework/Network/Kcp/Core/SimpleKcpClient.cs b/Assets/TEngine/Runtime/GameFramework/Network/Kcp/Core/SimpleKcpClient.cs index f4c5399e..c6663630 100644 --- a/Assets/TEngine/Runtime/GameFramework/Network/Kcp/Core/SimpleKcpClient.cs +++ b/Assets/TEngine/Runtime/GameFramework/Network/Kcp/Core/SimpleKcpClient.cs @@ -35,7 +35,7 @@ namespace System.Net.Sockets.Kcp.Simple buffer.Dispose(); } - public async void SendAsync(byte[] datagram, int bytes) + public void SendAsync(byte[] datagram, int bytes) { kcp.Send(datagram.AsSpan().Slice(0, bytes)); }