Proto2CS跟ExcelExporter导出路径变化

.gitignore

@@ -51,4 +51,5 @@ obj/
 Publish/
 */Temp/
 */TestResults/
-Generate
+Unity/Assets/Generate/Model/Proto*
+Unity/Assets/Generate/Model/Excel*

DotNet/Hotfix/ET.Hotfix.csproj

@@ -25,27 +25,27 @@
     </PropertyGroup>
     <ItemGroup>
 
-        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Runtime~\Hotfix\Share\**\*.cs">
+        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Scripts\Hotfix\Share\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Runtime~\Hotfix\Server\**\*.cs">
+        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Scripts\Hotfix\Server\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Runtime~\CodeMode\Server\Hotfix\**\*.cs">
+        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Scripts\CodeMode\Server\Hotfix\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Packages\com.et.*\Runtime~\Hotfix\Share\**\*.cs">
+        <Compile Include="..\..\Unity\Packages\com.et.*\Scripts\Hotfix\Share\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Packages\com.et.*\Runtime~\Hotfix\Server\**\*.cs">
+        <Compile Include="..\..\Unity\Packages\com.et.*\Scripts\Hotfix\Server\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Packages\com.et.*\Runtime~\CodeMode\Server\Hotfix\**\*.cs">
+        <Compile Include="..\..\Unity\Packages\com.et.*\Scripts\CodeMode\Server\Hotfix\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
         

DotNet/Model/ET.Model.csproj

@@ -27,31 +27,31 @@
     </PropertyGroup>
     <ItemGroup>
 
-        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Runtime~\Model\Share\**\*.cs">
+        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Scripts\Model\Share\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Runtime~\Model\Server\**\*.cs">
+        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Scripts\Model\Server\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Runtime~\Model\CodeMode\Server\**\*.cs">
+        <Compile Include="..\..\Unity\Library\PackageCache\com.et.*\Scripts\Model\CodeMode\Server\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Packages\com.et.*\Runtime~\Model\Share\**\*.cs">
+        <Compile Include="..\..\Unity\Packages\com.et.*\Scripts\Model\Share\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Packages\com.et.*\Runtime~\Model\Server\**\*.cs">
+        <Compile Include="..\..\Unity\Packages\com.et.*\Scripts\Model\Server\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Packages\com.et.*\Runtime~\Model\CodeMode\Server\**\*.cs">
+        <Compile Include="..\..\Unity\Packages\com.et.*\Scripts\Model\CodeMode\Server\**\*.cs">
             <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Generate\*\Model\Server\**\*.cs">
+        <Compile Include="..\..\Unity\Assets\Generate\Model\*\Server\**\*.cs">
             <Link>Generate\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
         
@@ -61,7 +61,7 @@
         <ProjectReference Include="..\..\Share\SourceGenerator\ET.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <ProjectReference Include="..\..\Unity\Packages\com.et.core\DotNet~\ET.Core.csproj" />
         <ProjectReference Include="..\..\Unity\Packages\com.et.loader\DotNet~\ET.Loader.csproj" />
-        <ProjectReference Include="..\..\Unity\Packages\com.et.mathematics\Runtime~\ET.Mathematics.csproj" />
+        <ProjectReference Include="..\..\Unity\Packages\com.et.mathematics\DotNet~\ET.Mathematics.csproj" />
         <ProjectReference Include="..\..\Unity\Packages\com.et.recast\DotNet~\ET.Recast.csproj" />
     </ItemGroup> 
 </Project>

ET.sln

@@ -33,8 +33,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.HotfixView", "Unity\ET.H
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.ModelView", "Unity\ET.ModelView.csproj", "{18FC8021-2861-97B8-C06F-E793AD2027C2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Mathematics", "Unity\Packages\com.et.mathematics\Runtime~\ET.Mathematics.csproj", "{B904B17F-4D71-4634-A0A5-B12C44BB2BC2}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Model", "DotNet\Model\ET.Model.csproj", "{A3B427C3-E901-4EF6-A426-8CB34E92BF67}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Hotfix", "DotNet\Hotfix\ET.Hotfix.csproj", "{0E8D3530-AE38-4302-B8A8-384BD85EE4DF}"
@@ -55,6 +53,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Recast", "Unity\Packages
 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.Mathematics", "Unity\Packages\com.et.mathematics\DotNet~\ET.Mathematics.csproj", "{366259B3-07A4-4A73-98EF-69E9934BE258}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -209,18 +209,6 @@ Global
 		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Release|x64.Build.0 = Debug|Any CPU
 		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Release|x86.ActiveCfg = Debug|Any CPU
 		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Release|x86.Build.0 = Debug|Any CPU
-		{B904B17F-4D71-4634-A0A5-B12C44BB2BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B904B17F-4D71-4634-A0A5-B12C44BB2BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B904B17F-4D71-4634-A0A5-B12C44BB2BC2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B904B17F-4D71-4634-A0A5-B12C44BB2BC2}.Debug|x64.Build.0 = Debug|Any CPU
-		{B904B17F-4D71-4634-A0A5-B12C44BB2BC2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B904B17F-4D71-4634-A0A5-B12C44BB2BC2}.Debug|x86.Build.0 = Debug|Any CPU
-		{B904B17F-4D71-4634-A0A5-B12C44BB2BC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B904B17F-4D71-4634-A0A5-B12C44BB2BC2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B904B17F-4D71-4634-A0A5-B12C44BB2BC2}.Release|x64.ActiveCfg = Release|Any CPU
-		{B904B17F-4D71-4634-A0A5-B12C44BB2BC2}.Release|x64.Build.0 = Release|Any CPU
-		{B904B17F-4D71-4634-A0A5-B12C44BB2BC2}.Release|x86.ActiveCfg = Release|Any CPU
-		{B904B17F-4D71-4634-A0A5-B12C44BB2BC2}.Release|x86.Build.0 = Release|Any CPU
 		{A3B427C3-E901-4EF6-A426-8CB34E92BF67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A3B427C3-E901-4EF6-A426-8CB34E92BF67}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3B427C3-E901-4EF6-A426-8CB34E92BF67}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -341,6 +329,18 @@ 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
+		{366259B3-07A4-4A73-98EF-69E9934BE258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{366259B3-07A4-4A73-98EF-69E9934BE258}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{366259B3-07A4-4A73-98EF-69E9934BE258}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{366259B3-07A4-4A73-98EF-69E9934BE258}.Debug|x64.Build.0 = Debug|Any CPU
+		{366259B3-07A4-4A73-98EF-69E9934BE258}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{366259B3-07A4-4A73-98EF-69E9934BE258}.Debug|x86.Build.0 = Debug|Any CPU
+		{366259B3-07A4-4A73-98EF-69E9934BE258}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{366259B3-07A4-4A73-98EF-69E9934BE258}.Release|Any CPU.Build.0 = Release|Any CPU
+		{366259B3-07A4-4A73-98EF-69E9934BE258}.Release|x64.ActiveCfg = Release|Any CPU
+		{366259B3-07A4-4A73-98EF-69E9934BE258}.Release|x64.Build.0 = Release|Any CPU
+		{366259B3-07A4-4A73-98EF-69E9934BE258}.Release|x86.ActiveCfg = Release|Any CPU
+		{366259B3-07A4-4A73-98EF-69E9934BE258}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -358,7 +358,6 @@ Global
 		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{18FC8021-2861-97B8-C06F-E793AD2027C2} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{B904B17F-4D71-4634-A0A5-B12C44BB2BC2} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{A3B427C3-E901-4EF6-A426-8CB34E92BF67} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{0E8D3530-AE38-4302-B8A8-384BD85EE4DF} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{CE23DAC2-A1EF-4AF3-878E-C507D252276D} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
@@ -369,6 +368,7 @@ Global
 		{82C48630-1CEC-CB9E-32EA-1BA4C0154BAC} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{1E8489A3-7ED7-4E2A-BA52-440765375987} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{0B63817C-6FF8-51DC-EF76-4D88CBE5CF84} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{366259B3-07A4-4A73-98EF-69E9934BE258} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

Share/Tool/ExcelExporter/ExcelExporter.cs

@@ -56,11 +56,11 @@ namespace ET
     {
         private static string template;
 
-        private const string ClientClassDir = "../Generate/Excel/Model/Client/";
+        private const string ClientClassDir = "../Unity/Assets/Generate/Model/Excel/Client/";
         // 服务端因为机器人的存在必须包含客户端所有配置，所以单独的c字段没有意义,单独的c就表示cs
-        private const string ServerClassDir = "../Generate/Excel/Model/Server/";
+        private const string ServerClassDir = "../Unity/Assets/Generate/Model/Excel/Server/";
 
-        private const string CSClassDir = "../Generate/Excel/Model/ClientServer/";
+        private const string CSClassDir = "../Unity/Assets/Generate/Model/Excel/ClientServer/";
 
         private const string jsonDir = "../Config/Json/{0}/{1}/";
 
@@ -104,9 +104,9 @@ namespace ET
                 template = File.ReadAllText("Template.txt");
                 ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
                 
-                if (Directory.Exists("../Generate/Excel"))
+                if (Directory.Exists("../Generate/Model/Excel"))
                 {
-                    Directory.Delete("../Generate/Excel", true);
+                    Directory.Delete("../Generate/Model/Excel", true);
                 }
 
                 if (!Directory.Exists(ClientClassDir))

Share/Tool/Proto2CS/Proto2CS.cs

@@ -22,9 +22,9 @@ namespace ET
 
     public static partial class InnerProto2CS
     {
-        private const string clientMessagePath = "../Generate/Proto/Model/Client/";
-        private const string serverMessagePath = "../Generate/Proto/Model/Server/";
-        private const string clientServerMessagePath = "../Generate/Proto/Model/ClientServer/";
+        private const string clientMessagePath = "../Unity/Assets/Generate/Model/Proto/Client/";
+        private const string serverMessagePath = "../Unity/Assets/Generate/Model/Proto/Server/";
+        private const string clientServerMessagePath = "../Unity/Assets/Generate/Model/Proto/ClientServer/";
         private static readonly char[] splitChars = [' ', '\t'];
         private static readonly List<OpcodeInfo> msgOpcode = [];
 
@@ -32,9 +32,9 @@ namespace ET
         {
             msgOpcode.Clear();
 
-            if (Directory.Exists("../Generate/Proto"))
+            if (Directory.Exists("../Generate/Model/Proto"))
             {
-                Directory.Delete("../Generate/Proto", true);
+                Directory.Delete("../Generate/Model/Proto", true);
             }
 
             System.Collections.Generic.List<(string, string)> list = new ();

Unity/Packages/com.et.mathematics/Scripts.meta → Unity/Assets/Generate/Hotfix.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4dd68b4fff2bd66468f13c27faf2a52a
+guid: 83774c921b5eb674e9ea04bc07a258c6
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Generate/Hotfix/AssemblyReference.asmref

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

Unity/Assets/Generate/Hotfix/AssemblyReference.asmref.meta

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

Unity/Assets/Bundles/Config/UnitConfigCategory.bytes.meta → Unity/Assets/Generate/HotfixView.meta

@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: 4c54687c04c629d488376e5ef067ef18
-TextScriptImporter:
+guid: 35b8d94a6dea9434b9f2504bd0e67169
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Unity/Assets/Generate/HotfixView/AssemblyReference.asmref

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

Unity/Assets/Generate/HotfixView/AssemblyReference.asmref.meta

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

Unity/Assets/Generate/Model.meta

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

Unity/Assets/Generate/Model/AssemblyReference.asmref

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

Unity/Assets/Generate/Model/AssemblyReference.asmref.meta

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

Unity/Assets/Generate/ModelView.meta

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

Unity/Assets/Generate/ModelView/AssemblyReference.asmref

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

Unity/Assets/Generate/ModelView/AssemblyReference.asmref.meta

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

Unity/Assets/Scripts/ModelView/ET.ModelView.asmdef

@@ -7,7 +7,8 @@
         "ET.Loader",
         "ET.Model",
         "YooAsset",
-        "ET.UI"
+        "ET.UI",
+        "ET.ReferenceCollector"
     ],
     "includePlatforms": [
         "Editor"

Unity/Packages/com.et.core/Editor/AsmdefEditor/AsmdefEditor.cs

@@ -56,7 +56,7 @@ namespace ET.Loader
                 {
                     foreach (string assName in AssNames)
                     {
-                        string p = Path.Combine(directory, "Runtime~/" + assName + "/ET." + assName + ".asmdef");
+                        string p = Path.Combine(directory, "Scripts/" + assName + "/asmdef.txt");
                         if (!File.Exists(p))
                         {
                             continue;