111

Assets/00.StaryEvoTools/Editor/Build/AutoBuildPackage.cs

@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
+#if !UNITY_WEBGL
 using HybridCLR.Editor.Commands;
+#endif
 using Newtonsoft.Json;
 using Sirenix.OdinInspector;
 using UnityEditor;
@@ -38,10 +41,12 @@ namespace Stary.Evo.Editor
         /// <param name="oneKeyBuildEntities"></param>
         public static void OneClickMark(List<OneKeyBuildEntity> oneKeyBuildEntities)
         {
+#if !UNITY_WEBGL
             //打dll 
             CompileDllCommand.CompileDllActiveBuildTarget();
             //拷贝dll
             MarkAdressable.AddHotfixAddressableDllAll(oneKeyBuildEntities);
+#endif
             //标记全部资源
             MarkAdressable.AddMarkAll(oneKeyBuildEntities);
         }

Assets/00.StaryEvoTools/Editor/BuildAsset/BuildAssetWindow.cs

@@ -11,8 +11,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Threading.Tasks;
-using HybridCLR.Editor;
-using HybridCLR.Editor.Commands;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Sirenix.OdinInspector;

Assets/00.StaryEvoTools/Editor/BuildAsset/CreatAssetWindow.cs

@@ -2,8 +2,10 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+#if !UNITY_WEBGL
 using HybridCLR.Editor;
 using HybridCLR.Editor.Settings;
+#endif
 using Sirenix.OdinInspector;
 using Sirenix.OdinInspector.Editor;
 using UnityEditor;
@@ -174,16 +176,7 @@ namespace Stary.Evo.Editor
             domainClassName = domainClassName.Replace('.', '_');
             string architectureClassName = $"{domain}Architecture";
             architectureClassName = architectureClassName.Replace('.', '_');
-            //模块配置资源
-            DomainConfig moduleConfig = CreateInstance<DomainConfig>();
-            moduleConfig.domain = domain;
-            moduleConfig.className = domainClassName;
-            moduleConfig.mainPrefab = "Prefabs_" + gameObj.name;
-            moduleConfig.@namespace = domain;
-            AssetDatabase.CreateAsset(moduleConfig, $"Assets/Domain/{domain}/AddressableRes/Config/DomainConfig.asset");
-            //
-
-
+            
             //编辑器配置资源
             BuildAssetDataSetting buildAssetDataSetting = CreateInstance<BuildAssetDataSetting>();
             buildAssetDataSetting.packageName = domain;
@@ -196,6 +189,17 @@ namespace Stary.Evo.Editor
             string configPath = $"Assets/Domain/{domain}/HotUpdate/{hotfixDomain}.asmdef";
             AssemblyDefinitionAsset assemblyDefinitionAsset =
                 AssetDatabase.LoadAssetAtPath<AssemblyDefinitionAsset>(configPath);
+            
+            //模块配置资源
+            DomainConfig moduleConfig = CreateInstance<DomainConfig>();
+            moduleConfig.domain = domain;
+            moduleConfig.assemblyName = assemblyDefinitionAsset.name;
+            moduleConfig.className = domainClassName;
+            moduleConfig.mainPrefab = "Prefabs_" + gameObj.name;
+            moduleConfig.@namespace = domain;
+            AssetDatabase.CreateAsset(moduleConfig, $"Assets/Domain/{domain}/AddressableRes/Config/DomainConfig.asset");
+            //
+#if !UNITY_WEBGL
             if (domain != "Main")
             {
                 // 将程序集定义添加到 HybridCLR 热更列表
@@ -220,6 +224,7 @@ namespace Stary.Evo.Editor
                 HybridCLRSettings.Instance.hotUpdateAssemblyDefinitions = assemblies.ToArray();
                 HybridCLRSettings.Save();
             }
+#endif
             AssetDatabase.SaveAssets();
 
        

Assets/00.StaryEvoTools/Editor/BuildAsset/OneKeyBuildWindow.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using HybridCLR.Editor.Commands;
-using Newtonsoft.Json;
 using Sirenix.OdinInspector;
 using Sirenix.OdinInspector.Editor;
 using UnityEditor;

Assets/00.StaryEvoTools/Editor/MarkAdressable/MarkAdressable.cs

@@ -2,8 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+#if !UNITY_WEBGL
 using HybridCLR.Editor;
-using HybridCLR.Editor.Commands;
+#endif
 using UnityEditor;
 using UnityEditor.U2D;
 using UnityEngine;
@@ -34,7 +35,7 @@ namespace Stary.Evo.Editor
         {
             get { return Application.dataPath + "/Domain"; }
         }
-
+#if !UNITY_WEBGL
         public static void AddHotfixAddressableDll()
         {
             CopyDllHotUpdateAssembly(BuildAssetWindow.GetBuildPackageName(),
@@ -104,7 +105,7 @@ namespace Stary.Evo.Editor
                 FileUtility.Copy(hotfixDllPath, hotfixDllPathTarget, true);
             }
         }
-
+#endif
         public static void AddMarkAll(List<OneKeyBuildEntity> oneKeyBUildEntities)
         {
             foreach (var oneKeyBUildEntity in oneKeyBUildEntities)

Assets/00.StaryEvoTools/Editor/com.staryevo.tools.editor.asmdef

@@ -5,18 +5,17 @@
         "com.staryevo.tools.runtime",
         "com.stary.evo.editor",
         "com.stary.evo.runtime",
-        "HybridCLR.Runtime",
-        "HybridCLR.Editor",
         "com.stary.buildoriginality.editor",
         "com.stary.buildoriginality.runtime",
         "YooAsset",
         "YooAsset.Editor",
         "com.audiocore.runtime",
         "DOTween.Modules",
-        "ImmersalSDK",
         "Informationsave.runtime",
         "UniTask",
-        "Unity.ScriptableBuildPipeline.Editor"
+        "Unity.ScriptableBuildPipeline.Editor",
+        "HybridCLR.Editor",
+        "HybridCLR.Runtime"
     ],
     "includePlatforms": [
         "Editor"