Merge branch 'master' of http://47.122.5.112:3000/mojito/StarEscort

DotNet/ThirdParty/DotNet.ThirdParty.csproj

@@ -48,24 +48,23 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\Unity\Assets\Plugins\MacOS\arm64\libkcp.dylib">
-        <Link>libkcp.dylib</Link>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Content Include="..\..\Unity\Assets\Plugins\MacOS\x86_64\libkcp.dylib">
+        <Link>Runtimes\MacOS\libkcp.dylib</Link>
       </Content>
-      <Content Include="..\..\Unity\Assets\Plugins\MacOS\libRecastDll.dylib">
-        <Link>libRecastDll.dylib</Link>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Content Include="..\..\Unity\Assets\Plugins\MacOS\x86_64\libRecastDll.dylib">
+        <Link>Runtimes\MacOS\libRecastDll.dylib</Link>
       </Content>
       <Content Include="..\..\Unity\Assets\Plugins\x86_64\kcp.dll">
-        <Link>kcp.dll</Link>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <Link>Runtimes\X86_64\kcp.dll</Link>
       </Content>
       <Content Include="..\..\Unity\Assets\Plugins\x86_64\libkcp.so">
-        <Link>libkcp.so</Link>
+        <Link>Runtimes\Linux\libkcp.so</Link>
+      </Content>
+      <Content Include="..\..\Unity\Assets\Plugins\x86_64\libRecastDll.so">
+        <Link>Runtimes\Linux\libRecastDll.so</Link>
       </Content>
       <Content Include="..\..\Unity\Assets\Plugins\x86_64\RecastDll.dll">
-        <Link>RecastDll.dll</Link>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <Link>Runtimes\X86_64\RecastDll.dll</Link>
       </Content>
     </ItemGroup>
 

Unity/Assets/Plugins/MacOS/x86_64/libkcp.so.meta

@@ -1,52 +0,0 @@
-fileFormatVersion: 2
-guid: d1c340ed957314aad89ba156eb1b6441
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        CPU: x86_64
-        DefaultValueInitialized: true
-  - first:
-      Standalone: Linux64
-    second:
-      enabled: 1
-      settings:
-        CPU: x86_64
-  - first:
-      Standalone: OSXUniversal
-    second:
-      enabled: 0
-      settings:
-        CPU: x86_64
-  - first:
-      Standalone: Win
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      Standalone: Win64
-    second:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: