guodong 1 год назад
Родитель
Сommit
f20f5bd3dc

+ 3 - 1
GameClient/Assets/Editor/BuildEditor/BuildDllHelper.cs

@@ -4,6 +4,7 @@ using UnityEditor;
 using UnityEngine;
 using GFGGame;
 using HybridCLR.Editor.Commands;
+using System.Collections.Generic;
 
 namespace GFGEditor
 {
@@ -31,7 +32,8 @@ namespace GFGEditor
             {
                 Directory.CreateDirectory(LauncherConfig.DllDirHotfix);
             }
-            foreach (var dll in SettingsUtil.HotUpdateAssemblyFiles)
+            List<string> HotUpdateAssemblyFiles = new List<string>() { "Game.HotUpdate.dll" };
+            foreach (var dll in HotUpdateAssemblyFiles)
             {
                 string dllPath = $"{hotfixDllSrcDir}/{dll}";
                 string dllBytesPath = $"{hotfixAssembliesDstDir}{dll}.bytes";

+ 3 - 3
GameClient/Packages/manifest.json

@@ -1,11 +1,12 @@
 {
   "dependencies": {
-    "com.focus-creative-games.hybridclr_unity": "https://gitee.com/focus-creative-games/hybridclr_unity.git",
+    "com.code-philosophy.hybridclr": "https://gitee.com/focus-creative-games/hybridclr_unity.git#v3.4.2",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.collab-proxy": "1.15.15",
     "com.unity.ide.rider": "2.0.7",
     "com.unity.ide.visualstudio": "2.0.15",
     "com.unity.ide.vscode": "1.2.5",
+    "com.unity.scriptablebuildpipeline": "1.20.2",
     "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.4.8",
@@ -40,7 +41,6 @@
     "com.unity.modules.video": "1.0.0",
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
-    "com.unity.modules.xr": "1.0.0",
-	"com.unity.scriptablebuildpipeline": "1.20.2"
+    "com.unity.modules.xr": "1.0.0"
   }
 }

+ 3 - 3
GameClient/Packages/packages-lock.json

@@ -1,11 +1,11 @@
 {
   "dependencies": {
-    "com.focus-creative-games.hybridclr_unity": {
-      "version": "https://gitee.com/focus-creative-games/hybridclr_unity.git",
+    "com.code-philosophy.hybridclr": {
+      "version": "https://gitee.com/focus-creative-games/hybridclr_unity.git#v3.4.2",
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "c85adbe65b9c4adac183de716c3044f93358388a"
+      "hash": "1f9faf49a3ac4b6b5417188cd7579084d7563514"
     },
     "com.unity.2d.sprite": {
       "version": "1.0.0",

+ 3 - 4
GameClient/ProjectSettings/HybridCLRSettings.asset

@@ -14,17 +14,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enable: 1
   useGlobalIl2cpp: 0
-  cloneHomeURL: https://gitee.com/focus-creative-games
+  hybridclrRepoURL: https://gitee.com/focus-creative-games/hybridclr
+  il2cppPlusRepoURL: https://gitee.com/focus-creative-games/il2cpp_plus
   hotUpdateAssemblyDefinitions:
   - {fileID: 5897886265953266890, guid: 46e5d16512650f34ca18c2edd2331c78, type: 3}
   hotUpdateAssemblies: []
   preserveHotUpdateAssemblies: []
   hotUpdateDllCompileOutputRootDir: HybridCLRData/HotUpdateDlls
+  externalHotUpdateAssembliyDirs: []
   strippedAOTDllOutputRootDir: HybridCLRData/AssembliesPostIl2CppStrip
   patchAOTAssemblies: []
-  differentialHybridAssemblies: []
-  differentialHybridOptionOutputDir: Assets/StreamingAssets
-  collectAssetReferenceTypes: 0
   outputLinkFile: HybridCLRData/Generated/link.xml
   outputAOTGenericReferenceFile: HybridCLRData/Generated/AOTGenericReferences.cs
   maxGenericReferenceIteration: 10