把Proto2CS跟ExcelExporter工具也放到Package中

DotNet/App/ET.App.csproj

@@ -15,20 +15,19 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>DOTNET</DefineConstants>
-    <OutputPath>..\..\Bin\</OutputPath>
+    <OutputPath>$(SolutionDir)Bin</OutputPath>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Optimize>true</Optimize>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>DOTNET</DefineConstants>
-    <OutputPath>..\..\Bin\</OutputPath>
+    <OutputPath>$(SolutionDir)Bin</OutputPath>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Unity\Packages\cn.etetet.core\DotNet~\ET.Core.csproj" />
     <ProjectReference Include="..\..\Unity\Packages\cn.etetet.loader\DotNet~\ET.Loader.csproj" />
     <ProjectReference Include="..\..\Unity\Packages\cn.etetet.mathematics\DotNet~\ET.Mathematics.csproj" />
     <ProjectReference Include="..\..\Unity\Packages\cn.etetet.recast\DotNet~\ET.Recast.csproj" />

DotNet/Hotfix/ET.Hotfix.csproj

@@ -11,13 +11,13 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
         <DefineConstants>DOTNET</DefineConstants>
-        <OutputPath>..\..\Bin\</OutputPath> 
+        <OutputPath>$(SolutionDir)Bin</OutputPath> 
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <NoWarn>0169,0649,3021,8981,CS9193,CS9192</NoWarn>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
         <DefineConstants>DOTNET</DefineConstants>
-        <OutputPath>..\..\Bin\</OutputPath>
+        <OutputPath>$(SolutionDir)Bin</OutputPath>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <Optimize>false</Optimize>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -51,8 +51,6 @@
         
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\Share\Analyzer\ET.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-        <ProjectReference Include="..\..\Share\SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\Model\ET.Model.csproj" />
     </ItemGroup>
 

DotNet/Model/ET.Model.csproj

@@ -11,7 +11,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
         <DefineConstants>DOTNET</DefineConstants>
-        <OutputPath>..\..\Bin\</OutputPath> 
+        <OutputPath>$(SolutionDir)Bin</OutputPath> 
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <Optimize>false</Optimize>
@@ -19,7 +19,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> 
         <DefineConstants>DOTNET</DefineConstants>
-        <OutputPath>..\..\Bin\</OutputPath>
+        <OutputPath>$(SolutionDir)Bin</OutputPath>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <Optimize>true</Optimize>
@@ -53,9 +53,6 @@
         
     </ItemGroup> 
     <ItemGroup> 
-        <ProjectReference Include="..\..\Share\Analyzer\ET.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-        <ProjectReference Include="..\..\Share\SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-        <ProjectReference Include="..\..\Unity\Packages\cn.etetet.core\DotNet~\ET.Core.csproj" />
         <ProjectReference Include="..\..\Unity\Packages\cn.etetet.loader\DotNet~\ET.Loader.csproj" />
         <ProjectReference Include="..\..\Unity\Packages\cn.etetet.mathematics\DotNet~\ET.Mathematics.csproj" />
         <ProjectReference Include="..\..\Unity\Packages\cn.etetet.recast\DotNet~\ET.Recast.csproj" />

ET.sln

@@ -7,14 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unity", "Unity", "{914C77C9
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DotNet", "DotNet", "{46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Share", "Share", "{1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ET.Analyzer", "Share\Analyzer\ET.Analyzer.csproj", "{FCB2EF97-BA34-49F7-B859-68E1AC98877E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ET.Tool", "Share\Tool\ET.Tool.csproj", "{1D028A2B-515C-49E2-923B-094CBD89BE5A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.SourceGenerator", "Share\SourceGenerator\ET.SourceGenerator.csproj", "{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Core", "Unity\ET.Core.csproj", "{357275F9-23B5-ED06-A723-291680D452AA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Core.Editor", "Unity\ET.Core.Editor.csproj", "{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}"
@@ -47,14 +39,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.ReferenceCollector.Edito
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Recast", "Unity\ET.Recast.csproj", "{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Core", "Unity\Packages\cn.etetet.core\DotNet~\ET.Core.csproj", "{C1337B16-6582-44F3-94CD-C5EEB19586F7}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Loader", "Unity\Packages\cn.etetet.loader\DotNet~\ET.Loader.csproj", "{B37848EF-57A6-4F5F-B214-39B58069337D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Mathematics", "Unity\Packages\cn.etetet.mathematics\DotNet~\ET.Mathematics.csproj", "{56D2C26C-5980-4595-891C-FA4319E9C626}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Recast", "Unity\Packages\cn.etetet.recast\DotNet~\ET.Recast.csproj", "{F3F088C8-1811-426E-8A72-D07D6C6C68CE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Proto2CS", "Unity\Packages\cn.etetet.proto\DotNet~\ET.Proto2CS.csproj", "{554D108A-1857-4E49-8FB4-C7A2AB7F205D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.ExcelExporter", "Unity\Packages\cn.etetet.excel\DotNet~\ET.ExcelExporter.csproj", "{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Core", "Unity\Packages\cn.etetet.core\DotNet~\ET.Core\ET.Core.csproj", "{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Analyzer", "Unity\Packages\cn.etetet.core\DotNet~\ET.Analyzer\ET.Analyzer.csproj", "{D785575F-FDD1-45D9-AE3B-3810B7DE1541}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -65,42 +63,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|x64.Build.0 = Debug|Any CPU
-		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Debug|x86.Build.0 = Debug|Any CPU
-		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|x64.ActiveCfg = Release|Any CPU
-		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|x64.Build.0 = Release|Any CPU
-		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|x86.ActiveCfg = Release|Any CPU
-		{FCB2EF97-BA34-49F7-B859-68E1AC98877E}.Release|x86.Build.0 = Release|Any CPU
-		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Debug|x64.Build.0 = Debug|Any CPU
-		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Debug|x86.Build.0 = Debug|Any CPU
-		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|x64.ActiveCfg = Release|Any CPU
-		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|x64.Build.0 = Release|Any CPU
-		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|x86.ActiveCfg = Release|Any CPU
-		{1D028A2B-515C-49E2-923B-094CBD89BE5A}.Release|x86.Build.0 = Release|Any CPU
-		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Debug|x64.Build.0 = Debug|Any CPU
-		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Debug|x86.Build.0 = Debug|Any CPU
-		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Release|x64.ActiveCfg = Release|Any CPU
-		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Release|x64.Build.0 = Release|Any CPU
-		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Release|x86.Build.0 = Release|Any CPU
 		{357275F9-23B5-ED06-A723-291680D452AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{357275F9-23B5-ED06-A723-291680D452AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{357275F9-23B5-ED06-A723-291680D452AA}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -293,18 +255,6 @@ Global
 		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Release|x64.Build.0 = Debug|Any CPU
 		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Release|x86.ActiveCfg = Debug|Any CPU
 		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84}.Release|x86.Build.0 = Debug|Any CPU
-		{C1337B16-6582-44F3-94CD-C5EEB19586F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1337B16-6582-44F3-94CD-C5EEB19586F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1337B16-6582-44F3-94CD-C5EEB19586F7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C1337B16-6582-44F3-94CD-C5EEB19586F7}.Debug|x64.Build.0 = Debug|Any CPU
-		{C1337B16-6582-44F3-94CD-C5EEB19586F7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C1337B16-6582-44F3-94CD-C5EEB19586F7}.Debug|x86.Build.0 = Debug|Any CPU
-		{C1337B16-6582-44F3-94CD-C5EEB19586F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C1337B16-6582-44F3-94CD-C5EEB19586F7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C1337B16-6582-44F3-94CD-C5EEB19586F7}.Release|x64.ActiveCfg = Release|Any CPU
-		{C1337B16-6582-44F3-94CD-C5EEB19586F7}.Release|x64.Build.0 = Release|Any CPU
-		{C1337B16-6582-44F3-94CD-C5EEB19586F7}.Release|x86.ActiveCfg = Release|Any CPU
-		{C1337B16-6582-44F3-94CD-C5EEB19586F7}.Release|x86.Build.0 = Release|Any CPU
 		{B37848EF-57A6-4F5F-B214-39B58069337D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B37848EF-57A6-4F5F-B214-39B58069337D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B37848EF-57A6-4F5F-B214-39B58069337D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -341,14 +291,59 @@ Global
 		{F3F088C8-1811-426E-8A72-D07D6C6C68CE}.Release|x64.Build.0 = Release|Any CPU
 		{F3F088C8-1811-426E-8A72-D07D6C6C68CE}.Release|x86.ActiveCfg = Release|Any CPU
 		{F3F088C8-1811-426E-8A72-D07D6C6C68CE}.Release|x86.Build.0 = Release|Any CPU
+		{554D108A-1857-4E49-8FB4-C7A2AB7F205D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{554D108A-1857-4E49-8FB4-C7A2AB7F205D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{554D108A-1857-4E49-8FB4-C7A2AB7F205D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{554D108A-1857-4E49-8FB4-C7A2AB7F205D}.Debug|x64.Build.0 = Debug|Any CPU
+		{554D108A-1857-4E49-8FB4-C7A2AB7F205D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{554D108A-1857-4E49-8FB4-C7A2AB7F205D}.Debug|x86.Build.0 = Debug|Any CPU
+		{554D108A-1857-4E49-8FB4-C7A2AB7F205D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{554D108A-1857-4E49-8FB4-C7A2AB7F205D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{554D108A-1857-4E49-8FB4-C7A2AB7F205D}.Release|x64.ActiveCfg = Release|Any CPU
+		{554D108A-1857-4E49-8FB4-C7A2AB7F205D}.Release|x64.Build.0 = Release|Any CPU
+		{554D108A-1857-4E49-8FB4-C7A2AB7F205D}.Release|x86.ActiveCfg = Release|Any CPU
+		{554D108A-1857-4E49-8FB4-C7A2AB7F205D}.Release|x86.Build.0 = Release|Any CPU
+		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E}.Debug|x64.Build.0 = Debug|Any CPU
+		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E}.Debug|x86.Build.0 = Debug|Any CPU
+		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E}.Release|x64.ActiveCfg = Release|Any CPU
+		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E}.Release|x64.Build.0 = Release|Any CPU
+		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E}.Release|x86.ActiveCfg = Release|Any CPU
+		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E}.Release|x86.Build.0 = Release|Any CPU
+		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Debug|x64.Build.0 = Debug|Any CPU
+		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Debug|x86.Build.0 = Debug|Any CPU
+		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Release|x64.ActiveCfg = Release|Any CPU
+		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Release|x64.Build.0 = Release|Any CPU
+		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C}.Release|x86.Build.0 = Release|Any CPU
+		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Debug|x64.Build.0 = Debug|Any CPU
+		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Debug|x86.Build.0 = Debug|Any CPU
+		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Release|x64.ActiveCfg = Release|Any CPU
+		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Release|x64.Build.0 = Release|Any CPU
+		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Release|x86.ActiveCfg = Release|Any CPU
+		{D785575F-FDD1-45D9-AE3B-3810B7DE1541}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{FCB2EF97-BA34-49F7-B859-68E1AC98877E} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
-		{1D028A2B-515C-49E2-923B-094CBD89BE5A} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
-		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
 		{357275F9-23B5-ED06-A723-291680D452AA} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{7BE873E5-6C09-7F6F-D436-69F223C79329} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
@@ -365,10 +360,13 @@ Global
 		{C55BBBD3-5A75-B928-B610-9A305A10F7AD} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{C1337B16-6582-44F3-94CD-C5EEB19586F7} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{B37848EF-57A6-4F5F-B214-39B58069337D} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{56D2C26C-5980-4595-891C-FA4319E9C626} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{F3F088C8-1811-426E-8A72-D07D6C6C68CE} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{554D108A-1857-4E49-8FB4-C7A2AB7F205D} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{E19DDA46-2CB1-416D-8A2F-0A9CE4BF2C7E} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{EA6B85C1-8DBA-4C03-93E6-E899CCF0986C} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{D785575F-FDD1-45D9-AE3B-3810B7DE1541} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Share/PackageType.cs.meta → Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/PackageType.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e6c412793f002ac44bd3f76fce1e1372
+guid: 361cd10ce61f830469a82d6b828e9e6b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Share/Analyzer/ET.Analyzer.csproj → Unity/Packages/cn.etetet.core/DotNet~/ET.Analyzer/ET.Analyzer.csproj

@@ -16,15 +16,17 @@
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <NoWarn>1701;1702;RS2008</NoWarn>
+        <OutputPath>./obj</OutputPath>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <NoWarn>1701;1702;RS2008</NoWarn>
+        <OutputPath>./obj</OutputPath>
     </PropertyGroup>
 
     <ItemGroup>
-        <Compile Include="../../Unity/Packages/cn.etetet.core/Runtime/Helper/StringHashHelper.cs" />
+        <Compile Include="../../Runtime/Helper/StringHashHelper.cs" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" PrivateAssets="all" />

Unity/Packages/cn.etetet.core/DotNet~/ET.Core.csproj → Unity/Packages/cn.etetet.core/DotNet~/ET.Core/ET.Core.csproj

@@ -16,7 +16,7 @@
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
       <DefineConstants>DOTNET</DefineConstants>
-      <OutputPath>./obj</OutputPath>
+      <OutputPath>$(SolutionDir)Bin</OutputPath>
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
       <Optimize>false</Optimize>
       <NoWarn>0169,0649,3021,8981,CS9193,CS9192,NU1903</NoWarn>
@@ -25,22 +25,17 @@
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">  
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks> 
       <DefineConstants>DOTNET</DefineConstants>
-      <OutputPath>./obj</OutputPath>
+      <OutputPath>$(SolutionDir)Bin</OutputPath>
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
       <NoWarn>0169,0649,3021,8981,CS9193,CS9192,NU1903</NoWarn>
     </PropertyGroup>
-    
+
     <ItemGroup>
-        <Compile Include="../Runtime/**/*.cs" xmlns="">
+        <Compile Include="../../Runtime/**/*.cs" xmlns="">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
     </ItemGroup>
     
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\..\Share\Analyzer\ET.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" /> 
-      <ProjectReference Include="..\..\..\..\Share\SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.9.1" />
         <PackageReference Include="MemoryPack" Version="1.21.1" />

Share/SourceGenerator/ET.SourceGenerator.csproj → Unity/Packages/cn.etetet.core/DotNet~/ET.SourceGenerator/ET.SourceGenerator.csproj

@@ -14,12 +14,20 @@
         <RootNamespace>ET</RootNamespace>
     </PropertyGroup>
 
+    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+      <OutputPath>../../Plugins</OutputPath>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+      <OutputPath>../../Plugins</OutputPath>
+    </PropertyGroup>
+
     <ItemGroup>
         <Compile Include="../Analyzer/Extension/*.cs">
             <Link>Extension\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
         <Compile Include="../Analyzer/Config/Definition.cs" />
-        <Compile Include="../../Unity/Packages/cn.etetet.core/Runtime/Helper/StringHashHelper.cs" />
+        <Compile Include="../../Runtime/Helper/StringHashHelper.cs" />
         <Compile Include="../Analyzer/Config/AnalyzeAssembly.cs" />
     </ItemGroup>
 

Share/Tool/ET.Tool.csproj → Unity/Packages/cn.etetet.excel/DotNet~/ET.ExcelExporter.csproj

@@ -8,7 +8,7 @@
         <RootNamespace>ET</RootNamespace>
         <LangVersion>12</LangVersion>
         <PackageId>Apps.Tool</PackageId>
-        <AssemblyName>Tool</AssemblyName>
+        <AssemblyName>ET.ExcelExporter</AssemblyName>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -17,30 +17,30 @@
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <OutputPath>..\..\Bin\</OutputPath>
+      <OutputPath>$(SolutionDir)Bin</OutputPath>
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
       <DefineConstants>DOTNET</DefineConstants>
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <OutputPath>..\..\Bin\</OutputPath>
+      <OutputPath>$(SolutionDir)Bin</OutputPath>
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
       <DefineConstants>DOTNET</DefineConstants>
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
     
     <ItemGroup>        
-        <Compile Include="..\..\Unity\Packages\cn.etetet.core\Runtime\Model\Share\Module\Config\**\*.cs">
+        <Compile Include="..\..\cn.etetet.core\Runtime\Model\Share\Module\Config\**\*.cs">
             <Link>Module\Config\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Packages\cn.etetet.core\Runtime\Model\Share\Module\Log\**\*.cs">
+        <Compile Include="..\..\cn.etetet.core\Runtime\Model\Share\Module\Log\**\*.cs">
             <Link>Module\Log\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Packages\cn.etetet.core\Runtime\Network\OpcodeRangeDefine.cs">
-            <Link>Module\Message\OpcodeRangeDefine.cs</Link>
+        <Compile Include="..\..\cn.etetet.core\Runtime\Network\OpcodeRangeDefine.cs">
+          <Link>OpcodeRangeDefine.cs</Link>
         </Compile>
     </ItemGroup>
     
@@ -50,14 +50,14 @@
       </None>
     </ItemGroup>
     
-    <ItemGroup>
-      <ProjectReference Include="..\..\Unity\Packages\cn.etetet.core\DotNet~\ET.Core.csproj" />
-    </ItemGroup>
-    
     <ItemGroup>
       <PackageReference Include="EPPlus" Version="7.1.2" />
       <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
       <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
     </ItemGroup>
+    
+    <ItemGroup>
+      <ProjectReference Include="..\..\cn.etetet.core\DotNet~\ET.Core\ET.Core.csproj" />
+    </ItemGroup>
 
 </Project>

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

@@ -11,22 +11,19 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
         <DefineConstants>DOTNET</DefineConstants>
-        <OutputPath>./obj</OutputPath> 
+        <OutputPath>$(SolutionDir)Bin</OutputPath> 
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <Optimize>false</Optimize>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> 
         <DefineConstants>DOTNET</DefineConstants>
-        <OutputPath>./obj</OutputPath>
+        <OutputPath>$(SolutionDir)Bin</OutputPath>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <Optimize>true</Optimize>
     </PropertyGroup>
-    
     <ItemGroup>
-      <ProjectReference Include="..\..\..\..\Share\Analyzer\ET.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" /> 
-      <ProjectReference Include="..\..\..\..\Share\SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-      <ProjectReference Include="..\..\cn.etetet.core\DotNet~\ET.Core.csproj" />
+      <ProjectReference Include="..\..\cn.etetet.core\DotNet~\ET.Core\ET.Core.csproj" />
     </ItemGroup>
 </Project>

Unity/Packages/cn.etetet.loader/Editor/AssetPostProcessor/OnGenerateCSProjectProcessor.cs

@@ -74,7 +74,7 @@ namespace ET
             {
                 XmlElement itemGroup = newDoc.CreateElement("ItemGroup", newDoc.DocumentElement.NamespaceURI);
                 var projectReference = newDoc.CreateElement("ProjectReference", newDoc.DocumentElement.NamespaceURI);
-                projectReference.SetAttribute("Include", @"..\Share\Analyzer\ET.Analyzer.csproj");
+                projectReference.SetAttribute("Include", @"$(SolutionDir)Unity\Packages\cn.etetet.core\DotNet~\ET.Analyzer\ET.Analyzer.csproj");
                 projectReference.SetAttribute("OutputItemType", @"Analyzer");
                 projectReference.SetAttribute("ReferenceOutputAssembly", @"false");
 

Unity/Packages/cn.etetet.mathematics/DotNet~/ET.Mathematics.csproj

@@ -15,7 +15,7 @@
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
         <DefineConstants>DOTNET;UNITY_DOTSPLAYER</DefineConstants>
-        <OutputPath>./obj</OutputPath>
+        <OutputPath>$(SolutionDir)Bin</OutputPath>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <Optimize>true</Optimize>
@@ -24,7 +24,7 @@
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
         <DefineConstants>DOTNET;UNITY_DOTSPLAYER</DefineConstants>
-        <OutputPath>./obj</OutputPath>
+        <OutputPath>$(SolutionDir)Bin</OutputPath>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <NoWarn>0169,0649,3021,8981,NU1903</NoWarn>

Unity/Packages/cn.etetet.proto/DotNet~/ET.Proto2CS.csproj

@@ -0,0 +1,57 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>false</ImplicitUsings>
+        <Nullable>disable</Nullable>
+        <RootNamespace>ET</RootNamespace>
+        <LangVersion>12</LangVersion>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+      <OutputPath>$(SolutionDir)Bin</OutputPath>
+      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+      <DefineConstants>DOTNET</DefineConstants>
+      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+      <OutputPath>$(SolutionDir)Bin</OutputPath>
+      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+      <DefineConstants>DOTNET</DefineConstants>
+      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    </PropertyGroup>
+    
+    <ItemGroup>        
+        <Compile Include="..\..\cn.etetet.core\Runtime\Model\Share\Module\Config\**\*.cs">
+            <Link>Module\Config\%(RecursiveDir)%(FileName)%(Extension)</Link>
+        </Compile>
+
+        <Compile Include="..\..\cn.etetet.core\Runtime\Model\Share\Module\Log\**\*.cs">
+            <Link>Module\Log\%(RecursiveDir)%(FileName)%(Extension)</Link>
+        </Compile>
+    </ItemGroup>
+    
+    <ItemGroup>
+      <None Update="Template.txt">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
+    
+    <ItemGroup>
+      <PackageReference Include="EPPlus" Version="7.1.2" />
+      <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
+      <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+    </ItemGroup>
+    
+    <ItemGroup>
+      <ProjectReference Include="..\..\cn.etetet.core\DotNet~\ET.Core\ET.Core.csproj" />
+    </ItemGroup>
+
+</Project>

Unity/Packages/cn.etetet.proto/DotNet~/Init.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Threading;
+using CommandLine;
+
+namespace ET
+{
+    public class ToolScene: IScene
+    {
+        public Fiber Fiber { get; set; }
+
+        public int SceneType
+        {
+            get;
+            set;
+        }
+
+        public ToolScene()
+        {
+        }
+
+        public ToolScene(int sceneType)
+        {
+            this.SceneType = sceneType;
+        }
+    }
+    
+    public struct ToolEvent
+    {
+    }
+    
+    internal static class Init
+    {
+        private static int Main(string[] args)
+        {
+            AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
+            {
+                Log.Error(e.ExceptionObject.ToString());
+            };
+            
+            try
+            {
+                // 命令行参数
+                Parser.Default.ParseArguments<Options>(args)
+                    .WithNotParsed(error => throw new Exception($"命令行格式错误! {error}"))
+                    .WithParsed((o)=>World.Instance.AddSingleton(o));
+                
+                World.Instance.AddSingleton<Logger>().Log = new NLogger(Options.Instance.SceneName, Options.Instance.Process, 0);
+                
+                World.Instance.AddSingleton<CodeTypes, Assembly[]>([typeof (Init).Assembly]);
+                World.Instance.AddSingleton<EventSystem>();
+                World.Instance.AddSingleton<SceneTypeSingleton, Type>(typeof(SceneType));
+                
+                // 强制调用一下mongo，避免mongo库被裁剪
+                MongoHelper.ToJson(1);
+                
+                ETTask.ExceptionHandler += Log.Error;
+
+                int sceneType = SceneTypeSingleton.Instance.GetSceneType(Options.Instance.SceneName);
+
+                ToolScene scene = new(sceneType);
+                EventSystem.Instance.Publish(scene, new ToolEvent());
+                
+                Log.Console($"{Options.Instance.SceneName} run finish!");
+            }
+            catch (Exception e)
+            {
+                Log.Console(e.ToString());
+            }
+            return 1;
+        }
+    }
+}

Unity/Packages/cn.etetet.proto/DotNet~/SceneType.cs

@@ -0,0 +1,8 @@
+namespace ET
+{
+    [UniqueId]
+    public static partial class SceneType
+    {
+        public const int All = 0;
+    }
+}

Unity/Packages/cn.etetet.proto/DotNet~/Template.txt

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using MongoDB.Bson.Serialization.Attributes;
+using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
+
+namespace (ns)
+{
+    [Config]
+    public partial class (ConfigName)Category : Singleton<(ConfigName)Category>, IMerge
+    {
+        [BsonElement]
+        [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
+        private Dictionary<int, (ConfigName)> dict = new();
+		
+        public void Merge(object o)
+        {
+            (ConfigName)Category s = o as (ConfigName)Category;
+            foreach (var kv in s.dict)
+            {
+                this.dict.Add(kv.Key, kv.Value);
+            }
+        }
+		
+        public (ConfigName) Get(int id)
+        {
+            this.dict.TryGetValue(id, out (ConfigName) item);
+
+            if (item == null)
+            {
+                throw new Exception($"配置找不到，配置表名: {nameof ((ConfigName))}，配置id: {id}");
+            }
+
+            return item;
+        }
+		
+        public bool Contain(int id)
+        {
+            return this.dict.ContainsKey(id);
+        }
+
+        public Dictionary<int, (ConfigName)> GetAll()
+        {
+            return this.dict;
+        }
+
+        public (ConfigName) GetOne()
+        {
+            if (this.dict == null || this.dict.Count <= 0)
+            {
+                return null;
+            }
+            
+            var enumerator = this.dict.Values.GetEnumerator();
+            enumerator.MoveNext();
+            return enumerator.Current; 
+        }
+    }
+
+	public partial class (ConfigName): ProtoObject, IConfig
+	{
+(Fields)
+	}
+}

Unity/Packages/cn.etetet.recast/DotNet~/ET.Recast.csproj

@@ -15,7 +15,7 @@
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
         <DefineConstants>DOTNET</DefineConstants>
-        <OutputPath>./obj</OutputPath>
+        <OutputPath>$(SolutionDir)Bin</OutputPath>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <Optimize>true</Optimize>
@@ -24,7 +24,7 @@
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
         <DefineConstants>DOTNET</DefineConstants>
-        <OutputPath>./obj</OutputPath>
+        <OutputPath>$(SolutionDir)Bin</OutputPath>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <NoWarn>0169,0649,3021,8981,NU1903</NoWarn>

Unity/Packages/cn.etetet.yooassets/Scripts/Model.meta

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