From 9f9527863a684ba82d941c1db5555a248ffad641 Mon Sep 17 00:00:00 2001 From: Robin <1121080+rYuuk@users.noreply.github.com> Date: Thu, 14 Dec 2023 13:59:57 +0100 Subject: [PATCH] Merge branch 'hotfix/v4.1.1' into main --- Runtime/AvatarCreator/JsonHelpers/BodyTypeConverter.cs | 2 ++ Runtime/AvatarCreator/JsonHelpers/GenderConverter.cs | 2 ++ .../JsonHelpers/PartnerAssetsDictionaryConverter.cs | 2 ++ Runtime/Data/ApplicationData.cs | 2 +- package.json | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Runtime/AvatarCreator/JsonHelpers/BodyTypeConverter.cs b/Runtime/AvatarCreator/JsonHelpers/BodyTypeConverter.cs index 8304abd3..b6d30fcd 100644 --- 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 { private const string FULL_BODY = "fullbody"; diff --git a/Runtime/AvatarCreator/JsonHelpers/GenderConverter.cs b/Runtime/AvatarCreator/JsonHelpers/GenderConverter.cs index ad987750..b0eb64bd 100644 --- 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 index 893b5388..78530d9e 100644 --- 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> { public override void WriteJson(JsonWriter writer, Dictionary value, JsonSerializer serializer) diff --git a/Runtime/Data/ApplicationData.cs b/Runtime/Data/ApplicationData.cs index da579fe3..b45c8b19 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.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 index 2fa472ce..361f6885 100644 --- 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",