diff --git a/Server/ThirdParty/Recast/RecastInterface.cs b/Server/ThirdParty/Recast/RecastInterface.cs
index 38d315e007db4df93c3476e2b7b96709fae8aae8..6de0e62f2fe7bd6a0d9900a917127b1691b020a6 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 fad802a82bb8ab5e4119fb54e0d13402c169c304..d3e0bc0d52ebf293c8e4e0478dc292c5feef2064 100644
--- a/Server/ThirdParty/Server.ThirdParty.csproj
+++ b/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>
diff --git a/Server/ThirdParty/libkcp.dylib b/Server/ThirdParty/libkcp.dylib
deleted file mode 100755
index d330792f947a2d73488bb636fd457b87d5a0756f..0000000000000000000000000000000000000000
Binary files a/Server/ThirdParty/libkcp.dylib and /dev/null differ
diff --git a/Server/ThirdParty/libkcp.so b/Server/ThirdParty/libkcp.so
deleted file mode 100644
index 64aa0055f044f5921a7f283e957296bd7bd81a7c..0000000000000000000000000000000000000000
Binary files a/Server/ThirdParty/libkcp.so and /dev/null differ
diff --git a/Unity/Unity.Editor.csproj b/Unity/Unity.Editor.csproj
index e0fcfdcdc035b40fdb69fb51762e81580a81d0ab..465781b1646ca5a3c5ff44e24b9893e9d06b47e3 100644
--- a/Unity/Unity.Editor.csproj
+++ b/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" />
diff --git a/Unity/Unity.Hotfix.csproj b/Unity/Unity.Hotfix.csproj
index 25b9c15d97b49b1d11cc333117ec80a2190c663e..1c8562afe6d541daa677b457ee49b90fc0ae0188 100644
--- a/Unity/Unity.Hotfix.csproj
+++ b/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" />
diff --git a/Unity/Unity.Model.csproj b/Unity/Unity.Model.csproj
index 93cf42328b7272b38c129515db470aea69ab5a33..273f98a95e60110358c3fe3d0fc263786f2373a6 100644
--- a/Unity/Unity.Model.csproj
+++ b/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>