diff --git a/Assets/GameScripts/DotNet/Core/Exporter/Excel/ExcelExporter.cs b/Assets/GameScripts/DotNet/Core/Exporter/Excel/ExcelExporter.cs index 4ce11d04..beb6013d 100644 --- a/Assets/GameScripts/DotNet/Core/Exporter/Excel/ExcelExporter.cs +++ b/Assets/GameScripts/DotNet/Core/Exporter/Excel/ExcelExporter.cs @@ -67,8 +67,8 @@ public sealed class ExcelExporter FileHelper.ClearDirectoryFile(ExcelDefine.ClientCustomExportDirectory); // 找到程序集 var assemblyLoadContext = new AssemblyLoadContext("ExporterDll", true); - var dllBytes = File.ReadAllBytes(Path.Combine(Environment.CurrentDirectory, "TEngine.Model.dll")); - var pdbBytes = File.ReadAllBytes(Path.Combine(Environment.CurrentDirectory, "TEngine.Model.pdb")); + var dllBytes = File.ReadAllBytes(Path.Combine(Environment.CurrentDirectory, "Logic.dll")); + var pdbBytes = File.ReadAllBytes(Path.Combine(Environment.CurrentDirectory, "Logic.pdb")); var assembly = assemblyLoadContext.LoadFromStream(new MemoryStream(dllBytes), new MemoryStream(pdbBytes)); // 加载程序集 AssemblyManager.LoadAssembly(int.MaxValue, assembly); diff --git a/DotNet/App/TEngineSettings.json b/DotNet/App/TEngineSettings.json index f0ec0faa..50000471 100644 --- a/DotNet/App/TEngineSettings.json +++ b/DotNet/App/TEngineSettings.json @@ -21,15 +21,15 @@ "Comment": "Excel配置文件根目录" }, "ExcelVersionFile": { - "Value": ".../../../Config/Excel/Version.txt", + "Value": ".../../../../../Config/Excel/Version.txt", "Comment": "Excel版本文件的位置" }, "ExcelServerFileDirectory": { - "Value": "../../Server/Hotfix/Generate/ConfigTable/Entity/", + "Value": "../../../Config/Server/Entity/", "Comment": "Excel生成服务器代码的文件夹位置" }, "ExcelClientFileDirectory": { - "Value": "../../Client/Unity/Assets/Scripts/Hotfix/Generate/ConfigTable/Entity/", + "Value": "../../../Config/Client/Entity/", "Comment": "Excel生成客户端代码文件夹位置" }, "ExcelServerBinaryDirectory": { @@ -37,7 +37,7 @@ "Comment": "Excel生成服务器二进制数据文件夹位置" }, "ExcelClientBinaryDirectory": { - "Value": "../../Client/Unity/Assets/Bundles/Config/", + "Value": "../../Config/Client/Binary/", "Comment": "Excel生成客户端二进制数据文件夹位置" }, "ExcelServerJsonDirectory": { diff --git a/DotNet/Config/Binary/MachineConfigData.bytes b/DotNet/Config/Binary/MachineConfigData.bytes index 43938728..1cc3ee34 100644 --- a/DotNet/Config/Binary/MachineConfigData.bytes +++ b/DotNet/Config/Binary/MachineConfigData.bytes @@ -1,2 +1,2 @@ -' 127.0.0.1 127.0.0.1" 127.0.0.1( \ No newline at end of file +!0.0.0.00.0.0.0"0.0.0.0( \ No newline at end of file diff --git a/DotNet/Config/Excel/Server/MachineConfig.xlsx b/DotNet/Config/Excel/Server/MachineConfig.xlsx index 3932366c..d2ea9c13 100644 Binary files a/DotNet/Config/Excel/Server/MachineConfig.xlsx and b/DotNet/Config/Excel/Server/MachineConfig.xlsx differ diff --git a/DotNet/ThirdParty/ThirdParty.csproj b/DotNet/ThirdParty/ThirdParty.csproj index ffa770ee..06a401e2 100644 --- a/DotNet/ThirdParty/ThirdParty.csproj +++ b/DotNet/ThirdParty/ThirdParty.csproj @@ -51,29 +51,29 @@ - runtimes\osx\native\libRecastDll.dylib + libRecastDll.dylib PreserveNewest - runtimes\linux\native\libRecastDll.so + libRecastDll.so PreserveNewest - runtimes\win\native\RecastDll.dll + RecastDll.dll PreserveNewest - runtimes\osx\native\kcp.dylib + kcp.dylib PreserveNewest - runtimes\win\native\kcp.dll + kcp.dll PreserveNewest - runtimes\linux\native\kcp.so + kcp.so PreserveNewest