diff --git a/Assets/GameScripts/Main/Launcher.meta b/Assets/GameScripts/Main/Procedure/Launcher.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher.meta rename to Assets/GameScripts/Main/Procedure/Launcher.meta diff --git a/Assets/GameScripts/Main/Launcher/Resources.meta b/Assets/GameScripts/Main/Procedure/Launcher/Resources.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Resources.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Resources.meta diff --git a/Assets/GameScripts/Main/Launcher/Resources/AssetLoad.meta b/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Resources/AssetLoad.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad.meta diff --git a/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoad.prefab b/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoad.prefab similarity index 100% rename from Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoad.prefab rename to Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoad.prefab diff --git a/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoad.prefab.meta b/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoad.prefab.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoad.prefab.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoad.prefab.meta diff --git a/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadTip.prefab b/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadTip.prefab similarity index 100% rename from Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadTip.prefab rename to Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadTip.prefab diff --git a/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadTip.prefab.meta b/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadTip.prefab.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadTip.prefab.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadTip.prefab.meta diff --git a/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadUpdate.prefab b/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadUpdate.prefab similarity index 100% rename from Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadUpdate.prefab rename to Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadUpdate.prefab diff --git a/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadUpdate.prefab.meta b/Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadUpdate.prefab.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadUpdate.prefab.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Resources/AssetLoad/UILoadUpdate.prefab.meta diff --git a/Assets/GameScripts/Main/Launcher/Scripts.meta b/Assets/GameScripts/Main/Procedure/Launcher/Scripts.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts.meta diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI.meta b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI.meta diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/LoadStyle.cs b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadStyle.cs similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/LoadStyle.cs rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadStyle.cs diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/LoadStyle.cs.meta b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadStyle.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/LoadStyle.cs.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadStyle.cs.meta diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/LoadText.cs b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadText.cs similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/LoadText.cs rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadText.cs diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/LoadText.cs.meta b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadText.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/LoadText.cs.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadText.cs.meta diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/LoadUpdateLogic.cs b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadUpdateLogic.cs similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/LoadUpdateLogic.cs rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadUpdateLogic.cs diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/LoadUpdateLogic.cs.meta b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadUpdateLogic.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/LoadUpdateLogic.cs.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/LoadUpdateLogic.cs.meta diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/UIBase.cs b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIBase.cs similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/UIBase.cs rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIBase.cs diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/UIBase.cs.meta b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIBase.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/UIBase.cs.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIBase.cs.meta diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/UIDefine.cs b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIDefine.cs similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/UIDefine.cs rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIDefine.cs diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/UIDefine.cs.meta b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIDefine.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/UIDefine.cs.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UIDefine.cs.meta diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadMgr.cs b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadMgr.cs similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadMgr.cs rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadMgr.cs diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadMgr.cs.meta b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadMgr.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadMgr.cs.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadMgr.cs.meta diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadTip.cs b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadTip.cs similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadTip.cs rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadTip.cs diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadTip.cs.meta b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadTip.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadTip.cs.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadTip.cs.meta diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadUpdate.cs b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadUpdate.cs similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadUpdate.cs rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadUpdate.cs diff --git a/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadUpdate.cs.meta b/Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadUpdate.cs.meta similarity index 100% rename from Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadUpdate.cs.meta rename to Assets/GameScripts/Main/Procedure/Launcher/Scripts/UI/UILoadUpdate.cs.meta diff --git a/Assets/GameScripts/Main/Procedure/Procedure.asmdef b/Assets/GameScripts/Main/Procedure/Procedure.asmdef new file mode 100644 index 00000000..d6bbed25 --- /dev/null +++ b/Assets/GameScripts/Main/Procedure/Procedure.asmdef @@ -0,0 +1,18 @@ +{ + "name": "Procedure", + "rootNamespace": "", + "references": [ + "GUID:aa06d4cc755c979489c256c1bcca1dfb", + "GUID:13ba8ce62aa80c74598530029cb2d649", + "GUID:6055be8ebefd69e48b49212b09b47b2f" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": true, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/GameScripts/Main/Procedure/Procedure.asmdef.meta b/Assets/GameScripts/Main/Procedure/Procedure.asmdef.meta new file mode 100644 index 00000000..52c95393 --- /dev/null +++ b/Assets/GameScripts/Main/Procedure/Procedure.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4bee17c3950019843ae3a9ae754783bc +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs b/Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs index 8d613ef4..b61fed1b 100644 --- a/Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs +++ b/Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs @@ -41,6 +41,21 @@ namespace GameMain m_LoadAssemblyComplete = false; m_HotfixAssemblys = new List(); + //AOT Assembly加载原始metadata + if (SettingsUtils.HybridCLRCustomGlobalSettings.Enable) + { +#if !UNITY_EDITOR + m_LoadMetadataAssemblyComplete = false; + LoadMetadataForAOTAssembly(); +#else + m_LoadMetadataAssemblyComplete = true; +#endif + } + else + { + m_LoadMetadataAssemblyComplete = true; + } + if (!NeedLoadDll || GameModule.Resource.playMode == EPlayMode.EditorSimulateMode) { m_MainLogicAssembly = GetMainLogicAssembly(); @@ -74,20 +89,6 @@ namespace GameMain } } - if (SettingsUtils.HybridCLRCustomGlobalSettings.Enable) - { -#if !UNITY_EDITOR - m_LoadMetadataAssemblyComplete = false; - LoadMetadataForAOTAssembly(); -#else - m_LoadMetadataAssemblyComplete = true; -#endif - } - else - { - m_LoadMetadataAssemblyComplete = true; - } - if (m_LoadAssetCount == 0) { m_LoadAssemblyComplete = true;