Merge branch 'main' into develop

# Conflicts: # Runtime/AvatarCreator/JsonHelpers/PartnerAssetsDictionaryConverter.cs
readyplayerme · Dec 14, 2023 · 6b2f17b · 6b2f17b
2 parents dafbb07 + 9f95278
commit 6b2f17b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/Runtime/AvatarCreator/JsonHelpers/BodyTypeConverter.cs b/Runtime/AvatarCreator/JsonHelpers/BodyTypeConverter.cs
@@ -2,9 +2,11 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using ReadyPlayerMe.Core;
+using UnityEngine.Scripting;
 
 namespace ReadyPlayerMe.AvatarCreator
 {
+    [Preserve]
     public class BodyTypeConverter : JsonConverter<BodyType>
     {
         private const string FULL_BODY = "fullbody";

diff --git a/Runtime/AvatarCreator/JsonHelpers/GenderConverter.cs b/Runtime/AvatarCreator/JsonHelpers/GenderConverter.cs
@@ -2,9 +2,11 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using ReadyPlayerMe.Core;
+using UnityEngine.Scripting;
 
 namespace ReadyPlayerMe.AvatarCreator
 {
+    [Preserve]
     public class GenderConverter : JsonConverter
     {
         private const string MALE = "male";

diff --git a/Runtime/AvatarCreator/JsonHelpers/PartnerAssetsDictionaryConverter.cs b/Runtime/AvatarCreator/JsonHelpers/PartnerAssetsDictionaryConverter.cs
@@ -2,9 +2,11 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using UnityEngine.Scripting;
 
 namespace ReadyPlayerMe.AvatarCreator
 {
+    [Preserve]
     public class CategoryDictionaryConverter : JsonConverter<Dictionary<AssetType, object>>
     {
         public override void WriteJson(JsonWriter writer, Dictionary<AssetType, object> value, JsonSerializer serializer)

diff --git a/Runtime/Data/ApplicationData.cs b/Runtime/Data/ApplicationData.cs
@@ -6,7 +6,7 @@ namespace ReadyPlayerMe.Core
 {
     public static class ApplicationData
     {
-        private const string SDK_VERSION = "v4.1.0";
+        private const string SDK_VERSION = "v4.1.1";
         private const string TAG = "ApplicationData";
         private const string DEFAULT_RENDER_PIPELINE = "Built-In Render Pipeline";
         private static readonly AppData Data;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.readyplayerme.core",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "displayName": "Ready Player Me Core",
   "description": "This Module contains all the core functionality required for using Ready Player Me avatars in Unity, including features such as: \n - Module management and automatic package setup logic\n - Avatar loading from .glb files \n - Avatar creation \n - Avatar and 2D render requests \n - Optional Analytics\n - Custom editor windows\n - Sample scenes and assets",
   "unity": "2020.3",