tanghai 4 лет назад
Родитель
Сommit
9aa09bcd7e

+ 0 - 0
RecastNavMesh/Core/MyTest/MyTest.cpp → Libs/RecastNavMesh/Core/MyTest/MyTest.cpp


+ 0 - 0
RecastNavMesh/Core/MyTest/tools.cpp → Libs/RecastNavMesh/Core/MyTest/tools.cpp


+ 0 - 0
RecastNavMesh/Core/MyTest/tools.h → Libs/RecastNavMesh/Core/MyTest/tools.h


+ 0 - 0
RecastNavMesh/Core/RecastNavDll/CRecastHelper.cpp → Libs/RecastNavMesh/Core/RecastNavDll/CRecastHelper.cpp


+ 0 - 0
RecastNavMesh/Core/RecastNavDll/CRecastHelper.h → Libs/RecastNavMesh/Core/RecastNavDll/CRecastHelper.h


+ 0 - 0
RecastNavMesh/Core/RecastNavDll/RecastDll.cpp → Libs/RecastNavMesh/Core/RecastNavDll/RecastDll.cpp


+ 0 - 0
RecastNavMesh/Core/RecastNavDll/RecastDll.h → Libs/RecastNavMesh/Core/RecastNavDll/RecastDll.h


+ 0 - 0
RecastNavMesh/DroidSans.ttf → Libs/RecastNavMesh/DroidSans.ttf


+ 0 - 0
RecastNavMesh/Meshes/Map.obj → Libs/RecastNavMesh/Meshes/Map.obj


+ 0 - 0
RecastNavMesh/Meshes/dungeon.obj → Libs/RecastNavMesh/Meshes/dungeon.obj


+ 0 - 0
RecastNavMesh/Meshes/nav_test.obj → Libs/RecastNavMesh/Meshes/nav_test.obj


+ 0 - 0
RecastNavMesh/Meshes/undulating.obj → Libs/RecastNavMesh/Meshes/undulating.obj


+ 0 - 0
RecastNavMesh/RecastDemo.exe → Libs/RecastNavMesh/RecastDemo.exe


+ 0 - 0
RecastNavMesh/RecastNavDll.dll → Libs/RecastNavMesh/RecastNavDll.dll


+ 0 - 0
RecastNavMesh/SDL2.dll → Libs/RecastNavMesh/SDL2.dll


BIN
Libs/RecastNavMesh/libRecastNavDll.dylib


+ 0 - 0
RecastNavMesh/solo_navmesh.bin → Libs/RecastNavMesh/solo_navmesh.bin


+ 8 - 7
Server/ThirdParty/Server.ThirdParty.csproj

@@ -15,13 +15,6 @@
         <DefineConstants>TRACE;SERVER;FEAT_SAFE</DefineConstants>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Include="..\..\RecastNavMesh\RecastNavDll.dll">
-            <Link>RecastNavDll.dll</Link>
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="MongoDB.Driver" Version="2.11.5" />
     </ItemGroup>
@@ -33,6 +26,14 @@
     </ItemGroup>
 
     <ItemGroup>
+      <Content Include="..\..\Libs\RecastNavMesh\libRecastNavDll.dylib">
+        <Link>libRecastNavDll.dylib</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
+      <Content Include="..\..\Libs\RecastNavMesh\RecastNavDll.dll">
+        <Link>RecastNavDll.dll</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
       <Content Include="..\..\Unity\Assets\Plugins\MacOS\libkcp.dylib">
         <Link>libkcp.dylib</Link>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

+ 1 - 0
Unity/Assets/HotfixView/Unit/ChangePosition_SyncGameObjectPos.cs

@@ -8,6 +8,7 @@ namespace ET
         {
             Transform transform = args.Unit.GetComponent<GameObjectComponent>().GameObject.transform;
             transform.position = args.Unit.Position;
+            await ETTask.CompletedTask;
         }
     }
 }

+ 1 - 0
Unity/Assets/HotfixView/Unit/ChangeRotation_SyncGameObjectRotation.cs

@@ -8,6 +8,7 @@ namespace ET
         {
             Transform transform = args.Unit.GetComponent<GameObjectComponent>().GameObject.transform;
             transform.rotation = args.Unit.Rotation;
+            await ETTask.CompletedTask;
         }
     }
 }

BIN
Unity/Assets/Plugins/MacOS/libRecastNavDll.dylib


+ 33 - 0
Unity/Assets/Plugins/MacOS/libRecastNavDll.dylib.meta

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

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
Unity/Unity.Editor.csproj


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
Unity/Unity.Hotfix.csproj


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
Unity/Unity.HotfixView.csproj


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
Unity/Unity.Model.csproj


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
Unity/Unity.ModelView.csproj


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
Unity/Unity.ThirdParty.csproj


Некоторые файлы не были показаны из-за большого количества измененных файлов