diff --git a/Server/Model/graph.bytes b/Config/graph.bytes similarity index 100% rename from Server/Model/graph.bytes rename to Config/graph.bytes diff --git a/Server/Model/Module/Pathfinding/PathfindingComponent.cs b/Server/Model/Module/Pathfinding/PathfindingComponent.cs index 55fb685918f2e068f69c808b5e9edc2e8f8de169..e3e26dfcfae94c2bf953c6ce22c3e9109423c730 100644 --- a/Server/Model/Module/Pathfinding/PathfindingComponent.cs +++ b/Server/Model/Module/Pathfinding/PathfindingComponent.cs @@ -15,7 +15,7 @@ namespace ETModel self.AStarConfig.pathProcessor = self.PathProcessor; // 读取地图数据 - self.AStarConfig.graphs = DeserializeHelper.Load("./graph.bytes"); + self.AStarConfig.graphs = DeserializeHelper.Load("../Config/graph.bytes"); } } diff --git a/Server/Model/Server.Model.csproj b/Server/Model/Server.Model.csproj index 2479dc9544cbefce42c4cea6d328eb848b0654de..05d0912ed4dd8d5dfa0d97c3fc29e4d969117cbc 100644 --- a/Server/Model/Server.Model.csproj +++ b/Server/Model/Server.Model.csproj @@ -100,6 +100,7 @@ + @@ -349,9 +350,4 @@ ..\ThirdParty\Pathfinding.Ionic.Zip.Reduced.dll - - - PreserveNewest - - \ No newline at end of file diff --git a/Unity/Assets/Model/Init.cs b/Unity/Assets/Model/Init.cs index e85c4f0dcd03d5225c6c5244b0fca3b3ac9d0806..680032bf643a952476abe5018e4f0a1f0e86dbde 100644 --- a/Unity/Assets/Model/Init.cs +++ b/Unity/Assets/Model/Init.cs @@ -16,12 +16,7 @@ namespace ETModel private async ETVoid StartAsync() { try - { - if (!Application.unityVersion.StartsWith("2017.4")) - { - Log.Error($"新人请使用Unity2017.4版本,减少跑demo遇到的问题! 下载地址:\n https://unity3d.com/cn/unity/qa/lts-releases?_ga=2.227583646.282345691.1536717255-1119432033.1499739574"); - } - + { SynchronizationContext.SetSynchronizationContext(OneThreadSynchronizationContext.Instance); DontDestroyOnLoad(gameObject);