From 14326c9f76b561d028f5d7ad0350334bfb1f5e23 Mon Sep 17 00:00:00 2001 From: Harrison Hough Date: Wed, 20 Dec 2023 11:05:18 +0000 Subject: [PATCH] Merge branch 'hotfix/v4.1.2' into main --- CHANGELOG.md | 10 ++++++++++ Runtime/AvatarCreator/Data/AvatarProperties.cs | 2 +- Runtime/AvatarCreator/JsonHelpers/CategoryConverter.cs | 2 ++ .../JsonHelpers/PartnerAssetsDictionaryConverter.cs | 2 +- Runtime/Data/ApplicationData.cs | 2 +- package.json | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c47e9690..543fe614 100644 --- 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 index 05f990f2..4c910513 100644 --- 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 Assets; public string Base64Image; } diff --git a/Runtime/AvatarCreator/JsonHelpers/CategoryConverter.cs b/Runtime/AvatarCreator/JsonHelpers/CategoryConverter.cs index 34e86ffd..b3290d0b 100644 --- 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 index 78530d9e..31a2245e 100644 --- a/Runtime/AvatarCreator/JsonHelpers/PartnerAssetsDictionaryConverter.cs +++ b/Runtime/AvatarCreator/JsonHelpers/PartnerAssetsDictionaryConverter.cs @@ -7,7 +7,7 @@ namespace ReadyPlayerMe.AvatarCreator { [Preserve] - public class CategoryDictionaryConverter : JsonConverter> + public class PartnerAssetsDictionaryConverter : JsonConverter> { public override void WriteJson(JsonWriter writer, Dictionary value, JsonSerializer serializer) { diff --git a/Runtime/Data/ApplicationData.cs b/Runtime/Data/ApplicationData.cs index b45c8b19..d392afe5 100644 --- 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 index 361f6885..a8c0d83d 100644 --- 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",