Code Config生到自己对应的Package中

每个Package放一个PackageConfig，用来记录该Package的Id等数据

Unity/Packages/cn.etetet.actorlocation/PackageConfig.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d54714756eb2c264a9e75f3e033bb25f, type: 3}
+  m_Name: PackageConfig
+  m_EditorClassIdentifier: 
+  Id: 3
+  CreatePackageTypeFile: 1

Unity/Packages/cn.etetet.actorlocation/PackageConfig.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 502c19e0cdf62524698af5c7917e3990
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Packages/cn.etetet.core/Editor/PackageConfigEditor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 38a9c95f8a7257641899bcb1c87329b5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Packages/cn.etetet.core/Editor/PackageConfigEditor/PackageConfigEditor.cs

@@ -0,0 +1,11 @@
+using UnityEngine;
+
+namespace ET
+{
+    [CreateAssetMenu(menuName = "ET/PackageConfig", fileName = "PackageConfig", order = 0)]
+    public class PackageConfig: ScriptableObject
+    {
+        public int Id;
+        public bool CreatePackageTypeFile;
+    }
+}

Unity/Packages/cn.etetet.core/Editor/PackageConfigEditor/PackageConfigEditor.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d54714756eb2c264a9e75f3e033bb25f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Packages/cn.etetet.core/PackageConfig.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d54714756eb2c264a9e75f3e033bb25f, type: 3}
+  m_Name: PackageConfig
+  m_EditorClassIdentifier: 
+  Id: 1
+  CreatePackageTypeFile: 1

Unity/Packages/cn.etetet.core/PackageConfig.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8d896757b3698384cb0c9ac40ae877c7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Packages/cn.etetet.db/PackageConfig.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d54714756eb2c264a9e75f3e033bb25f, type: 3}
+  m_Name: PackageConfig
+  m_EditorClassIdentifier: 
+  Id: 6
+  CreatePackageTypeFile: 1

Unity/Packages/cn.etetet.db/PackageConfig.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4f7098bf69d6d5c43a8510f44aadf9a8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Bundles/Config.meta → Unity/Packages/cn.etetet.excel/Config.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ff3acf49577de0f44b9e1e1afc6f131e
+guid: c38044662d5e70b46adf8d791fa062f0
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Bundles/Config/UnitConfigCategory.bytes.meta → Unity/Packages/cn.etetet.excel/Config/UnitConfigCategory.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4c54687c04c629d488376e5ef067ef18
+guid: 2c19832f797c4a54b9f1aa520b01da94
 TextScriptImporter:
   externalObjects: {}
   userData: 

Unity/Packages/cn.etetet.excel/DotNet~/ExcelExporter.cs

@@ -63,7 +63,7 @@ namespace ET
 
         private const string jsonDir = "../Config/Json";
 
-        private const string clientProtoDir = "../Unity/Assets/Bundles/Config";
+        private const string clientProtoDir = "../Unity/Packages/cn.etetet.Excel/Config/";
         private const string serverProtoDir = "../Config/Excel";
         private static Assembly[] configAssemblies = new Assembly[3];
 

Unity/Assets/Bundles/Code.meta → Unity/Packages/cn.etetet.loader/Code.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 55d9010d6a87934468703901aa518c85
+guid: 750bf868de4ad9a4aae2958c57b5bb16
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Packages/cn.etetet.loader/Code/.gitignore

@@ -0,0 +1,2 @@
+*.bytes
+*.meta

Unity/Packages/cn.etetet.loader/PackageConfig.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d54714756eb2c264a9e75f3e033bb25f, type: 3}
+  m_Name: PackageConfig
+  m_EditorClassIdentifier: 
+  Id: 2
+  CreatePackageTypeFile: 0

Unity/Packages/cn.etetet.loader/PackageConfig.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 28efdbe1b46b1e34eb0f26b71c2be9c6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Packages/cn.etetet.loader/Runtime/CodeLoader.cs

@@ -23,7 +23,7 @@ namespace ET
         {
             if (!Define.IsEditor)
             {
-                this.dlls = await ResourcesComponent.Instance.LoadAllAssetsAsync<TextAsset>($"Assets/Bundles/Code/ET.Model.dll.bytes");
+                this.dlls = await ResourcesComponent.Instance.LoadAllAssetsAsync<TextAsset>($"Packages/cn.etetet.loader/Code/ET.Model.dll.bytes");
                 if (Define.EnableIL2CPP)
                 {
                     this.aotDlls = await ResourcesComponent.Instance.LoadAllAssetsAsync<TextAsset>($"Assets/Bundles/AotDlls/mscorlib.dll.bytes");
@@ -41,7 +41,7 @@ namespace ET
                 byte[] modelPdbBytes = this.dlls["ET.Model.pdb"].bytes;
                 byte[] modelViewAssBytes = this.dlls["ET.ModelView.dll"].bytes;
                 byte[] modelViewPdbBytes = this.dlls["ET.ModelView.pdb"].bytes;
-                // 如果需要测试，可替换成下面注释的代码直接加载Assets/Bundles/Code/ET.Model.dll.bytes，但真正打包时必须使用上面的代码
+                // 如果需要测试，可替换成下面注释的代码直接加载Packages/cn.etetet.loader/Code/ET.Model.dll.bytes，但真正打包时必须使用上面的代码
                 //modelAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.Model.dll.bytes"));
                 //modelPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.Model.pdb.bytes"));
                 //modelViewAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.ModelView.dll.bytes"));
@@ -94,7 +94,7 @@ namespace ET
                 hotfixPdbBytes = this.dlls["ET.Hotfix.pdb"].bytes;
                 hotfixViewAssBytes = this.dlls["ET.HotfixView.dll"].bytes;
                 hotfixViewPdbBytes = this.dlls["ET.HotfixView.pdb"].bytes;
-                // 如果需要测试，可替换成下面注释的代码直接加载Assets/Bundles/Code/Hotfix.dll.bytes，但真正打包时必须使用上面的代码
+                // 如果需要测试，可替换成下面注释的代码直接加载Packages/cn.etetet.loader/Code/Hotfix.dll.bytes，但真正打包时必须使用上面的代码
                 //hotfixAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.Hotfix.dll.bytes"));
                 //hotfixPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.Hotfix.pdb.bytes"));
                 //hotfixViewAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.HotfixView.dll.bytes"));

Unity/Packages/cn.etetet.loader/Runtime/Define.cs

@@ -5,7 +5,7 @@
         /// <summary>
         /// 编辑器下加载热更dll的目录
         /// </summary>
-        public const string CodeDir = "Assets/Bundles/Code";
+        public const string CodeDir = "Packages/cn.etetet.loader/Code";
 
         /// <summary>
         /// VS或Rider工程生成dll的所在目录, 使用HybridCLR打包时需要使用

Unity/Packages/cn.etetet.move/PackageConfig.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d54714756eb2c264a9e75f3e033bb25f, type: 3}
+  m_Name: PackageConfig
+  m_EditorClassIdentifier: 
+  Id: 4
+  CreatePackageTypeFile: 1

Unity/Packages/cn.etetet.move/PackageConfig.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 416ecc047d9c89b438ccd84922addcf8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Packages/cn.etetet.statesync/Scripts/HotfixView/Client/ConfigLoaderInvoker.cs

@@ -57,7 +57,7 @@ namespace ET
             {
                 foreach (Type type in configTypes)
                 {
-                    TextAsset v = await ResourcesComponent.Instance.LoadAssetAsync<TextAsset>($"Assets/Bundles/Config/{type.Name}.bytes");
+                    TextAsset v = await ResourcesComponent.Instance.LoadAssetAsync<TextAsset>($"Packages/cn.etetet.excel/Config/{type.Name}.bytes");
                     output[type] = v.bytes;
                 }
             }

Unity/Packages/cn.etetet.statesync/Settings/AssetBundleCollectorSetting.asset

@@ -55,8 +55,8 @@ MonoBehaviour:
       AssetTags: 
       ActiveRuleName: EnableGroup
       Collectors:
-      - CollectPath: Assets/Bundles/Config
-        CollectorGUID: ff3acf49577de0f44b9e1e1afc6f131e
+      - CollectPath: Packages/cn.etetet.excel/Config
+        CollectorGUID: c38044662d5e70b46adf8d791fa062f0
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory

Unity/Packages/cn.etetet.unit/PackageConfig.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d54714756eb2c264a9e75f3e033bb25f, type: 3}
+  m_Name: PackageConfig
+  m_EditorClassIdentifier: 
+  Id: 5
+  CreatePackageTypeFile: 1

Unity/Packages/cn.etetet.unit/PackageConfig.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7af2d7a6b1953cb45af56621f58e5ea4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Packages/cn.etetet.yooassets/PackageConfig.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d54714756eb2c264a9e75f3e033bb25f, type: 3}
+  m_Name: PackageConfig
+  m_EditorClassIdentifier: 
+  Id: 7
+  CreatePackageTypeFile: 1

Unity/Packages/cn.etetet.yooassets/PackageConfig.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0a38a96fa98251249ae58da3c5b83453
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: