1.调整目录结构

2.由于没有了机器人，那么ThirdParty目录没有了共享的必要，放到了Apps目录
3.Tools也放到了Apps目录，改名为Tool

Apps/App/Apps.App.csproj → Apps/App/ET.App.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>ET</RootNamespace>
     <LangVersion>8</LangVersion>
-    <AssemblyName>Apps</AssemblyName>
+    <AssemblyName>App</AssemblyName>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -32,6 +32,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Model\Apps.Model.csproj" />
+    <ProjectReference Include="..\Model\ET.Model.csproj" />
   </ItemGroup>
 </Project>

Apps/Hotfix/Apps.Hotfix.csproj → Apps/Hotfix/ET.Hotfix.csproj

@@ -3,6 +3,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>ET</RootNamespace>
     <LangVersion>8</LangVersion>
+    <AssemblyName>Hotfix</AssemblyName>
   </PropertyGroup>
   <PropertyGroup>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -44,6 +45,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Model\Apps.Model.csproj" />
+    <ProjectReference Include="..\Model\ET.Model.csproj" />
   </ItemGroup>
 </Project>

Apps/Model/Base/DllHelper.cs

@@ -13,8 +13,8 @@ namespace ET
             assemblyLoadContext?.Unload();
             System.GC.Collect();
             assemblyLoadContext = new AssemblyLoadContext("Hotfix", true);
-            byte[] dllBytes = File.ReadAllBytes("./Apps.Hotfix.dll");
-            byte[] pdbBytes = File.ReadAllBytes("./Apps.Hotfix.pdb");
+            byte[] dllBytes = File.ReadAllBytes("./Hotfix.dll");
+            byte[] pdbBytes = File.ReadAllBytes("./Hotfix.pdb");
             Assembly assembly = assemblyLoadContext.LoadFromStream(new MemoryStream(dllBytes), new MemoryStream(pdbBytes));
             return assembly;
         }

Apps/Model/Apps.Model.csproj → Apps/Model/ET.Model.csproj

@@ -3,6 +3,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>ET</RootNamespace>
     <LangVersion>8</LangVersion>
+    <AssemblyName>Model</AssemblyName>
   </PropertyGroup>
   <PropertyGroup>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -89,8 +90,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\ThirdParty\ETTask\ETTask.csproj" />
-    <ProjectReference Include="..\..\ThirdParty\ShareLib\ShareLib.csproj" />
-    <ProjectReference Include="..\..\ThirdParty\UnityEngine\UnityEngine.csproj" />
+    <ProjectReference Include="..\ThirdParty\ET.ThirdParty.csproj" />
   </ItemGroup>
 </Project>

ThirdParty/ShareLib/ShareLib.csproj → Apps/ThirdParty/ET.ThirdParty.csproj

@@ -2,62 +2,74 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
+        <Nullable>disable</Nullable>
+        <LangVersion>8</LangVersion>
+        <RootNamespace>ETTask</RootNamespace>
+        <AssemblyName>ThirdParty</AssemblyName>
     </PropertyGroup>
-
+    
+    <PropertyGroup>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    </PropertyGroup>
+    
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+      <DefineConstants>TRACE;NOT_UNITY</DefineConstants>
       <OutputPath>..\..\Bin\</OutputPath>
+      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
-
+    
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+      <DefineConstants>TRACE;NOT_UNITY</DefineConstants>
       <OutputPath>..\..\Bin\</OutputPath>
+      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 
     <ItemGroup>
-      <Content Include="..\..\Unity\Assets\Plugins\MacOS\libRecastDll.dylib">
-        <Link>libRecastDll.dylib</Link>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
-      <Content Include="..\..\Unity\Assets\Plugins\x86_64\RecastDll.dll">
-          <Link>RecastDll.dll</Link>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
-        
+
+    <Compile Include="..\..\Unity\Assets\ThirdParty\ETTask\**\*.cs">
+        <Link>ETTask/%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Compile>
+
+    <Compile Include="..\..\Unity\Assets\ThirdParty\ShareLib\Kcp\Kcp.cs">
+      <Link>Kcp\Kcp.cs</Link>
+    </Compile>
+
+    <Compile Include="..\..\Unity\Assets\ThirdParty\ShareLib\Recast\Recast.cs">
+      <Link>Recast\Recast.cs</Link>
+    </Compile>
+    </ItemGroup>
+
+    <ItemGroup>
       <Content Include="..\..\Unity\Assets\Plugins\MacOS\libkcp.dylib">
         <Link>libkcp.dylib</Link>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
+      <Content Include="..\..\Unity\Assets\Plugins\MacOS\libRecastDll.dylib">
+        <Link>libRecastDll.dylib</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
       <Content Include="..\..\Unity\Assets\Plugins\x86_64\kcp.dll">
         <Link>kcp.dll</Link>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
-        
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\UnityEngine\UnityEngine.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\ShareLib\Kcp\Kcp.cs">
-        <Link>Kcp\Kcp.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\ShareLib\Recast\Recast.cs">
-        <Link>Recast\Recast.cs</Link>
-      </Compile>
+      <Content Include="..\..\Unity\Assets\Plugins\x86_64\RecastDll.dll">
+        <Link>RecastDll.dll</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
     </ItemGroup>
 
     <ItemGroup>
       <PackageReference Include="CommandLineParser" Version="2.8.0" />
-      <PackageReference Include="EPPlus" Version="5.8.3" />
+      <PackageReference Include="EPPlus" Version="5.8.8" />
+      <PackageReference Include="MongoDB.Driver" Version="2.15.0" />
+      <PackageReference Include="NLog" Version="4.7.15" />
+      <PackageReference Include="protobuf-net" Version="2.4.6" />
+      <PackageReference Include="SharpZipLib" Version="1.3.3" />
       <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.0.1" />
       <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
-      <PackageReference Include="mongocsharpdriver" Version="2.13.3" />
-      <PackageReference Include="MongoDB.Bson" Version="2.13.3" />
-      <PackageReference Include="NLog" Version="4.7.12" />
-      <PackageReference Include="protobuf-net" Version="2.4.0" />
-      <PackageReference Include="SharpZipLib" Version="1.3.3" />
     </ItemGroup>
 
 </Project>

Tools/App/Tools.App.csproj → Apps/Tool/ET.Tool.csproj

@@ -5,9 +5,10 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>false</ImplicitUsings>
         <Nullable>disable</Nullable>
-        <AssemblyName>Tools</AssemblyName>
         <RootNamespace>ET</RootNamespace>
         <LangVersion>8</LangVersion>
+        <PackageId>ET.Tool</PackageId>
+        <AssemblyName>Tool</AssemblyName>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -50,15 +51,14 @@
         </Compile>
     </ItemGroup>
     
-    <ItemGroup>
-      <ProjectReference Include="..\..\ThirdParty\ETTask\ETTask.csproj" />
-      <ProjectReference Include="..\..\ThirdParty\ShareLib\ShareLib.csproj" />
-    </ItemGroup>
-    
     <ItemGroup>
       <None Update="Template.txt">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </None>
     </ItemGroup>
+    
+    <ItemGroup>
+      <ProjectReference Include="..\ThirdParty\ET.ThirdParty.csproj" />
+    </ItemGroup>
 
 </Project>

Tools/App/Proto2CS/Proto2CS.cs → Apps/Tool/Proto2CS/Proto2CS.cs

@@ -25,7 +25,7 @@ namespace ET
     {
         private const string protoPath = ".";
         private const string clientMessagePath = "../Unity/Codes/Model/Generate/Message/";
-        private const string serverMessagePath = "../Server/Model/Generate/Message/";
+        private const string serverMessagePath = "../Apps/Model/Generate/Message/";
         private static readonly char[] splitChars = { ' ', '\t' };
         private static readonly List<OpcodeInfo> msgOpcode = new List<OpcodeInfo>();
 

Client-Server.sln

@@ -17,27 +17,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.HotfixView", "Unity\U
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ModelView", "Unity\Unity.ModelView.csproj", "{C109842F-01DA-64D4-DBF2-00C6449E459E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{D885C55E-8E9B-4837-938D-15A919188607}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnityEngine", "ThirdParty\UnityEngine\UnityEngine.csproj", "{9F66DBC1-55AB-40D4-B4C4-B707CB39E624}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShareLib", "ThirdParty\ShareLib\ShareLib.csproj", "{EC8FBBC4-59C8-438C-AE16-1762C269B928}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Mono", "Unity\Unity.Mono.csproj", "{5910FA29-5797-199C-985B-FC9FC473328E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ThirdParty", "Unity\Unity.ThirdParty.csproj", "{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{7B755614-03A1-4EDB-8596-4CEDE942336E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.App", "Tools\App\Tools.App.csproj", "{8926376D-98AA-4530-A1D4-CF6B45979C2C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Model", "Apps\Model\ET.Model.csproj", "{1082AF19-6624-4CFA-92CD-F6AA2AE5B364}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ETTask", "ThirdParty\ETTask\ETTask.csproj", "{A79298FC-C047-4C1E-9864-829AEDABE7BF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Hotfix", "Apps\Hotfix\ET.Hotfix.csproj", "{492D9D9D-09FB-4757-B486-E56322605113}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apps.Model", "Apps\Model\Apps.Model.csproj", "{1082AF19-6624-4CFA-92CD-F6AA2AE5B364}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.App", "Apps\App\ET.App.csproj", "{B7A8A3FD-69EC-4156-8076-F33E98392601}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apps.Hotfix", "Apps\Hotfix\Apps.Hotfix.csproj", "{492D9D9D-09FB-4757-B486-E56322605113}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.ThirdParty", "Apps\ThirdParty\ET.ThirdParty.csproj", "{E411076A-B800-457D-A36D-06EC716B2663}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apps.App", "Apps\App\Apps.App.csproj", "{AE2EBC30-3252-44E5-87C1-46BD665E1498}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Tool", "Apps\Tool\ET.Tool.csproj", "{21A2F73C-A935-42B7-A487-3962718CE29F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -109,30 +101,6 @@ Global
 		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x64.Build.0 = Release|Any CPU
 		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x86.ActiveCfg = Release|Any CPU
 		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x86.Build.0 = Release|Any CPU
-		{9F66DBC1-55AB-40D4-B4C4-B707CB39E624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F66DBC1-55AB-40D4-B4C4-B707CB39E624}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F66DBC1-55AB-40D4-B4C4-B707CB39E624}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9F66DBC1-55AB-40D4-B4C4-B707CB39E624}.Debug|x64.Build.0 = Debug|Any CPU
-		{9F66DBC1-55AB-40D4-B4C4-B707CB39E624}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9F66DBC1-55AB-40D4-B4C4-B707CB39E624}.Debug|x86.Build.0 = Debug|Any CPU
-		{9F66DBC1-55AB-40D4-B4C4-B707CB39E624}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F66DBC1-55AB-40D4-B4C4-B707CB39E624}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F66DBC1-55AB-40D4-B4C4-B707CB39E624}.Release|x64.ActiveCfg = Release|Any CPU
-		{9F66DBC1-55AB-40D4-B4C4-B707CB39E624}.Release|x64.Build.0 = Release|Any CPU
-		{9F66DBC1-55AB-40D4-B4C4-B707CB39E624}.Release|x86.ActiveCfg = Release|Any CPU
-		{9F66DBC1-55AB-40D4-B4C4-B707CB39E624}.Release|x86.Build.0 = Release|Any CPU
-		{EC8FBBC4-59C8-438C-AE16-1762C269B928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC8FBBC4-59C8-438C-AE16-1762C269B928}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC8FBBC4-59C8-438C-AE16-1762C269B928}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EC8FBBC4-59C8-438C-AE16-1762C269B928}.Debug|x64.Build.0 = Debug|Any CPU
-		{EC8FBBC4-59C8-438C-AE16-1762C269B928}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EC8FBBC4-59C8-438C-AE16-1762C269B928}.Debug|x86.Build.0 = Debug|Any CPU
-		{EC8FBBC4-59C8-438C-AE16-1762C269B928}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC8FBBC4-59C8-438C-AE16-1762C269B928}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC8FBBC4-59C8-438C-AE16-1762C269B928}.Release|x64.ActiveCfg = Release|Any CPU
-		{EC8FBBC4-59C8-438C-AE16-1762C269B928}.Release|x64.Build.0 = Release|Any CPU
-		{EC8FBBC4-59C8-438C-AE16-1762C269B928}.Release|x86.ActiveCfg = Release|Any CPU
-		{EC8FBBC4-59C8-438C-AE16-1762C269B928}.Release|x86.Build.0 = Release|Any CPU
 		{5910FA29-5797-199C-985B-FC9FC473328E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5910FA29-5797-199C-985B-FC9FC473328E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5910FA29-5797-199C-985B-FC9FC473328E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -157,30 +125,6 @@ Global
 		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x64.Build.0 = Release|Any CPU
 		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x86.ActiveCfg = Release|Any CPU
 		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350}.Release|x86.Build.0 = Release|Any CPU
-		{8926376D-98AA-4530-A1D4-CF6B45979C2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8926376D-98AA-4530-A1D4-CF6B45979C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8926376D-98AA-4530-A1D4-CF6B45979C2C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8926376D-98AA-4530-A1D4-CF6B45979C2C}.Debug|x64.Build.0 = Debug|Any CPU
-		{8926376D-98AA-4530-A1D4-CF6B45979C2C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8926376D-98AA-4530-A1D4-CF6B45979C2C}.Debug|x86.Build.0 = Debug|Any CPU
-		{8926376D-98AA-4530-A1D4-CF6B45979C2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8926376D-98AA-4530-A1D4-CF6B45979C2C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8926376D-98AA-4530-A1D4-CF6B45979C2C}.Release|x64.ActiveCfg = Release|Any CPU
-		{8926376D-98AA-4530-A1D4-CF6B45979C2C}.Release|x64.Build.0 = Release|Any CPU
-		{8926376D-98AA-4530-A1D4-CF6B45979C2C}.Release|x86.ActiveCfg = Release|Any CPU
-		{8926376D-98AA-4530-A1D4-CF6B45979C2C}.Release|x86.Build.0 = Release|Any CPU
-		{A79298FC-C047-4C1E-9864-829AEDABE7BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A79298FC-C047-4C1E-9864-829AEDABE7BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A79298FC-C047-4C1E-9864-829AEDABE7BF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A79298FC-C047-4C1E-9864-829AEDABE7BF}.Debug|x64.Build.0 = Debug|Any CPU
-		{A79298FC-C047-4C1E-9864-829AEDABE7BF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A79298FC-C047-4C1E-9864-829AEDABE7BF}.Debug|x86.Build.0 = Debug|Any CPU
-		{A79298FC-C047-4C1E-9864-829AEDABE7BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A79298FC-C047-4C1E-9864-829AEDABE7BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A79298FC-C047-4C1E-9864-829AEDABE7BF}.Release|x64.ActiveCfg = Release|Any CPU
-		{A79298FC-C047-4C1E-9864-829AEDABE7BF}.Release|x64.Build.0 = Release|Any CPU
-		{A79298FC-C047-4C1E-9864-829AEDABE7BF}.Release|x86.ActiveCfg = Release|Any CPU
-		{A79298FC-C047-4C1E-9864-829AEDABE7BF}.Release|x86.Build.0 = Release|Any CPU
 		{1082AF19-6624-4CFA-92CD-F6AA2AE5B364}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1082AF19-6624-4CFA-92CD-F6AA2AE5B364}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1082AF19-6624-4CFA-92CD-F6AA2AE5B364}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -205,18 +149,42 @@ Global
 		{492D9D9D-09FB-4757-B486-E56322605113}.Release|x64.Build.0 = Release|Any CPU
 		{492D9D9D-09FB-4757-B486-E56322605113}.Release|x86.ActiveCfg = Release|Any CPU
 		{492D9D9D-09FB-4757-B486-E56322605113}.Release|x86.Build.0 = Release|Any CPU
-		{AE2EBC30-3252-44E5-87C1-46BD665E1498}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE2EBC30-3252-44E5-87C1-46BD665E1498}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE2EBC30-3252-44E5-87C1-46BD665E1498}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AE2EBC30-3252-44E5-87C1-46BD665E1498}.Debug|x64.Build.0 = Debug|Any CPU
-		{AE2EBC30-3252-44E5-87C1-46BD665E1498}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AE2EBC30-3252-44E5-87C1-46BD665E1498}.Debug|x86.Build.0 = Debug|Any CPU
-		{AE2EBC30-3252-44E5-87C1-46BD665E1498}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE2EBC30-3252-44E5-87C1-46BD665E1498}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE2EBC30-3252-44E5-87C1-46BD665E1498}.Release|x64.ActiveCfg = Release|Any CPU
-		{AE2EBC30-3252-44E5-87C1-46BD665E1498}.Release|x64.Build.0 = Release|Any CPU
-		{AE2EBC30-3252-44E5-87C1-46BD665E1498}.Release|x86.ActiveCfg = Release|Any CPU
-		{AE2EBC30-3252-44E5-87C1-46BD665E1498}.Release|x86.Build.0 = Release|Any CPU
+		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Debug|x64.Build.0 = Debug|Any CPU
+		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Debug|x86.Build.0 = Debug|Any CPU
+		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Release|x64.ActiveCfg = Release|Any CPU
+		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Release|x64.Build.0 = Release|Any CPU
+		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Release|x86.ActiveCfg = Release|Any CPU
+		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Release|x86.Build.0 = Release|Any CPU
+		{E411076A-B800-457D-A36D-06EC716B2663}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E411076A-B800-457D-A36D-06EC716B2663}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E411076A-B800-457D-A36D-06EC716B2663}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E411076A-B800-457D-A36D-06EC716B2663}.Debug|x64.Build.0 = Debug|Any CPU
+		{E411076A-B800-457D-A36D-06EC716B2663}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E411076A-B800-457D-A36D-06EC716B2663}.Debug|x86.Build.0 = Debug|Any CPU
+		{E411076A-B800-457D-A36D-06EC716B2663}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E411076A-B800-457D-A36D-06EC716B2663}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E411076A-B800-457D-A36D-06EC716B2663}.Release|x64.ActiveCfg = Release|Any CPU
+		{E411076A-B800-457D-A36D-06EC716B2663}.Release|x64.Build.0 = Release|Any CPU
+		{E411076A-B800-457D-A36D-06EC716B2663}.Release|x86.ActiveCfg = Release|Any CPU
+		{E411076A-B800-457D-A36D-06EC716B2663}.Release|x86.Build.0 = Release|Any CPU
+		{21A2F73C-A935-42B7-A487-3962718CE29F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21A2F73C-A935-42B7-A487-3962718CE29F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21A2F73C-A935-42B7-A487-3962718CE29F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{21A2F73C-A935-42B7-A487-3962718CE29F}.Debug|x64.Build.0 = Debug|Any CPU
+		{21A2F73C-A935-42B7-A487-3962718CE29F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{21A2F73C-A935-42B7-A487-3962718CE29F}.Debug|x86.Build.0 = Debug|Any CPU
+		{21A2F73C-A935-42B7-A487-3962718CE29F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21A2F73C-A935-42B7-A487-3962718CE29F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21A2F73C-A935-42B7-A487-3962718CE29F}.Release|x64.ActiveCfg = Release|Any CPU
+		{21A2F73C-A935-42B7-A487-3962718CE29F}.Release|x64.Build.0 = Release|Any CPU
+		{21A2F73C-A935-42B7-A487-3962718CE29F}.Release|x86.ActiveCfg = Release|Any CPU
+		{21A2F73C-A935-42B7-A487-3962718CE29F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -227,15 +195,13 @@ Global
 		{041131CD-3018-19B1-81B6-5DBEE2467FFB} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{DE4513D3-889B-5C52-8E9C-744C99AE7509} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{C109842F-01DA-64D4-DBF2-00C6449E459E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{9F66DBC1-55AB-40D4-B4C4-B707CB39E624} = {D885C55E-8E9B-4837-938D-15A919188607}
-		{EC8FBBC4-59C8-438C-AE16-1762C269B928} = {D885C55E-8E9B-4837-938D-15A919188607}
 		{5910FA29-5797-199C-985B-FC9FC473328E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{8926376D-98AA-4530-A1D4-CF6B45979C2C} = {7B755614-03A1-4EDB-8596-4CEDE942336E}
-		{A79298FC-C047-4C1E-9864-829AEDABE7BF} = {D885C55E-8E9B-4837-938D-15A919188607}
 		{1082AF19-6624-4CFA-92CD-F6AA2AE5B364} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{492D9D9D-09FB-4757-B486-E56322605113} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
-		{AE2EBC30-3252-44E5-87C1-46BD665E1498} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{B7A8A3FD-69EC-4156-8076-F33E98392601} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{E411076A-B800-457D-A36D-06EC716B2663} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{21A2F73C-A935-42B7-A487-3962718CE29F} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

Robot/App/Program.cs

@@ -1,69 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-using CommandLine;
-using NLog;
-
-namespace ET
-{
-    internal static class Program
-    {
-        private static void Main(string[] args)
-        {
-            AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
-            {
-                Log.Error(e.ExceptionObject.ToString());
-            };
-            
-            ETTask.ExceptionHandler += Log.Error;
-            
-            // 异步方法全部会回掉到主线程
-            SynchronizationContext.SetSynchronizationContext(ThreadSynchronizationContext.Instance);
-			
-            try
-            {		
-                Game.EventSystem.Add(typeof(Game).Assembly);
-                Game.EventSystem.Add(DllHelper.GetHotfixAssembly());
-				
-                ProtobufHelper.Init();
-                MongoRegister.Init();
-				
-                // 命令行参数
-                Options options = null;
-                Parser.Default.ParseArguments<Options>(args)
-                        .WithNotParsed(error => throw new Exception($"命令行格式错误!"))
-                        .WithParsed(o => { options = o; });
-
-                Options.Instance = options;
-
-                Log.ILog = new NLogger(Game.Options.AppType.ToString());
-                
-                LogManager.Configuration.Variables["appIdFormat"] = $"{Game.Options.Process:000000}";
-				
-                Log.Info($"server start........................ {Game.Scene.Id}");
-
-                Game.EventSystem.Publish(new EventType.AppStart());
-				
-                while (true)
-                {
-                    try
-                    {
-                        Thread.Sleep(1);
-                        Game.Update();
-                        Game.LateUpdate();
-                        Game.FrameFinish();
-                    }
-                    catch (Exception e)
-                    {
-                        Log.Error(e);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                Log.Error(e);
-            }
-        }
-    }
-}

Robot/App/Robot.App.csproj

@@ -1,41 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
-        <RootNamespace>ET</RootNamespace>
-        <AssemblyName>Robot</AssemblyName>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <OutputPath>../../Bin/</OutputPath>
-      <DefineConstants>TRACECOREAPP;NOT_UNITY</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <OutputPath>../../Bin/</OutputPath>
-      <DefineConstants>TRACECOREAPP;NOT_UNITY</DefineConstants>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Model\Robot.Model.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <None Include="..\..\Server\App\NLog.config">
-        <Link>NLog.config</Link>
-      </None>
-    </ItemGroup>
-
-    <ItemGroup>
-      <Content Include="..\..\Server\App\NLog.xsd">
-        <Link>NLog.xsd</Link>
-      </Content>
-    </ItemGroup>
-
-</Project>

Robot/Hotfix/AppStart_Init.cs

@@ -1,35 +0,0 @@
-namespace ET
-{
-    public class AppStart_Init: AEvent<EventType.AppStart>
-    {
-        protected override async ETTask Run(EventType.AppStart args)
-        {
-            Game.Scene.AddComponent<TimerComponent>();
-            Game.Scene.AddComponent<CoroutineLockComponent>();
-
-            // 加载配置
-            Game.Scene.AddComponent<ConfigComponent>();
-            await ConfigComponent.Instance.LoadAsync();
-            
-            Game.Scene.AddComponent<OpcodeTypeComponent>();
-            Game.Scene.AddComponent<MessageDispatcherComponent>();
-            Game.Scene.AddComponent<SessionStreamDispatcher>();
-            Game.Scene.AddComponent<NetThreadComponent>();
-            Game.Scene.AddComponent<ZoneSceneManagerComponent>();
-            Game.Scene.AddComponent<AIDispatcherComponent>();
-            Game.Scene.AddComponent<RobotCaseDispatcherComponent>();
-            Game.Scene.AddComponent<RobotCaseComponent>();
-            
-            var processScenes = StartSceneConfigCategory.Instance.GetByProcess(Game.Options.Process);
-            foreach (StartSceneConfig startConfig in processScenes)
-            {
-                await RobotSceneFactory.Create(Game.Scene, startConfig.Id, startConfig.InstanceId, startConfig.Zone, startConfig.Name, startConfig.Type, startConfig);
-            }
-            
-            if (Game.Options.Console == 1)
-            {
-                Game.Scene.AddComponent<ConsoleComponent>();
-            }
-        }
-    }
-}

Robot/Hotfix/Module/RobotCase/RobotCaseComponentSystem.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ET
-{
-    [ObjectSystem]
-    public class RobotCaseComponentAwakeSystem: AwakeSystem<RobotCaseComponent>
-    {
-        public override void Awake(RobotCaseComponent self)
-        {
-            RobotCaseComponent.Instance = self;
-        }
-    }
-
-    [ObjectSystem]
-    public class RobotCaseComponentDestroySystem: DestroySystem<RobotCaseComponent>
-    {
-        public override void Destroy(RobotCaseComponent self)
-        {
-            RobotCaseComponent.Instance = null;
-        }
-    }
-    
-    public static class RobotCaseComponentSystem
-    {
-        public static int GetN(this RobotCaseComponent self)
-        {
-            return ++self.N;
-        }
-        
-        public static async ETTask<RobotCase> New(this RobotCaseComponent self)
-        {
-            await ETTask.CompletedTask;
-            RobotCase robotCase = self.AddChild<RobotCase>();
-            return robotCase;
-        }
-    }
-}

Robot/Hotfix/Module/RobotCase/RobotCaseDispatcherComponentSystem.cs

@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ET
-{
-    [ObjectSystem]
-    public class RobotCaseDispatcherComponentAwakeSystem: AwakeSystem<RobotCaseDispatcherComponent>
-    {
-        public override void Awake(RobotCaseDispatcherComponent self)
-        {
-            RobotCaseDispatcherComponent.Instance = self;
-            self.Load();
-        }
-    }
-
-    [ObjectSystem]
-    public class RobotCaseDispatcherComponentLoadSystem: LoadSystem<RobotCaseDispatcherComponent>
-    {
-        public override void Load(RobotCaseDispatcherComponent self)
-        {
-            self.Load();
-        }
-    }
-    
-    public static class RobotCaseDispatcherComponentSystem
-    {
-        public static void Load(this RobotCaseDispatcherComponent self)
-        {
-            self.Dictionary.Clear();
-
-            HashSet<Type> types = Game.EventSystem.GetTypes(typeof(RobotCaseAttribute));
-
-            foreach (Type type in types)
-            {
-                object[] attrs = type.GetCustomAttributes(typeof(RobotCaseAttribute), false);
-                if (attrs.Length == 0)
-                {
-                    continue;
-                }
-                
-                RobotCaseAttribute attr = attrs[0] as RobotCaseAttribute;
-                if (attr == null)
-                {
-                    continue;
-                }
-                
-                IRobotCase robotCase = Activator.CreateInstance(type) as IRobotCase;
-                if (robotCase == null)
-                {
-                    Log.Error($"RobotCase handle {type.Name} 需要继承 IRobotCase");
-                    continue;
-                }
-                
-                self.Dictionary.Add(attr.CaseType, robotCase);
-            }
-        }
-        
-        public static async ETTask Run(this RobotCaseDispatcherComponent self, int caseType, string line)
-        {
-            if (!self.Dictionary.TryGetValue(caseType, out IRobotCase iRobotCase))
-            {
-                return;
-            }
-
-            try
-            {
-                using (RobotCase robotCase = await RobotCaseComponent.Instance.New())
-                {
-                    robotCase.CommandLine = line;
-                    await iRobotCase.Run(robotCase);
-                }
-            }
-            catch (Exception e)
-            {
-                Log.Error($"{self.DomainZone()} {e}");
-                RobotLog.Console($"RobotCase Error {caseType}:\n\t{e}");
-            }
-        }
-    }
-}

Robot/Hotfix/Module/RobotCase/RobotCaseSystem.cs

@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ET.Client
-{
-    public static class RobotCaseSystem
-    {
-        // 创建机器人，生命周期是RobotCase
-        public static async ETTask NewRobot(this RobotCase self, int count, List<Scene> scenes)
-        {
-            ETTask[] tasks = new ETTask[count];
-            for (int i = 0; i < count; ++i)
-            {
-                tasks[i] = self.NewRobot(scenes);
-            }
-
-            await ETTaskHelper.WaitAll(tasks);
-        }
-
-        private static async ETTask NewRobot(this RobotCase self, List<Scene> scenes)
-        {
-            try
-            {
-                scenes.Add(await self.NewRobot());
-            }
-            catch (Exception e)
-            {
-                Log.Error(e);
-            }
-        }
-
-        // 创建机器人，生命周期是RobotCase
-        public static async ETTask NewZoneRobot(this RobotCase self, int zone, int count, List<Scene> scenes)
-        {
-            ETTask[] tasks = new ETTask[count];
-            for (int i = 0; i < count; ++i)
-            {
-                tasks[i] = self.NewZoneRobot(zone + i, scenes);
-            }
-
-            await ETTaskHelper.WaitAll(tasks);
-        }
-
-        // 这个方法创建的是进程所属的机器人，建议使用RobotCase.NewRobot来创建
-        private static async ETTask NewZoneRobot(this RobotCase self, int zone, List<Scene> scenes)
-        {
-            try
-            {
-                scenes.Add(await self.NewRobot(zone));
-            }
-            catch (Exception e)
-            {
-                Log.Error(e);
-            }
-        }
-
-        public static async ETTask<Scene> NewRobot(this RobotCase self, int zone)
-        {
-            return await self.NewRobot(zone, $"Robot_{zone}");
-        }
-
-        public static async ETTask<Scene> NewRobot(this RobotCase self, int zone, string name)
-        {
-            Scene zoneScene = null;
-            try
-            {
-                zoneScene = SceneFactory.CreateZoneScene(zone, name, self);
-                await LoginHelper.Login(zoneScene, ConstValue.LoginAddress, zone.ToString(), zone.ToString());
-                await EnterMapHelper.EnterMapAsync(zoneScene);
-                Log.Debug($"create robot ok: {zone}");
-                return zoneScene;
-            }
-            catch (Exception e)
-            {
-                zoneScene?.Dispose();
-                throw new Exception($"RobotCase create robot fail, zone: {zone}", e);
-            }
-        }
-
-        private static async ETTask<Scene> NewRobot(this RobotCase self)
-        {
-            int zone = self.GetParent<RobotCaseComponent>().GetN();
-            Scene zoneScene = null;
-
-            try
-            {
-                zoneScene = SceneFactory.CreateZoneScene(zone, $"Robot_{zone}", self);
-                await LoginHelper.Login(zoneScene, ConstValue.LoginAddress, zone.ToString(), zone.ToString());
-                await EnterMapHelper.EnterMapAsync(zoneScene);
-                Log.Debug($"create robot ok: {zone}");
-                return zoneScene;
-            }
-            catch (Exception e)
-            {
-                zoneScene?.Dispose();
-                throw new Exception($"RobotCase create robot fail, zone: {zone}", e);
-            }
-        }
-    }
-}

Robot/Hotfix/Module/RobotCase/RobotConsoleHandler.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Reflection;
-
-namespace ET
-{
-    [ConsoleHandler(ConsoleMode.Robot)]
-    public class RobotConsoleHandler: IConsoleHandler
-    {
-        public async ETTask Run(ModeContex contex, string content)
-        {
-            string[] ss = content.Split(" ");
-            switch (ss[0])
-            {
-                case ConsoleMode.Robot:
-                    break;
-
-                case "Run":
-                {
-                    int caseType = int.Parse(ss[1]);
-
-                    try
-                    {
-                        RobotLog.Debug($"run case start: {caseType}");
-                        await RobotCaseDispatcherComponent.Instance.Run(caseType, content);
-                        RobotLog.Debug($"run case finish: {caseType}");
-                    }
-                    catch (Exception e)
-                    {
-                        RobotLog.Debug($"run case error: {caseType}\n{e}");
-                    }
-                    break;
-                }
-                case "RunAll":
-                {
-                    FieldInfo[] fieldInfos = typeof (RobotCaseType).GetFields();
-                    foreach (FieldInfo fieldInfo in fieldInfos)
-                    {
-                        int caseType = (int)fieldInfo.GetValue(null);
-                        if (caseType > RobotCaseType.MaxCaseType)
-                        {
-                            RobotLog.Debug($"case > {RobotCaseType.MaxCaseType}: {caseType}");
-                            break;
-                        }
-                        try
-                        {
-                            RobotLog.Debug($"run case start: {caseType}");
-                            await RobotCaseDispatcherComponent.Instance.Run(caseType, content);
-                            RobotLog.Debug($"---------run case finish: {caseType}");
-                        }
-                        catch (Exception e)
-                        {
-                            RobotLog.Debug($"run case error: {caseType}\n{e}");
-                            break;
-                        }
-                    }
-                    break;
-                }
-            }
-            await ETTask.CompletedTask;
-        }
-    }
-}

Robot/Hotfix/Robot.Hotfix.csproj

@@ -1,99 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <RootNamespace>ET</RootNamespace>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <OutputPath>../../Bin/</OutputPath>
-      <DefineConstants>TRACECOREAPP;NOT_UNITY</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <OutputPath>../../Bin/</OutputPath>
-      <DefineConstants>TRACECOREAPP;NOT_UNITY</DefineConstants>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Model\Robot.Model.csproj" />
-    </ItemGroup>
-    
-    <ItemGroup>
-        <Compile Include="..\..\Server\Hotfix\Demo\Session\InnerMessageDispatcherHelper.cs">
-          <Link>Server\Session\InnerMessageDispatcherHelper.cs</Link>
-        </Compile>
-        <Compile Include="..\..\Server\Hotfix\Demo\Session\SessionStreamDispatcherServerInner.cs">
-          <Link>Server\Session\SessionStreamDispatcherServerInner.cs</Link>
-        </Compile>
-        <Compile Include="..\..\Unity\Codes\Hotfix\Module\AI\**\*.cs">
-            <Link>Module\AI\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Hotfix\Module\Message\**\*.cs">
-            <Link>Module\Message\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Hotfix\Module\MessageOuter\**\*.cs">
-            <Link>Module\MessageOuter\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Hotfix\Module\Numeric\**\*.cs">
-            <Link>Module\Numeric\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Server\Hotfix\Module\Actor\**\*.cs">
-            <Link>Module\Actor\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Server\Hotfix\Module\Message\**\*.cs">
-            <Link>Module\Message\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Server\Hotfix\Module\MessageInner\**\*.cs">
-            <Link>Module\MessageInner\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-        
-        <Compile Include="..\..\Server\Hotfix\Module\NetworkTCP\**\*.cs">
-            <Link>Module\NetworkTCP\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Hotfix\Demo\**\*.cs"> 
-            <Link>Demo\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Hotfix\Core\**\*.cs">
-            <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Hotfix\Module\Config\**\*.cs">
-            <Link>Module\Config\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Hotfix\Module\Ping\**\*.cs">
-            <Link>Module\Ping\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Hotfix\Module\Recast\**\*.cs">
-            <Link>Module\Recast\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Server\Hotfix\Module\Console\**\*.cs">
-            <Link>Module\Console\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Server\Hotfix\Config\**\*.cs">
-            <Link>Config\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-    </ItemGroup>
-    
-    <ItemGroup>
-      <Folder Include="Server" />
-    </ItemGroup>
-
-</Project>

Robot/Hotfix/Robot/Case/RobotCase_FirstCase.cs

@@ -1,26 +0,0 @@
-using System;
-
-namespace ET
-{
-    [RobotCase(RobotCaseType.FirstCase)]
-    public class RobotCase_FirstCase: IRobotCase
-    {
-        public async ETTask Run(RobotCase robotCase)
-        {
-            using ListComponent<Scene> robots = ListComponent<Scene>.Create();
-            
-            // 创建了两个机器人，生命周期是RobotCase，RobotCase_FirstCase.Run执行结束，机器人就会删除
-            await robotCase.NewRobot(2, robots);
-
-            foreach (Scene robotScene in robots)
-            {
-                M2C_TestRobotCase response = await robotScene.GetComponent<SessionComponent>().Session.Call(new C2M_TestRobotCase() {N = robotScene.Zone}) as M2C_TestRobotCase;
-                if (response.N != robotScene.Zone)
-                {
-                    // 跟预期不一致就抛异常，外层会catch住在控制台上打印
-                    throw new Exception($"robot case: {RobotCaseType.FirstCase} run fail!");
-                }
-            }
-        }
-    }
-}

Robot/Hotfix/Robot/Console/CreateRobotConsoleHandler.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using CommandLine;
-using NLog;
-
-namespace ET
-{
-    [ConsoleHandler(ConsoleMode.CreateRobot)]
-    public class CreateRobotConsoleHandler: IConsoleHandler
-    {
-        public async ETTask Run(ModeContex contex, string content)
-        {
-            switch (content)
-            {
-                case ConsoleMode.CreateRobot:
-                    Log.Console("CreateRobot args error!");
-                    break;
-                default:
-                    CreateRobotArgs options = null;
-                    Parser.Default.ParseArguments<CreateRobotArgs>(content.Split(' '))
-                            .WithNotParsed(error => throw new Exception($"CreateRobotArgs error!"))
-                            .WithParsed(o => { options = o; });
-
-                    // 获取当前进程的RobotScene
-                    using (ListComponent<StartSceneConfig> thisProcessRobotScenes = ListComponent<StartSceneConfig>.Create())
-                    {
-                        List<StartSceneConfig> robotSceneConfigs = StartSceneConfigCategory.Instance.Robots;
-                        foreach (StartSceneConfig robotSceneConfig in robotSceneConfigs)
-                        {
-                            if (robotSceneConfig.Process != Game.Options.Process)
-                            {
-                                continue;
-                            }
-                            thisProcessRobotScenes.Add(robotSceneConfig);
-                        }
-                        
-                        // 创建机器人
-                        for (int i = 0; i < options.Num; ++i)
-                        {
-                            int index = i % thisProcessRobotScenes.Count;
-                            StartSceneConfig robotSceneConfig = thisProcessRobotScenes[index];
-                            Scene robotScene = Game.Scene.Get(robotSceneConfig.Id);
-                            RobotManagerComponent robotManagerComponent = robotScene.GetComponent<RobotManagerComponent>();
-                            Scene robot = await robotManagerComponent.NewRobot(Game.Options.Process * 10000 + i);
-                            robot.AddComponent<AIComponent, int>(1);
-                            Log.Console($"create robot {robot.Zone}");
-                            await TimerComponent.Instance.WaitAsync(2000);
-                        }
-                    }
-                    break;
-            }
-            contex.Parent.RemoveComponent<ModeContex>();
-            await ETTask.CompletedTask;
-        }
-    }
-}

Robot/Hotfix/Robot/RobotManagerComponentSystem.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Linq;
-
-namespace ET
-{
-    public static class RobotManagerComponentSystem
-    {
-        public static async ETTask<Scene> NewRobot(this RobotManagerComponent self, int zone)
-        {
-            Scene zoneScene = null;
-            try
-            {
-                zoneScene = SceneFactory.CreateZoneScene(zone, "Robot", self);
-                await LoginHelper.Login(zoneScene, ConstValue.LoginAddress, zone.ToString(), zone.ToString());
-                await EnterMapHelper.EnterMapAsync(zoneScene);
-                Log.Debug($"create robot ok: {zone}");
-                return zoneScene;
-            }
-            catch (Exception e)
-            {
-                zoneScene?.Dispose();
-                throw new Exception($"RobotSceneManagerComponent create robot fail, zone: {zone}", e);
-            }
-        }
-        
-        public static void RemoveAll(this RobotManagerComponent self)
-        {
-            foreach (Entity robot in self.Children.Values.ToArray())        
-            {
-                robot.Dispose();
-            }
-        }
-        
-        public static void Remove(this RobotManagerComponent self, long id)
-        {
-            self.GetChild<Scene>(id)?.Dispose();
-        }
-
-        public static void Clear(this RobotManagerComponent self)
-        {
-            foreach (Entity entity in self.Children.Values.ToArray())
-            {
-                entity.Dispose();
-            }
-        }
-    }
-}

Robot/Hotfix/Robot/Scene/RobotSceneFactory.cs

@@ -1,31 +0,0 @@
-namespace ET
-{
-    public static class RobotSceneFactory
-    {
-        public static async ETTask<Scene> Create(
-            Entity parent,
-            long id,
-            long instanceId,
-            int zone,
-            string name,
-            SceneType sceneType,
-            StartSceneConfig startSceneConfig = null
-        )
-        {
-            await ETTask.CompletedTask;
-            Log.Info($"create scene: {sceneType} {name} {zone}");
-            Scene scene = EntitySceneFactory.CreateScene(id, instanceId, zone, sceneType, name, parent);
-
-            scene.AddComponent<MailBoxComponent, MailboxType>(MailboxType.UnOrderMessageDispatcher);
-
-            switch (scene.SceneType)
-            {
-                case SceneType.Robot:
-                    scene.AddComponent<RobotManagerComponent>();
-                    break;
-            }
-
-            return scene;
-        }
-    }
-}

Robot/Model/Base/DllHelper.cs

@@ -1,16 +0,0 @@
-using System.IO;
-using System.Reflection;
-
-namespace ET
-{
-    public static class DllHelper
-    {
-        public static Assembly GetHotfixAssembly()
-        {
-            byte[] dllBytes = File.ReadAllBytes("./Robot.Hotfix.dll");
-            byte[] pdbBytes = File.ReadAllBytes("./Robot.Hotfix.pdb");
-            Assembly assembly = Assembly.Load(dllBytes, pdbBytes);
-            return assembly;
-        }
-    }
-}

Robot/Model/Module/RobotCase/IRobotCase.cs

@@ -1,7 +0,0 @@
-namespace ET
-{
-    public interface IRobotCase
-    {
-        ETTask Run(RobotCase robotCase);
-    }
-}

Robot/Model/Module/RobotCase/RobotCase.cs

@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-
-namespace ET
-{
-    public class RobotCase: Entity, IAwake
-    {
-        public ETCancellationToken CancellationToken;
-        public string CommandLine;
-    }
-}

Robot/Model/Module/RobotCase/RobotCaseAttribute.cs

@@ -1,14 +0,0 @@
-using System;
-
-namespace ET
-{
-    public class RobotCaseAttribute: BaseAttribute
-    {
-        public int CaseType { get; }
-
-        public RobotCaseAttribute(int caseType)
-        {
-            this.CaseType = caseType;
-        }
-    }
-}

Robot/Model/Module/RobotCase/RobotCaseComponent.cs

@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-
-namespace ET
-{
-    public class RobotCaseComponent: Entity, IAwake, IDestroy
-    {
-        public static RobotCaseComponent Instance;
-        public Dictionary<int, RobotCase> RobotCases = new Dictionary<int, RobotCase>();
-        public int N = 10000;
-    }
-}

Robot/Model/Module/RobotCase/RobotCaseDispatcherComponent.cs

@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-
-namespace ET
-{
-    public class RobotCaseDispatcherComponent: Entity, IAwake, ILoad
-    {
-        public static RobotCaseDispatcherComponent Instance;
-        
-        public Dictionary<int, IRobotCase> Dictionary = new Dictionary<int, IRobotCase>();
-    }
-}

Robot/Model/Module/RobotCase/RobotLog.cs

@@ -1,26 +0,0 @@
-using DnsClient.Internal;
-
-namespace ET
-{
-	public static class RobotLog
-	{
-		private static readonly ILog logger = new NLogger("RobotConsole");
-		
-		public static void Debug(string msg)
-		{
-			Log.Info(msg);
-			logger.Info(msg);
-		}
-		
-		public static void Debug(string msg, params object[] args)
-		{
-			Log.Info(msg);
-			logger.Info(msg, args);
-		}
-
-		public static void Console(string msg)
-		{
-			logger.Info(msg);
-		}
-	}
-}

Robot/Model/Robot.Model.csproj

@@ -1,124 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <RootNamespace>ET</RootNamespace>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> 
-        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <OutputPath>../../Bin/</OutputPath>
-      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <DefineConstants>TRACECOREAPP;NOT_UNITY</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <OutputPath>../../Bin/</OutputPath>
-      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <DefineConstants>TRACECOREAPP;NOT_UNITY</DefineConstants>
-    </PropertyGroup>
-    <ItemGroup>
-        <Compile Include="..\..\Server\Model\Base\MongoHelper.cs">
-          <Link>Base\MongoHelper.cs</Link>
-        </Compile>
-        <Compile Include="..\..\Server\Model\Base\MongoRegister.cs">
-          <Link>Base\MongoRegister.cs</Link>
-        </Compile>
-        <Compile Include="..\..\Server\Model\Base\StructBsonSerialize.cs">
-          <Link>Base\StructBsonSerialize.cs</Link>
-        </Compile>
-        <Compile Include="..\..\Unity\Codes\Model\Module\Config\**\*.cs">
-            <Link>Module\Config\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Model\Core\**\*.cs">
-            <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Assets\Mono\Core\**\*.cs"> 
-            <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Model\Module\AI\**\*.cs">
-            <Link>Module\AI\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Assets\Mono\Module\Network\**\*.cs">
-            <Link>Module\Network\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Assets\Mono\Module\NetworkTCP\**\*.cs">
-            <Link>Module\NetworkTCP\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Server\Model\Module\NetworkTCP\**\*.cs">
-            <Link>Module\NetworkTCP\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Server\Model\Module\MessageInner\**\*.cs">
-            <Link>Module\MessageInner\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Model\Module\Ping\**\*.cs">
-            <Link>Module\Ping\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Model\Module\Message\**\*.cs">
-            <Link>Module\Message\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Assets\Mono\Module\Message\**\*.cs">
-            <Link>Module\Message\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Server\Model\Module\Message\**\*.cs">
-            <Link>Module\Message\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Model\Module\Numeric\**\*.cs">
-            <Link>Module\Numeric\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Model\Module\Recast\**\*.cs">
-            <Link>Module\Recast\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Model\Demo\**\*.cs">
-            <Link>Demo\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Server\Model\Generate\**\*.cs">
-            <Link>Generate\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Server\Model\Module\Actor\**\*.cs">
-            <Link>Module\Actor\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Model\Module\Actor\**\*.cs">
-            <Link>Module\Actor\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Model\Module\ActorLocation\**\*.cs">
-            <Link>Module\ActorLocation\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Unity\Codes\Model\Module\CoroutineLock\**\*.cs">
-            <Link>Module\CoroutineLock\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-
-        <Compile Include="..\..\Server\Model\Module\Console\**\*.cs">
-            <Link>Module\Console\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-    </ItemGroup>
-    <ItemGroup>
-      <ProjectReference Include="..\..\ThirdParty\ETTask\ETTask.csproj" />
-      <ProjectReference Include="..\..\ThirdParty\ShareLib\ShareLib.csproj" />
-      <ProjectReference Include="..\..\ThirdParty\UnityEngine\UnityEngine.csproj" />
-    </ItemGroup>
-
-</Project>

Robot/Model/Robot/Console/CreateRobotArgs.cs

@@ -1,10 +0,0 @@
-using CommandLine;
-
-namespace ET
-{
-    public class CreateRobotArgs
-    {
-        [Option("Num", Required = false, Default = 1)]
-        public int Num { get; set; }
-    }
-}

Robot/Model/Robot/RobotCaseType.cs

@@ -1,9 +0,0 @@
-namespace ET
-{
-    public static class RobotCaseType
-    {
-        public const int FirstCase = 1;
-
-        public const int MaxCaseType = 10000;
-    }
-}

Robot/Model/Robot/RobotManagerComponent.cs

@@ -1,7 +0,0 @@
-namespace ET
-{
-    public class RobotManagerComponent: Entity, IAwake
-    {
-        
-    }
-}

ThirdParty/ETTask/ETTask.csproj

@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <Nullable>disable</Nullable>
-        <LangVersion>8</LangVersion>
-    </PropertyGroup>
-    
-    <PropertyGroup>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-    </PropertyGroup>
-    
-    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <DefineConstants>TRACE;NOT_UNITY</DefineConstants>
-      <OutputPath>..\..\Bin\</OutputPath>
-    </PropertyGroup>
-    
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <DefineConstants>TRACE;NOT_UNITY</DefineConstants>
-      <OutputPath>..\..\Bin\</OutputPath>
-    </PropertyGroup>
-
-    <ItemGroup>
-
-    <Compile Include="..\..\Unity\Assets\ThirdParty\ETTask\**\*.cs">
-        <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
-    </Compile>
-    </ItemGroup>
-
-</Project>

ThirdParty/UnityEngine/UnityEngine.csproj

@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <LangVersion>8</LangVersion>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <OutputPath>..\..\Bin\</OutputPath>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <OutputPath>..\..\Bin\</OutputPath>
-    </PropertyGroup>
-
-</Project>

ThirdParty/protobuf-net/protobuf-net.csproj

@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <RootNamespace>protobuf_net</RootNamespace>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <DefineConstants>TRACE;COREAPP;NOT_UNITY</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <DefineConstants>TRACECOREAPP;NOT_UNITY</DefineConstants>
-    </PropertyGroup>
-    
-    <ItemGroup>
-        <Compile Include="..\..\Unity\Assets\Mono\ThirdParty\protobuf-net\**\*.cs">
-            <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
-    </ItemGroup>
-
-</Project>

Unity/Assets/Editor/ServerCommandLineEditor/ServerCommandLineEditor.cs

@@ -8,7 +8,7 @@ namespace ET
         [MenuItem("Tools/启动单进程服务器(仅windows可用)")]
         public static void ShowWindow()
         {
-            string arguments = $"Apps.dll --Process=1 --Console=1";
+            string arguments = $"App.dll --Process=1 --Console=1";
             ProcessHelper.Run("dotnet.exe", arguments, "../Bin/");
         }
     }

Unity/Assets/Editor/ToolEditor/ToolsEditor.cs

@@ -8,9 +8,9 @@ namespace ET
         public static void ExcelExporter()
         {
 #if UNITY_EDITOR_OSX
-            const string tools = "./Tools";
+            const string tools = "./Tool";
 #else
-            const string tools = ".\\Tools.exe";
+            const string tools = ".\\Tool.exe";
 #endif
             ShellHelper.Run($"{tools} --AppType=ExcelExporter --Console=1", "../Bin/");
         }
@@ -19,9 +19,9 @@ namespace ET
         public static void Proto2CS()
         {
 #if UNITY_EDITOR_OSX
-            const string tools = "./Tools";
+            const string tools = "./Tool";
 #else
-            const string tools = ".\\Tools.exe";
+            const string tools = ".\\Tool.exe";
 #endif
             ShellHelper.Run($"{tools} --AppType=Proto2CS --Console=1", "../Bin/");
         }