[更新]导表工具更新文件组织方式、删除protobuf编译配置内嵌在exe中

LiuMir · Dec 3, 2021 · ff270bc · ff270bc
1 parent 3b72b5d
commit ff270bc
Show file tree

Hide file tree

Showing 30 changed files with 35 additions and 36 deletions.
diff --git a/HelperTools/ExcelToProtobuf/BuildProtos.bat b/HelperTools/ExcelToProtobuf/BuildProtos.bat
@@ -16,4 +16,4 @@ for /r %%i in (*.proto) do (
 echo.
 echo .proto文件转.cs文件结束
 echo.
-pause
+exit
diff --git a/HelperTools/ExcelToProtobuf/Common.cs b/HelperTools/ExcelToProtobuf/Common.cs
@@ -18,19 +18,19 @@ public static string GetPbFieldName(string str)
         // 转换路径 -> dataFileDirPath posDataFileDirPath lawsDataFileDirPath
         public static void ParsePath(string[] pathLists)
         {
-            if (pathLists.Length >= 6 && pathLists[5].Length >  0)
+            if (pathLists.Length >= 5 && pathLists[4].Length >  0)
             {
-                dataFileDirPath = pathLists[5];
+                dataFileDirPath = pathLists[4];
             }
 
-            if (pathLists.Length >= 7 && pathLists[6].Length > 0)
+            if (pathLists.Length >= 6 && pathLists[5].Length > 0)
             {
-                posDataFileDirPath = pathLists[6];
+                posDataFileDirPath = pathLists[5];
             }
 
-            if (pathLists.Length >= 8 && pathLists[7].Length > 0)
+            if (pathLists.Length >= 7 && pathLists[6].Length > 0)
             {
-                lawsDataFileDirPath = pathLists[7];
+                lawsDataFileDirPath = pathLists[6];
             }
         }
     }

diff --git a/HelperTools/ExcelToProtobuf/Config/PathConfig.txt b/HelperTools/ExcelToProtobuf/Config/PathConfig.txt
@@ -1,5 +1,7 @@
-E:\UnityDemo\FrameWork\HelperTools\ExcelToProtobuf\Excel
-E:\UnityDemo\FrameWork\HelperTools\ExcelToProtobuf\Protos
-E:\UnityDemo\FrameWork\HelperTools\ExcelToProtobuf\BuildProtos.bat
-E:\UnityDemo\FrameWork\HelperTools\ExcelToProtobuf\Csharp
-E:\UnityDemo\FrameWork\HelperTools\ExcelToProtobuf\bin\Debug\Google.Protobuf.dll
+E:\UnityDemo\EliminateGame\HelperTools\ExcelToProtobuf\Excel
+E:\UnityDemo\EliminateGame\HelperTools\ExcelToProtobuf\Protos
+E:\UnityDemo\EliminateGame\HelperTools\ExcelToProtobuf\BuildProtos.bat
+E:\UnityDemo\EliminateGame\HelperTools\ExcelToProtobuf\Csharp
+E:\UnityDemo\EliminateGame\Assets\_Res\_Config
+
+E:\UnityDemo\EliminateGame\HelperTools\ExcelToProtobuf\LawsData
diff --git a/HelperTools/ExcelToProtobuf/Csharp/clientData.dll b/HelperTools/ExcelToProtobuf/Csharp/clientData.dll
diff --git a/HelperTools/ExcelToProtobuf/Dlls/Google.Protobuf.dll b/HelperTools/ExcelToProtobuf/Dlls/Google.Protobuf.dll
diff --git a/HelperTools/ExcelToProtobuf/Dlls/ICSharpCode.SharpZipLib.dll b/HelperTools/ExcelToProtobuf/Dlls/ICSharpCode.SharpZipLib.dll
diff --git a/HelperTools/ExcelToProtobuf/Dlls/NPOI.OOXML.dll b/HelperTools/ExcelToProtobuf/Dlls/NPOI.OOXML.dll
diff --git a/HelperTools/ExcelToProtobuf/Dlls/NPOI.OpenXml4Net.dll b/HelperTools/ExcelToProtobuf/Dlls/NPOI.OpenXml4Net.dll
diff --git a/HelperTools/ExcelToProtobuf/Dlls/NPOI.OpenXmlFormats.dll b/HelperTools/ExcelToProtobuf/Dlls/NPOI.OpenXmlFormats.dll
diff --git a/HelperTools/ExcelToProtobuf/Dlls/NPOI.dll b/HelperTools/ExcelToProtobuf/Dlls/NPOI.dll
diff --git a/HelperTools/ExcelToProtobuf/Dlls/System.Buffers.dll b/HelperTools/ExcelToProtobuf/Dlls/System.Buffers.dll
diff --git a/HelperTools/ExcelToProtobuf/Dlls/System.Memory.dll b/HelperTools/ExcelToProtobuf/Dlls/System.Memory.dll
diff --git a/HelperTools/ExcelToProtobuf/Dlls/System.Runtime.CompilerServices.Unsafe.dll b/HelperTools/ExcelToProtobuf/Dlls/System.Runtime.CompilerServices.Unsafe.dll
diff --git a/HelperTools/ExcelToProtobuf/ExcelToProtobuf.csproj b/HelperTools/ExcelToProtobuf/ExcelToProtobuf.csproj
@@ -36,40 +36,35 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Google.Protobuf">
-      <HintPath>Config\Google.Protobuf.dll</HintPath>
+      <HintPath>Dlls\Google.Protobuf.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Demo\server\tools\Xlsx2Csv\Xlsx2Csv\ICSharpCode.SharpZipLib.dll</HintPath>
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>Dlls\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI, Version=2.2.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Demo\server\tools\Xlsx2Csv\Xlsx2Csv\NPOI.dll</HintPath>
+    <Reference Include="NPOI">
+      <HintPath>Dlls\NPOI.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OOXML, Version=2.2.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Demo\server\tools\Xlsx2Csv\Xlsx2Csv\NPOI.OOXML.dll</HintPath>
+    <Reference Include="NPOI.OOXML">
+      <HintPath>Dlls\NPOI.OOXML.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OpenXml4Net, Version=2.2.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Demo\server\tools\Xlsx2Csv\Xlsx2Csv\NPOI.OpenXml4Net.dll</HintPath>
+    <Reference Include="NPOI.OpenXml4Net">
+      <HintPath>Dlls\NPOI.OpenXml4Net.dll</HintPath>
     </Reference>
-    <Reference Include="NPOI.OpenXmlFormats, Version=2.2.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Demo\server\tools\Xlsx2Csv\Xlsx2Csv\NPOI.OpenXmlFormats.dll</HintPath>
+    <Reference Include="NPOI.OpenXmlFormats">
+      <HintPath>Dlls\NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers">
-      <HintPath>..\..\..\TestDemo01\Assets\Plugins\System.Buffers.dll</HintPath>
+      <HintPath>Dlls\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Memory">
-      <HintPath>..\..\..\TestDemo01\Assets\Plugins\System.Memory.dll</HintPath>
+      <HintPath>Dlls\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe">
-      <HintPath>..\..\..\TestDemo01\Assets\Plugins\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>Dlls\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/HelperTools/ExcelToProtobuf/Program.cs b/HelperTools/ExcelToProtobuf/Program.cs
@@ -41,7 +41,8 @@ static void Main(string[] args)
                         if (isGenerat)
                         {
                             Console.WriteLine("开始编译C#类…………");
-                            bool isCompiler = Compiler2Dll.Compiler(lines[3], lines[3], lines[4]);
+                            string dllPath = exePath + "\\Google.Protobuf.dll";
+                            bool isCompiler = Compiler2Dll.Compiler(lines[3], lines[3], dllPath);
                             Console.WriteLine("编译C#类完成…………");
 
                             if (isCompiler)
@@ -51,7 +52,8 @@ static void Main(string[] args)
                                 Console.WriteLine("序列化数据完成…………");
                             }
                         }
-
+                        Console.ForegroundColor = ConsoleColor.Red;
+                        Console.WriteLine("编表全部结束！！！");
                     }
                     else
                     {

diff --git a/HelperTools/ExcelToProtobuf/bin/Debug/ExcelToProtobuf.exe b/HelperTools/ExcelToProtobuf/bin/Debug/ExcelToProtobuf.exe
diff --git a/HelperTools/ExcelToProtobuf/bin/Debug/ExcelToProtobuf.pdb b/HelperTools/ExcelToProtobuf/bin/Debug/ExcelToProtobuf.pdb
diff --git a/HelperTools/ExcelToProtobuf/bin/Release/ExcelToProtobuf.exe b/HelperTools/ExcelToProtobuf/bin/Release/ExcelToProtobuf.exe
diff --git a/HelperTools/ExcelToProtobuf/bin/Release/ExcelToProtobuf.exe.config b/HelperTools/ExcelToProtobuf/bin/Release/ExcelToProtobuf.exe.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
     </startup>
 </configuration>
diff --git a/HelperTools/ExcelToProtobuf/bin/Release/ExcelToProtobuf.pdb b/HelperTools/ExcelToProtobuf/bin/Release/ExcelToProtobuf.pdb
diff --git a/HelperTools/ExcelToProtobuf/bin/Release/Google.Protobuf.dll b/HelperTools/ExcelToProtobuf/bin/Release/Google.Protobuf.dll
diff --git a/HelperTools/ExcelToProtobuf/bin/Release/ICSharpCode.SharpZipLib.dll b/HelperTools/ExcelToProtobuf/bin/Release/ICSharpCode.SharpZipLib.dll
diff --git a/HelperTools/ExcelToProtobuf/bin/Release/NPOI.OOXML.dll b/HelperTools/ExcelToProtobuf/bin/Release/NPOI.OOXML.dll
diff --git a/HelperTools/ExcelToProtobuf/bin/Release/NPOI.OpenXml4Net.dll b/HelperTools/ExcelToProtobuf/bin/Release/NPOI.OpenXml4Net.dll
diff --git a/HelperTools/ExcelToProtobuf/bin/Release/NPOI.OpenXmlFormats.dll b/HelperTools/ExcelToProtobuf/bin/Release/NPOI.OpenXmlFormats.dll
diff --git a/HelperTools/ExcelToProtobuf/bin/Release/NPOI.dll b/HelperTools/ExcelToProtobuf/bin/Release/NPOI.dll
diff --git a/HelperTools/ExcelToProtobuf/bin/Release/System.Buffers.dll b/HelperTools/ExcelToProtobuf/bin/Release/System.Buffers.dll
diff --git a/HelperTools/ExcelToProtobuf/bin/Release/System.Memory.dll b/HelperTools/ExcelToProtobuf/bin/Release/System.Memory.dll
diff --git a/HelperTools/ExcelToProtobuf/bin/Release/System.Runtime.CompilerServices.Unsafe.dll b/HelperTools/ExcelToProtobuf/bin/Release/System.Runtime.CompilerServices.Unsafe.dll
diff --git a/HelperTools/ExcelToProtobuf/readme.txt b/HelperTools/ExcelToProtobuf/readme.txt
@@ -1,4 +1,4 @@
 1��Excel����Ҫ�����ı���
 2��Protos�����е�����proto�ļ�
-3��Config/PathConfig.txt���ú�·����˳��Ϊ��Excel·����Protos·����protoc������·��,��Ҫ�����cs�ļ�·������������cs�ļ������pb����dll��
+3��Config/PathConfig.txt���ú�·����˳��Ϊ��Excel·����Protos·����protoc������·��,��Ҫ�����cs�ļ�·�������л������ݣ�λ���ļ����ݣ��������ݣ�
 4��ִ��binĿ¼��debug��releaseĿ¼�µ�ExcelToProtobuf.exe
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ for /r %%i in (*.proto) do ( @@
     echo.
     echo .proto文件转.cs文件结束
     echo.
-    pause
+    exit