File tree Expand file tree Collapse file tree 2 files changed +5
-12
lines changed Expand file tree Collapse file tree 2 files changed +5
-12
lines changed Original file line number Diff line number Diff line change @@ -526,7 +526,7 @@ private void ReadAssets()
526
526
Progress . Reset ( ) ;
527
527
foreach ( var assetsFile in assetsFileList )
528
528
{
529
- JsonConverterHelper . PPtrConverter . AssetsFile = assetsFile ;
529
+ JsonConverterHelper . AssetsFile = assetsFile ;
530
530
foreach ( var objectInfo in assetsFile . m_Objects )
531
531
{
532
532
var objectReader = new ObjectReader ( assetsFile . reader , assetsFile , objectInfo ) ;
Original file line number Diff line number Diff line change @@ -6,10 +6,10 @@ namespace AssetStudio
6
6
{
7
7
public static partial class JsonConverterHelper
8
8
{
9
+ public static SerializedFile AssetsFile { get ; set ; }
10
+
9
11
public class PPtrConverter : JsonConverterFactory
10
12
{
11
- public static SerializedFile AssetsFile ;
12
-
13
13
public override bool CanConvert ( Type typeToConvert )
14
14
{
15
15
if ( ! typeToConvert . IsGenericType )
@@ -22,24 +22,17 @@ public override bool CanConvert(Type typeToConvert)
22
22
public override JsonConverter CreateConverter ( Type type , JsonSerializerOptions options )
23
23
{
24
24
var elementType = type . GetGenericArguments ( ) [ 0 ] ;
25
- var converter = ( JsonConverter ) Activator . CreateInstance ( typeof ( PPtrConverter < > ) . MakeGenericType ( elementType ) , AssetsFile ) ;
25
+ var converter = ( JsonConverter ) Activator . CreateInstance ( typeof ( PPtrConverter < > ) . MakeGenericType ( elementType ) ) ;
26
26
return converter ;
27
27
}
28
28
}
29
29
30
30
private class PPtrConverter < T > : JsonConverter < PPtr < T > > where T : Object
31
31
{
32
- private readonly SerializedFile _assetsFile ;
33
-
34
- public PPtrConverter ( SerializedFile assetsFile )
35
- {
36
- _assetsFile = assetsFile ;
37
- }
38
-
39
32
public override PPtr < T > Read ( ref Utf8JsonReader reader , Type typeToConvert , JsonSerializerOptions options )
40
33
{
41
34
var pptrObj = JsonSerializer . Deserialize < PPtr < T > > ( ref reader , new JsonSerializerOptions { IncludeFields = true } ) ;
42
- pptrObj . AssetsFile = _assetsFile ;
35
+ pptrObj . AssetsFile = AssetsFile ;
43
36
return pptrObj ;
44
37
}
45
38
You can’t perform that action at this time.
0 commit comments