Jelajahi Sumber

修复HybridCLR路径问题

tanghai 1 tahun lalu
induk
melakukan
4233aee398

+ 2 - 3
Unity/Assets/Bundles.meta → Unity/Assets/HybridCLR.meta

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: 11c8678319dc07145a57ddfdac362b97
+guid: 685dc9859bbfe684ea0c360290ab6958
 folderAsset: yes
-timeCreated: 1487209383
-licenseType: Pro
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 4 - 0
Unity/Assets/HybridCLR/.gitignore

@@ -0,0 +1,4 @@
+AOTGenericReferences.cs
+AOTGenericReferences.cs.meta
+link.xml
+link.xml.meta

+ 3 - 0
Unity/Assets/HybridCLR/AssemblyReferenceToLoader.asmref

@@ -0,0 +1,3 @@
+{
+    "reference": "ET.Loader"
+}

+ 7 - 0
Unity/Assets/HybridCLR/AssemblyReferenceToLoader.asmref.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2ccc6bb38952e7b44858cc80f0d75e87
+AssemblyDefinitionReferenceImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
Unity/Assets/Bundles/AotDlls.meta → Unity/Packages/cn.etetet.loader/AotDlls.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 51f33a3e2065f5642bee2f96c2433544
+guid: 5edf4794c66cecc4f808f8db8d9206b7
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: aotdlls.unity3d
+  assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Unity/Packages/cn.etetet.loader/Editor/HybridCLR/HybridCLREditor.cs

@@ -13,7 +13,7 @@ namespace ET
         {
             BuildTarget target = EditorUserBuildSettings.activeBuildTarget;
             string fromDir = Path.Combine(HybridCLRSettings.Instance.strippedAOTDllOutputRootDir, target.ToString());
-            string toDir = "Assets/Bundles/AotDlls";
+            string toDir = "Packages/cn.etetet.loader/AotDlls";
             if (Directory.Exists(toDir))
             {
                 Directory.Delete(toDir, true);

+ 2 - 2
Unity/Packages/cn.etetet.statesync/Settings/AssetBundleCollectorSetting.asset

@@ -29,8 +29,8 @@ MonoBehaviour:
       AssetTags: 
       ActiveRuleName: EnableGroup
       Collectors:
-      - CollectPath: Assets/Bundles/AotDlls
-        CollectorGUID: 51f33a3e2065f5642bee2f96c2433544
+      - CollectPath: Packages/cn.etetet.loader/AotDlls
+        CollectorGUID: 5edf4794c66cecc4f808f8db8d9206b7
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory

+ 5 - 6
Unity/ProjectSettings/HybridCLRSettings.asset

@@ -28,18 +28,17 @@ MonoBehaviour:
   - Temp/Bin/Debug
   strippedAOTDllOutputRootDir: HybridCLRData/AssembliesPostIl2CppStrip
   patchAOTAssemblies:
-  - Unity.ThirdParty.dll
-  - Unity.Loader.dll
-  - Unity.Core.dll
+  - ET.Loader.dll
+  - ET.Core.dll
+  - ET.YooAssets
   - MongoDB.Bson.dll
   - CommandLine.dll
-  - NLog.dll
   - System.dll
   - System.Core.dll
   - mscorlib.dll
   - MemoryPack.dll
   - System.Runtime.CompilerServices.Unsafe.dll
-  outputLinkFile: Scripts/Loader/HybridCLR/Generated/link.xml
-  outputAOTGenericReferenceFile: Scripts/Loader/HybridCLR/Generated/AOTGenericReferences.cs
+  outputLinkFile: HybridCLR/link.xml
+  outputAOTGenericReferenceFile: HybridCLR/AOTGenericReferences.cs
   maxGenericReferenceIteration: 10
   maxMethodBridgeGenericIteration: 10