fix: now 'clear save' works for properties with [JsonProperty]

serg.morozov · serg.morozov · commit 76fb0693f727 · 2023-01-05T15:07:38.000+03:00
diff --git a/Assets/com.nuclearband.sodatabase/Editor/ScriptableObjectDatabaseEditorWindow.cs b/Assets/com.nuclearband.sodatabase/Editor/ScriptableObjectDatabaseEditorWindow.cs
@@ -45,6 +45,15 @@ private static void ClearSave()
                         field.SetValue(model, default);
                 }
 
+                var properties =
+                    typeInfo.GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                foreach (var property in properties)
+                {
+                    var attributes = property.GetCustomAttributes(typeof(JsonPropertyAttribute), false);
+                    if (attributes.Length > 0)
+                        property.SetValue(model, default);
+                }
+
                 EditorUtility.SetDirty(model);
             }
 
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -94,6 +94,7 @@ PlayerSettings:
   useMacAppStoreValidation: 0
   macAppStoreCategory: public.app-category.games
   gpuSkinning: 0
+  meshDeformation: 0
   xboxPIXTextureCapture: 0
   xboxEnableAvatar: 0
   xboxEnableKinect: 0
@@ -147,7 +148,7 @@ PlayerSettings:
   enableFrameTimingStats: 0
   enableOpenGLProfilerGPURecorders: 1
   useHDRDisplay: 0
-  D3DHDRBitDepth: 0
+  hdrBitDepth: 0
   m_ColorGamuts: 00000000
   targetPixelDensity: 30
   resolutionScalingMode: 0
@@ -171,7 +172,7 @@ PlayerSettings:
   ForceInternetPermission: 0
   ForceSDCardPermission: 0
   CreateWallpaper: 0
-  APKExpansionFiles: 0
+  androidSplitApplicationBinary: 0
   keepLoadedShadersAlive: 0
   StripUnusedMeshComponents: 0
   strictShaderVariantMatching: 0
@@ -776,13 +777,14 @@ PlayerSettings:
   webGLPowerPreference: 2
   scriptingDefineSymbols:
     Android: ODIN_INSPECTOR;ODIN_INSPECTOR_3
-    Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3
+    Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend:
     Android: 0
   il2cppCompilerConfiguration: {}
   il2cppCodeGeneration: {}
+  il2cppStacktraceInformation: {}
   managedStrippingLevel: {}
   incrementalIl2cppBuild: {}
   suppressCommonWarnings: 1
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2023.1.0a21
-m_EditorVersionWithRevision: 2023.1.0a21 (1e5025d78c0b)
+ m_EditorVersion: 2023.1.0a25
+m_EditorVersionWithRevision: 2023.1.0a25 (eac607654885)

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,15 @@ private static void ClearSave()`
`45`	`45`	`field.SetValue(model, default);`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ var properties =`
	`49`	`+ typeInfo.GetProperties(BindingFlags.Public \| BindingFlags.NonPublic \| BindingFlags.Instance);`
	`50`	`+ foreach (var property in properties)`
	`51`	`+ {`
	`52`	`+ var attributes = property.GetCustomAttributes(typeof(JsonPropertyAttribute), false);`
	`53`	`+ if (attributes.Length > 0)`
	`54`	`+ property.SetValue(model, default);`
	`55`	`+ }`
	`56`	`+`
`48`	`57`	`EditorUtility.SetDirty(model);`
`49`	`58`	`}`
`50`	`59`