Просмотр исходного кода

unity使用2019.3,dotnet core使用3.1

tanghai 6 лет назад
Родитель
Сommit
0ba82a4b42
29 измененных файлов с 324 добавлено и 246 удалено
  1. 1 1
      Book/Example/Example2_1/Example2_1.csproj
  2. 1 1
      Book/Example/Example2_2/Example2_2.csproj
  3. 1 1
      Book/Example/Example2_2_2/Example2_2_2.csproj
  4. 1 1
      Book/Example/Example2_3/Example2_3.csproj
  5. 1 1
      Book/Example/Example2_3_2/Example2_3_2.csproj
  6. 1 1
      Book/Example/Example3_5/Example3_5.csproj
  7. 0 30
      Client-Server.sln
  8. 1 1
      Server/App/Server.App.csproj
  9. 1 1
      Server/Hotfix/Server.Hotfix.csproj
  10. 1 1
      Server/Model/Server.Model.csproj
  11. 1 1
      Server/ThirdParty/Google.Protobuf/Google.Protobuf.csproj
  12. 1 1
      Server/ThirdParty/KcpLib/KcpLib.csproj
  13. 1 1
      Server/ThirdParty/MongoDBDriver/MongoDB.Bson/MongoDB.Bson.csproj
  14. 1 1
      Server/ThirdParty/MongoDBDriver/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj
  15. 1 1
      Server/ThirdParty/MongoDBDriver/MongoDB.Driver.GridFS/MongoDB.Driver.GridFS.csproj
  16. 1 1
      Server/ThirdParty/MongoDBDriver/MongoDB.Driver/MongoDB.Driver.csproj
  17. 1 1
      Tools/FileServer/FileServer.csproj
  18. 1 1
      Tools/Proto2CS/Proto2CS.csproj
  19. 246 165
      Unity/Assets/Model/Module/Pathfinding/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/mine_bot.FBX.meta
  20. 2 2
      Unity/Assets/Model/Module/Pathfinding/AstarPathfindingProject/Generators/Utilities/RecastMeshGatherer.cs
  21. BIN
      Unity/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll
  22. 19 3
      Unity/Packages/manifest.json
  23. 17 3
      Unity/ProjectSettings/EditorSettings.asset
  24. 2 1
      Unity/ProjectSettings/ProjectVersion.txt
  25. 5 5
      Unity/Unity.Editor.csproj
  26. 5 5
      Unity/Unity.Hotfix.csproj
  27. 5 5
      Unity/Unity.Model.csproj
  28. 5 5
      Unity/Unity.ThirdParty.csproj
  29. 1 5
      Unity/Unity.sln

+ 1 - 1
Book/Example/Example2_1/Example2_1.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <RootNamespace>Example1._1</RootNamespace>
     </PropertyGroup>
 

+ 1 - 1
Book/Example/Example2_2/Example2_2.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

+ 1 - 1
Book/Example/Example2_2_2/Example2_2_2.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

+ 1 - 1
Book/Example/Example2_3/Example2_3.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
 </Project>

+ 1 - 1
Book/Example/Example2_3_2/Example2_3_2.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
 </Project>

+ 1 - 1
Book/Example/Example3_5/Example3_5.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

+ 0 - 30
Client-Server.sln

@@ -29,10 +29,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KcpLib", "Server\ThirdParty
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4BC66C3C-D55F-4FAA-A2F5-29E8EB1797AE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Proto2CS", "Tools\Proto2CS\Proto2CS.csproj", "{CC55624F-D5CB-4705-A879-9FCAEC1FED71}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileServer", "Tools\FileServer\FileServer.csproj", "{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MongoDBDriver", "MongoDBDriver", "{14963D84-2A63-48CF-AE13-DCF71F1E13A0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Bson", "Server\ThirdParty\MongoDBDriver\MongoDB.Bson\MongoDB.Bson.csproj", "{341CF1D2-DE35-4E61-AC7E-AA01A8ED452D}"
@@ -175,30 +171,6 @@ Global
 		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Release|x64.Build.0 = Release|Any CPU
 		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Release|x86.ActiveCfg = Release|Any CPU
 		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725}.Release|x86.Build.0 = Release|Any CPU
-		{CC55624F-D5CB-4705-A879-9FCAEC1FED71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC55624F-D5CB-4705-A879-9FCAEC1FED71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC55624F-D5CB-4705-A879-9FCAEC1FED71}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CC55624F-D5CB-4705-A879-9FCAEC1FED71}.Debug|x64.Build.0 = Debug|Any CPU
-		{CC55624F-D5CB-4705-A879-9FCAEC1FED71}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CC55624F-D5CB-4705-A879-9FCAEC1FED71}.Debug|x86.Build.0 = Debug|Any CPU
-		{CC55624F-D5CB-4705-A879-9FCAEC1FED71}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC55624F-D5CB-4705-A879-9FCAEC1FED71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC55624F-D5CB-4705-A879-9FCAEC1FED71}.Release|x64.ActiveCfg = Release|Any CPU
-		{CC55624F-D5CB-4705-A879-9FCAEC1FED71}.Release|x64.Build.0 = Release|Any CPU
-		{CC55624F-D5CB-4705-A879-9FCAEC1FED71}.Release|x86.ActiveCfg = Release|Any CPU
-		{CC55624F-D5CB-4705-A879-9FCAEC1FED71}.Release|x86.Build.0 = Release|Any CPU
-		{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84}.Debug|x64.Build.0 = Debug|Any CPU
-		{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84}.Debug|x86.Build.0 = Debug|Any CPU
-		{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84}.Release|x64.ActiveCfg = Release|Any CPU
-		{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84}.Release|x64.Build.0 = Release|Any CPU
-		{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84}.Release|x86.ActiveCfg = Release|Any CPU
-		{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84}.Release|x86.Build.0 = Release|Any CPU
 		{341CF1D2-DE35-4E61-AC7E-AA01A8ED452D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{341CF1D2-DE35-4E61-AC7E-AA01A8ED452D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{341CF1D2-DE35-4E61-AC7E-AA01A8ED452D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -334,8 +306,6 @@ Global
 		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{CFBC0A95-3456-3439-6B2E-60FDE0FE5EE1} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{CD9683D9-0B4B-42D1-A1E0-1689BEEFD725} = {78640FA0-9F11-412D-A639-61F03D02407A}
-		{CC55624F-D5CB-4705-A879-9FCAEC1FED71} = {4BC66C3C-D55F-4FAA-A2F5-29E8EB1797AE}
-		{1C2827BF-AA19-402A-BFD1-1C92E6B8FD84} = {4BC66C3C-D55F-4FAA-A2F5-29E8EB1797AE}
 		{14963D84-2A63-48CF-AE13-DCF71F1E13A0} = {78640FA0-9F11-412D-A639-61F03D02407A}
 		{341CF1D2-DE35-4E61-AC7E-AA01A8ED452D} = {14963D84-2A63-48CF-AE13-DCF71F1E13A0}
 		{B91E7D43-CCF1-49FC-ACF5-1C88A1C81FA7} = {14963D84-2A63-48CF-AE13-DCF71F1E13A0}

+ 1 - 1
Server/App/Server.App.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>App</AssemblyName>
     <RootNamespace>App</RootNamespace>
     <LangVersion>7.3</LangVersion>

+ 1 - 1
Server/Hotfix/Server.Hotfix.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>Hotfix</AssemblyName>
     <RootNamespace>ETHotfix</RootNamespace>
     <LangVersion>7.3</LangVersion>

+ 1 - 1
Server/Model/Server.Model.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>Model</AssemblyName>
     <RootNamespace>Model</RootNamespace>
     <LangVersion>7.3</LangVersion>

+ 1 - 1
Server/ThirdParty/Google.Protobuf/Google.Protobuf.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <LangVersion>7.3</LangVersion>

+ 1 - 1
Server/ThirdParty/KcpLib/KcpLib.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <PropertyGroup>

+ 1 - 1
Server/ThirdParty/MongoDBDriver/MongoDB.Bson/MongoDB.Bson.csproj

@@ -5,7 +5,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
     <CodeAnalysisRuleSet>../MongoDBLegacy.ruleset</CodeAnalysisRuleSet>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

+ 1 - 1
Server/ThirdParty/MongoDBDriver/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj

@@ -5,7 +5,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
     <CodeAnalysisRuleSet>../MongoDB.ruleset</CodeAnalysisRuleSet>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

+ 1 - 1
Server/ThirdParty/MongoDBDriver/MongoDB.Driver.GridFS/MongoDB.Driver.GridFS.csproj

@@ -5,7 +5,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
     <CodeAnalysisRuleSet>../MongoDB.ruleset</CodeAnalysisRuleSet>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

+ 1 - 1
Server/ThirdParty/MongoDBDriver/MongoDB.Driver/MongoDB.Driver.csproj

@@ -5,7 +5,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
     <CodeAnalysisRuleSet>../MongoDB.ruleset</CodeAnalysisRuleSet>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

+ 1 - 1
Tools/FileServer/FileServer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
     <PropertyGroup>

+ 1 - 1
Tools/Proto2CS/Proto2CS.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

+ 246 - 165
Unity/Assets/Model/Module/Pathfinding/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/mine_bot.FBX.meta

@@ -1,190 +1,271 @@
 fileFormatVersion: 2
 guid: caeffedc34d9f4161b7694ad0d84bbd3
 ModelImporter:
-  fileIDToRecycleName:
-    4300000: minebot_main
-    4300002: minebot_right_upperleg
-    4300004: minebot_right_lowerleg
-    4300006: minebot_head
-    4300008: minebot_front_upperleg
-    4300010: minebot_back_lowerleg
-    4300012: minebot_left_upperleg
-    4300014: minebot_left_lowerleg
-    4300016: minebot_front_upperleg
-    4300018: minebot_front_lowerleg
-    7400000: Take 001 //// mine_bot
-    100100000: DataTemplate __Singleton__
-  serializedVersion: 10
+  serializedVersion: 19300
+  internalIDToNameTable:
+  - first:
+      43: 4300000
+    second: minebot_main
+  - first:
+      43: 4300002
+    second: minebot_right_upperleg
+  - first:
+      43: 4300004
+    second: minebot_right_lowerleg
+  - first:
+      43: 4300006
+    second: minebot_head
+  - first:
+      43: 4300008
+    second: minebot_front_upperleg
+  - first:
+      43: 4300010
+    second: minebot_back_lowerleg
+  - first:
+      43: 4300012
+    second: minebot_left_upperleg
+  - first:
+      43: 4300014
+    second: minebot_left_lowerleg
+  - first:
+      43: 4300016
+    second: minebot_front_upperleg
+  - first:
+      43: 4300018
+    second: minebot_front_lowerleg
+  - first:
+      74: 7400000
+    second: Take 001
+  - first:
+      1001: 100100000
+    second: DataTemplate __Singleton__
+  - first:
+      111: 11100000
+    second: //RootNode
+  - first:
+      4: 400014
+    second: //RootNode
+  - first:
+      1: 100014
+    second: //RootNode
+  - first:
+      23: 2300004
+    second: minebot_back_lowerleg
+  - first:
+      4: 400004
+    second: minebot_back_lowerleg
+  - first:
+      1: 100004
+    second: minebot_back_lowerleg
+  - first:
+      33: 3300004
+    second: minebot_back_lowerleg
+  - first:
+      23: 2300000
+    second: minebot_front_lowerleg
+  - first:
+      4: 400000
+    second: minebot_front_lowerleg
+  - first:
+      1: 100000
+    second: minebot_front_lowerleg
+  - first:
+      33: 3300000
+    second: minebot_front_lowerleg
+  - first:
+      23: 2300012
+    second: minebot_front_upperleg
+  - first:
+      4: 400012
+    second: minebot_front_upperleg
+  - first:
+      1: 100012
+    second: minebot_front_upperleg
+  - first:
+      33: 3300012
+    second: minebot_front_upperleg
+  - first:
+      23: 2300002
+    second: minebot_front_upperleg 1
+  - first:
+      4: 400002
+    second: minebot_front_upperleg 1
+  - first:
+      1: 100002
+    second: minebot_front_upperleg 1
+  - first:
+      33: 3300002
+    second: minebot_front_upperleg 1
+  - first:
+      23: 2300010
+    second: minebot_head
+  - first:
+      4: 400010
+    second: minebot_head
+  - first:
+      1: 100010
+    second: minebot_head
+  - first:
+      33: 3300010
+    second: minebot_head
+  - first:
+      23: 2300018
+    second: minebot_left_lowerleg
+  - first:
+      4: 400020
+    second: minebot_left_lowerleg
+  - first:
+      1: 100020
+    second: minebot_left_lowerleg
+  - first:
+      33: 3300018
+    second: minebot_left_lowerleg
+  - first:
+      23: 2300006
+    second: minebot_left_upperleg
+  - first:
+      4: 400006
+    second: minebot_left_upperleg
+  - first:
+      1: 100006
+    second: minebot_left_upperleg
+  - first:
+      33: 3300006
+    second: minebot_left_upperleg
+  - first:
+      23: 2300016
+    second: minebot_main
+  - first:
+      4: 400018
+    second: minebot_main
+  - first:
+      1: 100018
+    second: minebot_main
+  - first:
+      33: 3300016
+    second: minebot_main
+  - first:
+      23: 2300008
+    second: minebot_right_lowerleg
+  - first:
+      4: 400008
+    second: minebot_right_lowerleg
+  - first:
+      1: 100008
+    second: minebot_right_lowerleg
+  - first:
+      33: 3300008
+    second: minebot_right_lowerleg
+  - first:
+      23: 2300014
+    second: minebot_right_upperleg
+  - first:
+      4: 400016
+    second: minebot_right_upperleg
+  - first:
+      1: 100016
+    second: minebot_right_upperleg
+  - first:
+      33: 3300014
+    second: minebot_right_upperleg
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 01 - Default
+    second: {fileID: 2100000, guid: 1829738127541482a895692670703544, type: 2}
   materials:
-    importMaterials: 1
+    materialImportMode: 1
     materialName: 3
     materialSearch: 1
+    materialLocation: 0
   animations:
-    generateAnimations: 3
+    legacyGenerateAnimations: 3
     bakeSimulation: 0
-    splitAnimations: 1
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
     animationCompression: 1
-    animationRotationError: .5
-    animationPositionError: .5
-    animationScaleError: .5
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
     animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
     clipAnimations: []
+    isReadable: 1
   meshes:
     lODScreenPercentages: []
-    globalScale: .00999999978
+    globalScale: 0.01
     meshCompression: 0
     addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 0
+    importBlendShapes: 1
+    importCameras: 0
+    importLights: 0
     swapUVChannels: 1
     generateSecondaryUV: 0
     useFileUnits: 1
-    optimizeMesh: 0
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 1
     secondaryUVAngleDistortion: 8
     secondaryUVAreaDistortion: 15.000001
     secondaryUVHardAngle: 88
     secondaryUVPackMargin: 4
+    useFileScale: 0
   tangentSpace:
     normalSmoothAngle: 60
-    splitTangentsAcrossUV: 1
     normalImportMode: 0
-    tangentImportMode: 1
-  textMetaNamesToFileIDs:
-    //RootNode:
-      data:
-        first: 1
-        second: ae860100
-      data:
-        first: 4
-        second: 8e1a0600
-      data:
-        first: 111
-        second: 605fa900
-    minebot_back_lowerleg:
-      data:
-        first: 1
-        second: a4860100
-      data:
-        first: 4
-        second: 841a0600
-      data:
-        first: 23
-        second: 64182300
-      data:
-        first: 33
-        second: a45a3200
-    minebot_front_lowerleg:
-      data:
-        first: 1
-        second: a0860100
-      data:
-        first: 4
-        second: 801a0600
-      data:
-        first: 23
-        second: 60182300
-      data:
-        first: 33
-        second: a05a3200
-    minebot_front_upperleg:
-      data:
-        first: 1
-        second: ac860100
-      data:
-        first: 4
-        second: 8c1a0600
-      data:
-        first: 23
-        second: 6c182300
-      data:
-        first: 33
-        second: ac5a3200
-    minebot_front_upperleg 1:
-      data:
-        first: 1
-        second: a2860100
-      data:
-        first: 4
-        second: 821a0600
-      data:
-        first: 23
-        second: 62182300
-      data:
-        first: 33
-        second: a25a3200
-    minebot_head:
-      data:
-        first: 1
-        second: aa860100
-      data:
-        first: 4
-        second: 8a1a0600
-      data:
-        first: 23
-        second: 6a182300
-      data:
-        first: 33
-        second: aa5a3200
-    minebot_left_lowerleg:
-      data:
-        first: 1
-        second: b4860100
-      data:
-        first: 4
-        second: 941a0600
-      data:
-        first: 23
-        second: 72182300
-      data:
-        first: 33
-        second: b25a3200
-    minebot_left_upperleg:
-      data:
-        first: 1
-        second: a6860100
-      data:
-        first: 4
-        second: 861a0600
-      data:
-        first: 23
-        second: 66182300
-      data:
-        first: 33
-        second: a65a3200
-    minebot_main:
-      data:
-        first: 1
-        second: b2860100
-      data:
-        first: 4
-        second: 921a0600
-      data:
-        first: 23
-        second: 70182300
-      data:
-        first: 33
-        second: b05a3200
-    minebot_right_lowerleg:
-      data:
-        first: 1
-        second: a8860100
-      data:
-        first: 4
-        second: 881a0600
-      data:
-        first: 23
-        second: 68182300
-      data:
-        first: 33
-        second: a85a3200
-    minebot_right_upperleg:
-      data:
-        first: 1
-        second: b0860100
-      data:
-        first: 4
-        second: 901a0600
-      data:
-        first: 23
-        second: 6e182300
-      data:
-        first: 33
-        second: ae5a3200
+    tangentImportMode: 4
+    normalCalculationMode: 0
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips:
+  - 7e212db0aa2c00b448aa511ece336f20
+  - a13fed205b1fa3942abfab7ba21463ec
+  - 1da85f72a7a82bc4eabdbd8f0683bde2
+  - b667956babf1f0446a76fa8b99404ab8
+  - f8136785e54fd1d459d2a3a0849fe770
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 0.01
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 1
+  humanoidOversampling: 1
+  avatarSetup: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
Unity/Assets/Model/Module/Pathfinding/AstarPathfindingProject/Generators/Utilities/RecastMeshGatherer.cs

@@ -210,8 +210,8 @@ namespace Pathfinding.Recast {
 				return;
 
 			// Original heightmap size
-			int heightmapWidth = terrainData.heightmapWidth;
-			int heightmapDepth = terrainData.heightmapHeight;
+			int heightmapWidth = terrainData.heightmapResolution;
+			int heightmapDepth = terrainData.heightmapResolution;
 
 			// Sample the terrain heightmap
 			float[, ] heights = terrainData.GetHeights(0, 0, heightmapWidth, heightmapDepth);

BIN
Unity/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll


+ 19 - 3
Unity/Packages/manifest.json

@@ -1,9 +1,22 @@
 {
   "dependencies": {
+    "com.unity.2d.sprite": "1.0.0",
+    "com.unity.2d.tilemap": "1.0.0",
+    "com.unity.ads": "2.0.8",
+    "com.unity.analytics": "3.3.4",
     "com.unity.assetbundlebrowser": "1.7.0",
-    "com.unity.package-manager-ui": "2.0.7",
-    "com.unity.textmeshpro": "1.4.1",
+    "com.unity.collab-proxy": "1.2.16",
+    "com.unity.ide.rider": "1.1.4",
+    "com.unity.ide.vscode": "1.1.3",
+    "com.unity.multiplayer-hlapi": "1.0.4",
+    "com.unity.purchasing": "2.0.6",
+    "com.unity.test-framework": "1.1.9",
+    "com.unity.textmeshpro": "2.0.1",
+    "com.unity.timeline": "1.2.9",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.xr.legacyinputhelpers": "1.3.8",
     "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",
     "com.unity.modules.audio": "1.0.0",
@@ -22,6 +35,7 @@
     "com.unity.modules.ui": "1.0.0",
     "com.unity.modules.uielements": "1.0.0",
     "com.unity.modules.umbra": "1.0.0",
+    "com.unity.modules.unityanalytics": "1.0.0",
     "com.unity.modules.unitywebrequest": "1.0.0",
     "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
     "com.unity.modules.unitywebrequestaudio": "1.0.0",
@@ -29,6 +43,8 @@
     "com.unity.modules.unitywebrequestwww": "1.0.0",
     "com.unity.modules.vehicles": "1.0.0",
     "com.unity.modules.video": "1.0.0",
-    "com.unity.modules.wind": "1.0.0"
+    "com.unity.modules.vr": "1.0.0",
+    "com.unity.modules.wind": "1.0.0",
+    "com.unity.modules.xr": "1.0.0"
   }
 }

+ 17 - 3
Unity/ProjectSettings/EditorSettings.asset

@@ -3,19 +3,33 @@
 --- !u!159 &1
 EditorSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 9
   m_ExternalVersionControlSupport: Visible Meta Files
   m_SerializationMode: 2
   m_LineEndingsForNewScripts: 1
   m_DefaultBehaviorMode: 0
+  m_PrefabRegularEnvironment: {fileID: 0}
+  m_PrefabUIEnvironment: {fileID: 0}
   m_SpritePackerMode: 2
   m_SpritePackerPaddingPower: 1
   m_EtcTextureCompressorBehavior: 0
   m_EtcTextureFastCompressor: 2
   m_EtcTextureNormalCompressor: 2
   m_EtcTextureBestCompressor: 5
-  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef
+  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;asmref
   m_ProjectGenerationRootNamespace: 
-  m_UserGeneratedProjectSuffix: 
   m_CollabEditorSettings:
     inProgressEnabled: 1
+  m_EnableTextureStreamingInEditMode: 1
+  m_EnableTextureStreamingInPlayMode: 1
+  m_AsyncShaderCompilation: 1
+  m_EnterPlayModeOptionsEnabled: 0
+  m_EnterPlayModeOptions: 3
+  m_ShowLightmapResolutionOverlay: 1
+  m_UseLegacyProbeSampleCount: 1
+  m_AssetPipelineMode: 1
+  m_CacheServerMode: 0
+  m_CacheServerEndpoint: 
+  m_CacheServerNamespacePrefix: default
+  m_CacheServerEnableDownload: 1
+  m_CacheServerEnableUpload: 1

+ 2 - 1
Unity/ProjectSettings/ProjectVersion.txt

@@ -1 +1,2 @@
-m_EditorVersion: 2018.4.10f1
+m_EditorVersion: 2019.3.0f5
+m_EditorVersionWithRevision: 2019.3.0f5 (44796c9d3c2c)

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


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


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


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


+ 1 - 5
Unity/Unity.sln

@@ -1,5 +1,4 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
+Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ThirdParty", "Unity.ThirdParty.csproj", "{E15BADD2-3A26-309A-AB0F-DC5B08044350}"
 EndProject
@@ -35,7 +34,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Assembly-CSharp.csproj
-	EndGlobalSection
 EndGlobal

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