From 3d1d6a0e09d04e88b64783eee7b82392023db0bf Mon Sep 17 00:00:00 2001 From: tanghai Date: Tue, 9 Mar 2021 23:17:03 +0800 Subject: [PATCH] =?UTF-8?q?server=E6=B7=BB=E5=8A=A0windows=E7=9A=84kcp=20d?= =?UTF-8?q?ll=20=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/ThirdParty/Recast/RecastInterface.cs | 2 +- Server/ThirdParty/Server.ThirdParty.csproj | 20 +++++++++++--------- Server/ThirdParty/libkcp.dylib | Bin 91904 -> 0 bytes Server/ThirdParty/libkcp.so | Bin 28064 -> 0 bytes Unity/Unity.Editor.csproj | 1 + Unity/Unity.Hotfix.csproj | 2 ++ Unity/Unity.Model.csproj | 2 ++ 7 files changed, 17 insertions(+), 10 deletions(-) delete mode 100755 Server/ThirdParty/libkcp.dylib delete mode 100644 Server/ThirdParty/libkcp.so diff --git a/Server/ThirdParty/Recast/RecastInterface.cs b/Server/ThirdParty/Recast/RecastInterface.cs index 38d315e0..6de0e62f 100644 --- a/Server/ThirdParty/Recast/RecastInterface.cs +++ b/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); diff --git a/Server/ThirdParty/Server.ThirdParty.csproj b/Server/ThirdParty/Server.ThirdParty.csproj index fad802a8..d3e0bc0d 100644 --- a/Server/ThirdParty/Server.ThirdParty.csproj +++ b/Server/ThirdParty/Server.ThirdParty.csproj @@ -15,15 +15,6 @@ TRACE;SERVER;FEAT_SAFE - - - Always - - - PreserveNewest - - - RecastNavDll.dll @@ -41,4 +32,15 @@ + + + libkcp.dylib + PreserveNewest + + + kcp.dll + PreserveNewest + + + diff --git a/Server/ThirdParty/libkcp.dylib b/Server/ThirdParty/libkcp.dylib deleted file mode 100755 index d330792f947a2d73488bb636fd457b87d5a0756f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 91904 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 diff --git a/Server/ThirdParty/libkcp.so b/Server/ThirdParty/libkcp.so deleted file mode 100644 index 64aa0055f044f5921a7f283e957296bd7bd81a7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28064 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 diff --git a/Unity/Unity.Editor.csproj b/Unity/Unity.Editor.csproj index e0fcfdcd..465781b1 100644 --- a/Unity/Unity.Editor.csproj +++ b/Unity/Unity.Editor.csproj @@ -52,6 +52,7 @@ false + diff --git a/Unity/Unity.Hotfix.csproj b/Unity/Unity.Hotfix.csproj index 25b9c15d..1c8562af 100644 --- a/Unity/Unity.Hotfix.csproj +++ b/Unity/Unity.Hotfix.csproj @@ -54,11 +54,13 @@ + + diff --git a/Unity/Unity.Model.csproj b/Unity/Unity.Model.csproj index 93cf4232..273f98a9 100644 --- a/Unity/Unity.Model.csproj +++ b/Unity/Unity.Model.csproj @@ -191,6 +191,7 @@ + @@ -199,6 +200,7 @@ + /Applications/Unity/Hub/Editor/2020.2.2f1c1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.dll -- GitLab