Просмотр исходного кода

server添加windows的kcp dll 引用

tanghai 4 лет назад
Родитель
Сommit
3d1d6a0e09

+ 1 - 1
Server/ThirdParty/Recast/RecastInterface.cs

@@ -268,7 +268,7 @@ namespace ET
                     // https://bbs.csdn.net/topics/392618929?list=676344
                     polyCount = recast_getcountpoly(id);
                     IntPtr polys = recast_getpathpoly(id);
-                    if (polys != null && polys.ToPointer() != null)
+                    if (polys.ToPointer() != null)
                     {
                         int[] arrPolys = new int[polyCount];
                         Marshal.Copy(polys, arrPolys, 0, polyCount);

+ 11 - 9
Server/ThirdParty/Server.ThirdParty.csproj

@@ -15,15 +15,6 @@
         <DefineConstants>TRACE;SERVER;FEAT_SAFE</DefineConstants>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Update="libkcp.dylib">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </None>
-        <None Update="libkcp.so">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-
     <ItemGroup>
         <None Include="..\..\RecastNavMesh\RecastNavDll.dll">
             <Link>RecastNavDll.dll</Link>
@@ -41,4 +32,15 @@
         </Compile>
     </ItemGroup>
 
+    <ItemGroup>
+      <Content Include="..\..\Unity\Assets\Plugins\MacOS\libkcp.dylib">
+        <Link>libkcp.dylib</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
+      <Content Include="..\..\Unity\Assets\Plugins\x86_64\kcp.dll">
+        <Link>kcp.dll</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
+    </ItemGroup>
+
 </Project>

BIN
Server/ThirdParty/libkcp.dylib


BIN
Server/ThirdParty/libkcp.so


+ 1 - 0
Unity/Unity.Editor.csproj

@@ -52,6 +52,7 @@
     <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
   </PropertyGroup>
   <ItemGroup>
+     <Compile Include="Assets\Editor\RecastNavDataExporter\NavMeshExporter.cs" />
      <Compile Include="Assets\Editor\BuildEditor\BuildHelper.cs" />
      <Compile Include="Assets\Editor\ComponentViewEditor\TypeDrawer\FloatTypeDrawer.cs" />
      <Compile Include="Assets\Editor\ComponentViewEditor\TypeDrawer\Vector2TypeDrawer.cs" />

+ 2 - 0
Unity/Unity.Hotfix.csproj

@@ -54,11 +54,13 @@
   <ItemGroup>
      <Compile Include="Assets\Hotfix\Module\Message\NetThreadComponentSystem.cs" />
      <Compile Include="Assets\Hotfix\Scene\LoginHelper.cs" />
+     <Compile Include="Assets\Hotfix\Unit\MoveComponentSystem.cs" />
      <Compile Include="Assets\Hotfix\Module\Numeric\NumericChangeEvent_NotifyWatcher.cs" />
      <Compile Include="Assets\Hotfix\Unit\M2C_CreateUnitsHandler.cs" />
      <Compile Include="Assets\Hotfix\Module\Config\ConfigComponentSystem.cs" />
      <Compile Include="Assets\Hotfix\Module\Message\SessionIdleCheckerComponentSystem.cs" />
      <Compile Include="Assets\Hotfix\Module\Message\NetKcpComponentSystem.cs" />
+     <Compile Include="Assets\Hotfix\Unit\UnitPathComponentSystem.cs" />
      <Compile Include="Assets\Hotfix\Module\Numeric\NumericWatcher_Hp_ShowUI.cs" />
      <Compile Include="Assets\Hotfix\Module\Message\OuterMessageDispatcher.cs" />
      <Compile Include="Assets\Hotfix\Move\M2C_PathfindingResultHandler.cs" />

+ 2 - 0
Unity/Unity.Model.csproj

@@ -191,6 +191,7 @@
      <Compile Include="Assets\Model\Core\Log\NLogger.cs" />
      <Compile Include="Assets\Model\Core\Async\ETTaskCompletionSource.cs" />
      <Compile Include="Assets\Model\Core\Helper\StringHelper.cs" />
+     <Compile Include="Assets\Model\Unit\MoveComponent.cs" />
      <Compile Include="Assets\Model\Module\Message\MessagePool.cs" />
      <Compile Include="Assets\Model\Module\Config\IConfig.cs" />
      <Compile Include="Assets\Model\Module\Message\ResponseTypeAttribute.cs" />
@@ -199,6 +200,7 @@
      <Compile Include="Assets\Model\Core\Async\ETTaskHelper.cs" />
      <Compile Include="Assets\Model\Module\NetworkTCP\TChannel.cs" />
      <Compile Include="Assets\Model\Module\Network\AChannel.cs" />
+     <Compile Include="Assets\Model\Unit\UnitPathComponent.cs" />
      <None Include="Assets\Model\Unity.Model.asmdef" />
  <Reference Include="UnityEngine">
  <HintPath>/Applications/Unity/Hub/Editor/2020.2.2f1c1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.dll</HintPath>