Merge branch 'hotfix/v4.1.2' into main

readyplayerme · Dec 20, 2023 · 14326c9 · 14326c9
1 parent 9f95278
commit 14326c9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.1.2] - 2023.12.20
+
+### Fixed
+- add preserve attribute to CategoryConverter in AvatarCreator by @harrisonHough in [#193](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/193)
+
+## [4.1.1] - 2023.11.29
+
+### Fixed
+- fixed json converters in AvatarCreator getting stripped on android or webgl builds by @rYuuk in [#188](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/188)
+
 ## [4.1.0] - 2023.11.29
 
 ### Updated

diff --git a/Runtime/AvatarCreator/Data/AvatarProperties.cs b/Runtime/AvatarCreator/Data/AvatarProperties.cs
@@ -14,7 +14,7 @@ public struct AvatarProperties
         public OutfitGender Gender;
         [JsonConverter(typeof(BodyTypeConverter))]
         public BodyType BodyType;
-        [JsonConverter(typeof(CategoryDictionaryConverter))]
+        [JsonConverter(typeof(PartnerAssetsDictionaryConverter))]
         public Dictionary<Category, object> Assets;
         public string Base64Image;
     }

diff --git a/Runtime/AvatarCreator/JsonHelpers/CategoryConverter.cs b/Runtime/AvatarCreator/JsonHelpers/CategoryConverter.cs
@@ -1,9 +1,11 @@
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using UnityEngine.Scripting;
 
 namespace ReadyPlayerMe.AvatarCreator
 {
+    [Preserve]
     public class CategoryConverter : JsonConverter
     {
         public override bool CanConvert(Type objectType)

diff --git a/Runtime/AvatarCreator/JsonHelpers/PartnerAssetsDictionaryConverter.cs b/Runtime/AvatarCreator/JsonHelpers/PartnerAssetsDictionaryConverter.cs
@@ -7,7 +7,7 @@
 namespace ReadyPlayerMe.AvatarCreator
 {
     [Preserve]
-    public class CategoryDictionaryConverter : JsonConverter<Dictionary<Category, object>>
+    public class PartnerAssetsDictionaryConverter : JsonConverter<Dictionary<Category, object>>
     {
         public override void WriteJson(JsonWriter writer, Dictionary<Category, 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.1";
+        private const string SDK_VERSION = "v4.1.2";
         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.1",
+  "version": "4.1.2",
   "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",