a.samsonkin
/
DotRecastNetSim
forked from bit/DotRecastNetSim
1
0
Fork 0
Code Pull Requests Activity

change json library for unity3d

This commit is contained in:
ikpil 2023-08-05 20:21:53 +09:00
parent 8ed6a86113
commit d19133268e
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/DotRecast.Core/DotRecast.Core.csproj
View File

@ -4,8 +4,5 @@
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Text.Json" Version="7.0.3" />
</ItemGroup>
</Project> </Project>

4
src/DotRecast.Detour.Extras/DotRecast.Detour.Extras.csproj
View File

@ -9,4 +9,8 @@
<ProjectReference Include="..\DotRecast.Detour\DotRecast.Detour.csproj" /> <ProjectReference Include="..\DotRecast.Detour\DotRecast.Detour.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
</Project> </Project>

14
src/DotRecast.Detour.Extras/Unity/Astar/GraphMetaReader.cs
View File

@ -18,7 +18,7 @@ freely, subject to the following restrictions:
using System.IO; using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Text.Json; using Newtonsoft.Json;
namespace DotRecast.Detour.Extras.Unity.Astar namespace DotRecast.Detour.Extras.Unity.Astar
{ {
@ -29,13 +29,13 @@ namespace DotRecast.Detour.Extras.Unity.Astar
ZipArchiveEntry entry = file.GetEntry(filename); ZipArchiveEntry entry = file.GetEntry(filename);
using StreamReader reader = new StreamReader(entry.Open()); using StreamReader reader = new StreamReader(entry.Open());
JsonSerializerOptions options = new JsonSerializerOptions // for unity3d
{
PropertyNamingPolicy = JsonNamingPolicy.CamelCase
};
var json = reader.ReadToEnd(); var json = reader.ReadToEnd();
return JsonSerializer.Deserialize<GraphMeta>(json, options); return JsonConvert.DeserializeObject<GraphMeta>(json);
// var settings = new JsonSerializerSettings();
// settings.ContractResolver = new CamelCasePropertyNamesContractResolver();
//return JsonConvert.DeserializeObject<GraphMeta>(json, settings);
} }
} }
} }

6
src/DotRecast.Detour.Extras/Unity/Astar/MetaReader.cs
View File

@ -19,9 +19,9 @@ freely, subject to the following restrictions:
using System; using System;
using System.IO; using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Text.Json;
using System.Text.Json.Nodes;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Newtonsoft.Json;
namespace DotRecast.Detour.Extras.Unity.Astar namespace DotRecast.Detour.Extras.Unity.Astar
{ {
@ -41,7 +41,7 @@ namespace DotRecast.Detour.Extras.Unity.Astar
var regex = new Regex(pattern); var regex = new Regex(pattern);
json = regex.Replace(json, replacement); json = regex.Replace(json, replacement);
var meta = JsonSerializer.Deserialize<Meta>(json); var meta = JsonConvert.DeserializeObject<Meta>(json);
if (!meta.IsSupportedType()) if (!meta.IsSupportedType())
{ {
throw new ArgumentException("Unsupported graph type " + string.Join(", ", meta.typeNames)); throw new ArgumentException("Unsupported graph type " + string.Join(", ", meta.typeNames));