From d1be913bce5e99a2620d0ceb8350b8aadf023314 Mon Sep 17 00:00:00 2001
From: tanghai <egametang@gmail.com>
Date: Fri, 19 Oct 2018 16:37:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E8=B7=AF=E9=85=8D=E7=BD=AE=E6=94=BE?=
 =?UTF-8?q?=E5=88=B0Config=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {Server/Model => Config}/graph.bytes                | Bin
 .../Module/Pathfinding/PathfindingComponent.cs      |   2 +-
 Server/Model/Server.Model.csproj                    |   6 +-----
 Unity/Assets/Model/Init.cs                          |   7 +------
 4 files changed, 3 insertions(+), 12 deletions(-)
 rename {Server/Model => Config}/graph.bytes (100%)

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 55fb6859..e3e26dfc 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 2479dc95..05d0912e 100644
--- a/Server/Model/Server.Model.csproj
+++ b/Server/Model/Server.Model.csproj
@@ -100,6 +100,7 @@
     </Compile>
     <EmbeddedResource Remove="Libs\**" />
     <None Remove="Libs\**" />
+    <None Remove="graph.bytes" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\Unity\Assets\Model\Base\DoubleMap.cs" Link="Base\DoubleMap.cs" />
@@ -349,9 +350,4 @@
       <HintPath>..\ThirdParty\Pathfinding.Ionic.Zip.Reduced.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <None Update="graph.bytes">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Unity/Assets/Model/Init.cs b/Unity/Assets/Model/Init.cs
index e85c4f0d..680032bf 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);
-- 
GitLab