把Model Hotfix ModelView HotfixView挪到StateSync中，假如放到Loader中，那么这些程序集引用会根据不同的demo引用的库有不同的变化，这样不太合理。上层的变化不应该导致下层的包有变化

ET.sln

@@ -47,14 +47,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Analyzer", "Unity\Packag
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.SourceGenerator", "Unity\Packages\cn.etetet.sourcegenerator\DotNet~\ET.SourceGenerator\ET.SourceGenerator.csproj", "{B8994466-96D7-4777-BE10-85EC5919EA98}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Model", "Unity\Packages\cn.etetet.loader\DotNet~\Model\ET.Model.csproj", "{D9CFE644-AB40-480A-9EBB-B6129F27FB67}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Loader", "Unity\Packages\cn.etetet.loader\DotNet~\Loader\ET.Loader.csproj", "{B69D87B8-C61F-4DCE-883B-3C5D6C179ADF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Hotfix", "Unity\Packages\cn.etetet.loader\DotNet~\Hotfix\ET.Hotfix.csproj", "{C4C0568B-83EE-49FC-A99A-AB4A445DABD9}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.App", "Unity\Packages\cn.etetet.loader\DotNet~\App\ET.App.csproj", "{31A5CA3C-6C77-436A-99AC-3D3D099144B8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Hotfix", "Unity\Packages\cn.etetet.statesync\DotNet~\Hotfix\ET.Hotfix.csproj", "{A6D58788-959F-4A1C-A211-F6865B985082}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Model", "Unity\Packages\cn.etetet.statesync\DotNet~\Model\ET.Model.csproj", "{39CCBBF9-E293-4668-879E-0C5A2577AB71}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -305,18 +305,6 @@ Global
 		{B8994466-96D7-4777-BE10-85EC5919EA98}.Release|x64.Build.0 = Release|Any CPU
 		{B8994466-96D7-4777-BE10-85EC5919EA98}.Release|x86.ActiveCfg = Release|Any CPU
 		{B8994466-96D7-4777-BE10-85EC5919EA98}.Release|x86.Build.0 = Release|Any CPU
-		{D9CFE644-AB40-480A-9EBB-B6129F27FB67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9CFE644-AB40-480A-9EBB-B6129F27FB67}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9CFE644-AB40-480A-9EBB-B6129F27FB67}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D9CFE644-AB40-480A-9EBB-B6129F27FB67}.Debug|x64.Build.0 = Debug|Any CPU
-		{D9CFE644-AB40-480A-9EBB-B6129F27FB67}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D9CFE644-AB40-480A-9EBB-B6129F27FB67}.Debug|x86.Build.0 = Debug|Any CPU
-		{D9CFE644-AB40-480A-9EBB-B6129F27FB67}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9CFE644-AB40-480A-9EBB-B6129F27FB67}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D9CFE644-AB40-480A-9EBB-B6129F27FB67}.Release|x64.ActiveCfg = Release|Any CPU
-		{D9CFE644-AB40-480A-9EBB-B6129F27FB67}.Release|x64.Build.0 = Release|Any CPU
-		{D9CFE644-AB40-480A-9EBB-B6129F27FB67}.Release|x86.ActiveCfg = Release|Any CPU
-		{D9CFE644-AB40-480A-9EBB-B6129F27FB67}.Release|x86.Build.0 = Release|Any CPU
 		{B69D87B8-C61F-4DCE-883B-3C5D6C179ADF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B69D87B8-C61F-4DCE-883B-3C5D6C179ADF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B69D87B8-C61F-4DCE-883B-3C5D6C179ADF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -329,18 +317,6 @@ Global
 		{B69D87B8-C61F-4DCE-883B-3C5D6C179ADF}.Release|x64.Build.0 = Release|Any CPU
 		{B69D87B8-C61F-4DCE-883B-3C5D6C179ADF}.Release|x86.ActiveCfg = Release|Any CPU
 		{B69D87B8-C61F-4DCE-883B-3C5D6C179ADF}.Release|x86.Build.0 = Release|Any CPU
-		{C4C0568B-83EE-49FC-A99A-AB4A445DABD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4C0568B-83EE-49FC-A99A-AB4A445DABD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4C0568B-83EE-49FC-A99A-AB4A445DABD9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C4C0568B-83EE-49FC-A99A-AB4A445DABD9}.Debug|x64.Build.0 = Debug|Any CPU
-		{C4C0568B-83EE-49FC-A99A-AB4A445DABD9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C4C0568B-83EE-49FC-A99A-AB4A445DABD9}.Debug|x86.Build.0 = Debug|Any CPU
-		{C4C0568B-83EE-49FC-A99A-AB4A445DABD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4C0568B-83EE-49FC-A99A-AB4A445DABD9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4C0568B-83EE-49FC-A99A-AB4A445DABD9}.Release|x64.ActiveCfg = Release|Any CPU
-		{C4C0568B-83EE-49FC-A99A-AB4A445DABD9}.Release|x64.Build.0 = Release|Any CPU
-		{C4C0568B-83EE-49FC-A99A-AB4A445DABD9}.Release|x86.ActiveCfg = Release|Any CPU
-		{C4C0568B-83EE-49FC-A99A-AB4A445DABD9}.Release|x86.Build.0 = Release|Any CPU
 		{31A5CA3C-6C77-436A-99AC-3D3D099144B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{31A5CA3C-6C77-436A-99AC-3D3D099144B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{31A5CA3C-6C77-436A-99AC-3D3D099144B8}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -353,6 +329,30 @@ Global
 		{31A5CA3C-6C77-436A-99AC-3D3D099144B8}.Release|x64.Build.0 = Release|Any CPU
 		{31A5CA3C-6C77-436A-99AC-3D3D099144B8}.Release|x86.ActiveCfg = Release|Any CPU
 		{31A5CA3C-6C77-436A-99AC-3D3D099144B8}.Release|x86.Build.0 = Release|Any CPU
+		{A6D58788-959F-4A1C-A211-F6865B985082}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6D58788-959F-4A1C-A211-F6865B985082}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6D58788-959F-4A1C-A211-F6865B985082}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6D58788-959F-4A1C-A211-F6865B985082}.Debug|x64.Build.0 = Debug|Any CPU
+		{A6D58788-959F-4A1C-A211-F6865B985082}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A6D58788-959F-4A1C-A211-F6865B985082}.Debug|x86.Build.0 = Debug|Any CPU
+		{A6D58788-959F-4A1C-A211-F6865B985082}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6D58788-959F-4A1C-A211-F6865B985082}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6D58788-959F-4A1C-A211-F6865B985082}.Release|x64.ActiveCfg = Release|Any CPU
+		{A6D58788-959F-4A1C-A211-F6865B985082}.Release|x64.Build.0 = Release|Any CPU
+		{A6D58788-959F-4A1C-A211-F6865B985082}.Release|x86.ActiveCfg = Release|Any CPU
+		{A6D58788-959F-4A1C-A211-F6865B985082}.Release|x86.Build.0 = Release|Any CPU
+		{39CCBBF9-E293-4668-879E-0C5A2577AB71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39CCBBF9-E293-4668-879E-0C5A2577AB71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39CCBBF9-E293-4668-879E-0C5A2577AB71}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{39CCBBF9-E293-4668-879E-0C5A2577AB71}.Debug|x64.Build.0 = Debug|Any CPU
+		{39CCBBF9-E293-4668-879E-0C5A2577AB71}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{39CCBBF9-E293-4668-879E-0C5A2577AB71}.Debug|x86.Build.0 = Debug|Any CPU
+		{39CCBBF9-E293-4668-879E-0C5A2577AB71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39CCBBF9-E293-4668-879E-0C5A2577AB71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39CCBBF9-E293-4668-879E-0C5A2577AB71}.Release|x64.ActiveCfg = Release|Any CPU
+		{39CCBBF9-E293-4668-879E-0C5A2577AB71}.Release|x64.Build.0 = Release|Any CPU
+		{39CCBBF9-E293-4668-879E-0C5A2577AB71}.Release|x86.ActiveCfg = Release|Any CPU
+		{39CCBBF9-E293-4668-879E-0C5A2577AB71}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -378,10 +378,10 @@ Global
 		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{A8EF6EF9-761B-4A0A-BA25-49D04D5C18AC} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{B8994466-96D7-4777-BE10-85EC5919EA98} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
-		{D9CFE644-AB40-480A-9EBB-B6129F27FB67} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{B69D87B8-C61F-4DCE-883B-3C5D6C179ADF} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
-		{C4C0568B-83EE-49FC-A99A-AB4A445DABD9} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{31A5CA3C-6C77-436A-99AC-3D3D099144B8} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{A6D58788-959F-4A1C-A211-F6865B985082} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{39CCBBF9-E293-4668-879E-0C5A2577AB71} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

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

@@ -50,7 +50,7 @@ namespace ET.Loader
         {
             AllRefInfo allRefInfo = new();
 
-            foreach (var packagePath in PackagePaths)
+            foreach (string packagePath in PackagePaths)
             {
                 foreach (string directory in Directory.GetDirectories(packagePath, "cn.etetet.*"))
                 {
@@ -79,12 +79,15 @@ namespace ET.Loader
                 }
             }
 
+            List<string> findRet = new List<string>();
             foreach (string assName in AssNames)
             {
-                string p = Path.Combine("Packages/cn.etetet.loader/Scripts/" + assName + "/ET." + assName + ".asmdef");
+                findRet.Clear();
+                FileHelper.GetAllFiles(findRet, "./Packages", $"ET.{assName}.asmdef");
+                string p = findRet[0];
                 if (!File.Exists(p))
                 {
-                    continue;
+                    throw new Exception($"not found: {p}");
                 }
 
                 string json = File.ReadAllText(p);

Unity/Packages/cn.etetet.core/Runtime/Helper/AssemblyHelper.cs

@@ -12,7 +12,8 @@ namespace ET
 
             foreach (Assembly ass in args)
             {
-                foreach (Type type in ass.GetTypes())
+                var ts = ass.GetTypes();
+                foreach (Type type in ts)
                 {
                     types[type.FullName] = type;
                 }

Unity/Packages/cn.etetet.loader/Scripts/Model.meta → Unity/Packages/cn.etetet.excel/Bundles.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c4b0aa9be3e7ef8478ce0d8f0e29ee06
+guid: 67c48375d05c9a54680b1ca489ece7b6
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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/Packages/cn.etetet.Excel/Config/";
+        private const string clientProtoDir = "../Unity/Packages/cn.etetet.Excel/Bundles/Config/";
         private const string serverProtoDir = "../Config/Excel";
         private static Assembly[] configAssemblies = new Assembly[3];
 

Unity/Packages/cn.etetet.loader/Scripts.meta → Unity/Packages/cn.etetet.loader/Bundles.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4789836193714bc418e9d36c41738c53
+guid: 428e2dfe663e2ba4fbd5a51a19c50ab4
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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

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

Unity/Packages/cn.etetet.loader/DotNet~/App/ET.App.csproj

@@ -20,6 +20,10 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>DOTNET</DefineConstants>
     <OutputPath>$(SolutionDir)Bin</OutputPath>
@@ -28,6 +32,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Model\ET.Model.csproj" />
+    <ProjectReference Include="..\..\..\cn.etetet.statesync\DotNet~\Model\ET.Model.csproj" />
+    <ProjectReference Include="..\Loader\ET.Loader.csproj" />
   </ItemGroup>
 </Project>

Unity/Packages/cn.etetet.loader/DotNet~/Directory.Build.props

@@ -1,6 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <LangVersion>11.0</LangVersion>
-    <NoWarn>0169,0649,3021,8981</NoWarn>
-  </PropertyGroup>
-</Project>

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 = "Packages/cn.etetet.loader/AotDlls";
+            string toDir = "Packages/cn.etetet.loader/Bundles/AotDlls";
             if (Directory.Exists(toDir))
             {
                 Directory.Delete(toDir, true);

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

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

Unity/Packages/cn.etetet.loader/Scripts/Hotfix.meta

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

Unity/Packages/cn.etetet.loader/Scripts/HotfixView.meta

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

Unity/Packages/cn.etetet.loader/Scripts/ModelView.meta

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

Unity/Packages/cn.etetet.loader/DotNet~/Model/ET.Model.csproj → Unity/Packages/cn.etetet.statesync/DotNet~/Model/ET.Model.csproj

@@ -25,6 +25,11 @@
         <Optimize>true</Optimize>
         <NoWarn>0169,0649,3021,8981,CS9193,CS9192</NoWarn>
     </PropertyGroup>
+
+    <PropertyGroup>
+        <PreserveCompilationContext>true</PreserveCompilationContext>
+    </PropertyGroup>
+    
     <ItemGroup>
         <Compile Include="$(SolutionDir)Unity\Packages\cn.etetet.*\Scripts\Model\Share\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
@@ -42,9 +47,9 @@
     <ItemGroup>
         <ProjectReference Include="$(SolutionDir)Unity\Packages\cn.etetet.sourcegenerator\DotNet~\ET.Analyzer\ET.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="$(SolutionDir)Unity\Packages\cn.etetet.sourcegenerator\DotNet~\ET.SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="..\..\..\cn.etetet.loader\DotNet~\Loader\ET.Loader.csproj" />
         <ProjectReference Include="..\..\..\cn.etetet.mathematics\DotNet~\ET.Mathematics.csproj" />
         <ProjectReference Include="..\..\..\cn.etetet.recast\DotNet~\ET.Recast.csproj" />
-        <ProjectReference Include="..\Loader\ET.Loader.csproj" />
     </ItemGroup>
 
     <!-- sourcegenerator use -->

Unity/Packages/cn.etetet.loader/Scripts/Hotfix/ET.Hotfix.asmdef.meta → Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/ET.Hotfix.asmdef.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2d56d402361754240b71ad908a0879da
+guid: b6a0e1be1d2167f4b941ce253f9ea0b9
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 

Unity/Packages/cn.etetet.loader/Scripts/HotfixView/ET.HotfixView.asmdef.meta → Unity/Packages/cn.etetet.statesync/Scripts/HotfixView/ET.HotfixView.asmdef.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7d8c8789b4b09c048a09d38c44ad1d1f
+guid: ca52ba6eb56a7d748a9d7641f3df8496
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 

Unity/Packages/cn.etetet.loader/Scripts/Model/ET.Model.asmdef.meta → Unity/Packages/cn.etetet.statesync/Scripts/Model/ET.Model.asmdef.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: efc2ca0b51ad54047b25b5c2eb4c19a1
+guid: ec12ac5dd42d1e04e8cc5350a28fad66
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 

Unity/Packages/cn.etetet.loader/Scripts/ModelView/ET.ModelView.asmdef.meta → Unity/Packages/cn.etetet.statesync/Scripts/ModelView/ET.ModelView.asmdef.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 98395eb17a7c633439d4cc0873eda2ed
+guid: 0f580b5d51270ed4db4bbf6737bd79e0
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 

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

@@ -29,7 +29,7 @@ MonoBehaviour:
       AssetTags: 
       ActiveRuleName: EnableGroup
       Collectors:
-      - CollectPath: Packages/cn.etetet.loader/AotDlls
+      - CollectPath: Packages/cn.etetet.loader/Bundles/AotDlls
         CollectorGUID: 5edf4794c66cecc4f808f8db8d9206b7
         CollectorType: 0
         AddressRuleName: AddressByFileName
@@ -42,7 +42,7 @@ MonoBehaviour:
       AssetTags: 
       ActiveRuleName: EnableGroup
       Collectors:
-      - CollectPath: Packages/cn.etetet.loader/Code
+      - CollectPath: Packages/cn.etetet.loader/Bundles/Code
         CollectorGUID: 750bf868de4ad9a4aae2958c57b5bb16
         CollectorType: 0
         AddressRuleName: AddressByFileName
@@ -81,7 +81,7 @@ MonoBehaviour:
       AssetTags: 
       ActiveRuleName: EnableGroup
       Collectors:
-      - CollectPath: Packages/cn.etetet.statesync/Bundle/UI
+      - CollectPath: Packages/cn.etetet.statesync/Bundles/UI
         CollectorGUID: 49a0f4a4f3b03e24980b5251a802c0a2
         CollectorType: 0
         AddressRuleName: AddressByFileName