添加热更条件判断

Editor/AssetBudleTool.cs

@@ -1,5 +1,7 @@
-using HybridCLR.Editor;
+#if HybridCLR
 using HybridCLR.Editor.Commands;
+using HybridCLR.Editor;
+#endif
 using Newtonsoft.Json;
 using System;
 using System.Collections;
@@ -16,17 +18,17 @@ namespace TModule.Editor
 {
     public class AssetBudleTool : EditorWindow
     {
-        private string AssetBudleConfigName= "AssetBundleConfig.asset";
+        private string AssetBudleConfigName = "AssetBundleConfig.asset";
         private string AssetBudleConfigPath;
         private string AssetbudleToolConfigName = "BudleToolConfig.asset";
-        private  string AssetbudleToolConfigPath;
+        private string AssetbudleToolConfigPath;
         private AssetBudleConfig _list;
         private AssetBudleConfig BudleConfig
         {
             get
             {
                 _list = _list ?? AssetDatabase.LoadAssetAtPath<AssetBudleConfig>(AssetBudleConfigPath);
-                if(_list==null)
+                if (_list == null)
                 {
                     _list = CreateInstance<AssetBudleConfig>();
                     AssetDatabase.CreateAsset(_list, AssetBudleConfigPath);
@@ -43,7 +45,7 @@ namespace TModule.Editor
             get
             {
                 _toolConfig = _toolConfig ?? AssetDatabase.LoadAssetAtPath<AssetBudleToolConfig>(AssetbudleToolConfigPath);
-                if(_toolConfig==null)
+                if (_toolConfig == null)
                 {
                     _toolConfig = CreateInstance<AssetBudleToolConfig>();
                     AssetDatabase.CreateAsset(_toolConfig, AssetbudleToolConfigPath);
@@ -172,9 +174,12 @@ namespace TModule.Editor
             SetABName();
             BuildPipeline.BuildAssetBundles(tartgetPath, BuildAssetBundleOptions.None, _buildTarget);
 
+#if HybridCLR
             CompileDllCommand.CompileDll(_buildTarget);
+
             CopyAOTAssembliesToPath(tartgetPath);
             CopyHotUpdateAssembliesToPath(tartgetPath);
+#endif
             if (BudleToolConfig.m_copyToStreamingAssets)
                 CopyToStreamingAssets();
 
@@ -189,7 +194,7 @@ namespace TModule.Editor
                 AssetBundleEntity assetBudle = BudleConfig.m_AB[i];
                 if (assetBudle.m_isFolder)
                 {
-                    string[] floderArr = new string[] {GetAbsolutePath(assetBudle.m_name) };
+                    string[] floderArr = new string[] { GetAbsolutePath(assetBudle.m_name) };
                     SaveFolderSettings(floderArr);
                 }
                 else
@@ -230,7 +235,7 @@ namespace TModule.Editor
                 string variant = file.Extension.Equals(".unity", StringComparison.CurrentCultureIgnoreCase) ? "unity3d" : "assetbundle";
 
                 AssetImporter importer = AssetImporter.GetAtPath(newPath);
-                if(importer.assetBundleName=="None" || string.IsNullOrEmpty(importer.assetBundleName))
+                if (importer.assetBundleName == "None" || string.IsNullOrEmpty(importer.assetBundleName))
                 {
                     importer.SetAssetBundleNameAndVariant(fileName, variant);
                     importer.SaveAndReimport();
@@ -242,7 +247,7 @@ namespace TModule.Editor
         {
             string toPath = Application.streamingAssetsPath;
             string tartgetPath = BudleToolConfig.m_savePath + "/" + _buildTarget.ToString();
-            CopyDirectory(tartgetPath, toPath,true);
+            CopyDirectory(tartgetPath, toPath, true);
             AssetDatabase.Refresh();
         }
 
@@ -380,11 +385,12 @@ namespace TModule.Editor
             }
         }
 
+#if HybridCLR
         public void CopyAOTAssembliesToPath(string path)
         {
             string aotAssembliesSrcDir = SettingsUtil.GetAssembliesPostIl2CppStripDir(_buildTarget);
-            List<string> aotMetaAssemblyFiles = Resources.Load<HotfixConfig>("HotfixUpdate/ÈȸüÅäÖñí").m_hotfixUpdateAotDlls;
-            foreach (var dll in aotMetaAssemblyFiles)
+
+            foreach (var dll in Resources.Load<HotfixConfig>("HotfixUpdate/ÈȸüÅäÖñí").m_hotfixUpdateAotDlls)
             {
                 string srcDllPath = $"{aotAssembliesSrcDir}/{dll}";
                 if (!File.Exists(srcDllPath))
@@ -414,5 +420,6 @@ namespace TModule.Editor
             }
             AssetDatabase.Refresh();
         }
+#endif
     }
 }

Editor/AssetBundleConfig.asset

@@ -30,7 +30,7 @@ MonoBehaviour:
     m_isFolder: 1
     m_isFirstData: 0
   - m_key: 
-    m_name: Assets/Code/Env1/HotUpdateResources/Resources
+    m_name: Assets/Code/Env1/HotUpdateResources/Sprites
     m_tag: 
     m_version: 0
     m_size: 0
@@ -38,7 +38,7 @@ MonoBehaviour:
     m_isFolder: 1
     m_isFirstData: 0
   - m_key: 
-    m_name: Assets/Code/Env1/HotUpdateResources/Sprites
+    m_name: Assets/Code/Env1/HotUpdateResources/Scenes
     m_tag: 
     m_version: 0
     m_size: 0
@@ -46,7 +46,7 @@ MonoBehaviour:
     m_isFolder: 1
     m_isFirstData: 0
   - m_key: 
-    m_name: Assets/Code/Env1/HotUpdateResources/Scenes
+    m_name: Assets/Code/Env1/HotUpdateResources/Fonts
     m_tag: 
     m_version: 0
     m_size: 0
@@ -54,7 +54,7 @@ MonoBehaviour:
     m_isFolder: 1
     m_isFirstData: 0
   - m_key: 
-    m_name: Assets/Code/Env1/HotUpdateResources/Fonts
+    m_name: Assets/Code/Env1/HotUpdateResources/TResources
     m_tag: 
     m_version: 0
     m_size: 0

Runtime/HotfixManager.cs

@@ -63,7 +63,7 @@ namespace TModule.Runtime {
 #elif UNITY_STANDALONE_OSX
                 return "Mac";
 #elif UNITY_STANDALONE_WIN
-                return "Windows";
+                return "StandaloneWindows64";
 #elif UNITY_WEBGL
                 return "WebGL";
 #else
@@ -182,7 +182,7 @@ namespace TModule.Runtime {
 #endif
                 return;
             }
-            if(loadMode==UpdateMode.Editor||!isHotfix)
+            if(AssetConfig.RuntimeMode == UpdateMode.Editor||!isHotfix)
             {
                 Csharp = AppDomain.CurrentDomain.Load(hotfixDllName);
             }