diff --git a/Runtime/Clip/Kinetix.Clip.dll b/Runtime/Clip/Kinetix.Clip.dll index 1fd1077..7aa72d7 100644 Binary files a/Runtime/Clip/Kinetix.Clip.dll and b/Runtime/Clip/Kinetix.Clip.dll differ diff --git a/Runtime/Const/KinetixConstants.cs b/Runtime/Const/KinetixConstants.cs index b45d83a..1e073a5 100644 --- a/Runtime/Const/KinetixConstants.cs +++ b/Runtime/Const/KinetixConstants.cs @@ -8,7 +8,7 @@ namespace Kinetix.Internal { public static class KinetixConstants { - public const string version = "1.7.2"; + public const string version = "1.7.3"; public static bool C_ShouldUGCBeAvailable = true; #if STAGING_KINETIX diff --git a/Runtime/Managers/AccountManager.cs b/Runtime/Managers/AccountManager.cs index 00109f4..fbff846 100644 --- a/Runtime/Managers/AccountManager.cs +++ b/Runtime/Managers/AccountManager.cs @@ -222,9 +222,9 @@ public async void RetakeEmoteProcess(string _ProcessId, Action _OnSucces { try { - SdkApiProcess process = await KinetixCoreBehaviour.ServiceLocator.Get().RetakeEmote(_ProcessId); + SdkTokenValidityResult process = await KinetixCoreBehaviour.ServiceLocator.Get().RetakeEmote(_ProcessId); - _OnSuccess?.Invoke(process.Uuid.ToString()); + _OnSuccess?.Invoke(process.url); } catch (Exception e) { diff --git a/Runtime/Providers/Providers/IProviderWrapper.cs b/Runtime/Providers/Providers/IProviderWrapper.cs index 9beb5f5..ade165e 100644 --- a/Runtime/Providers/Providers/IProviderWrapper.cs +++ b/Runtime/Providers/Providers/IProviderWrapper.cs @@ -17,6 +17,6 @@ public interface IProviderWrapper public Task GetAnimationMetadataOfAvatar(AnimationIds _AnimationIds, string _AvatarId, AnimationMetadata _Metadata = null); public Task GetAnimationProcessesOfOwner(string _AccountId); public Task ValidateEmote(string _EmoteId); - public Task RetakeEmote(string _EmoteId); + public Task RetakeEmote(string _EmoteId); } diff --git a/Runtime/Providers/Providers/SdkApi/ApiClasses/SdkTokenValidityResult.cs b/Runtime/Providers/Providers/SdkApi/ApiClasses/SdkTokenValidityResult.cs index 45167ea..23da65f 100644 --- a/Runtime/Providers/Providers/SdkApi/ApiClasses/SdkTokenValidityResult.cs +++ b/Runtime/Providers/Providers/SdkApi/ApiClasses/SdkTokenValidityResult.cs @@ -1,8 +1,9 @@ namespace Kinetix.Internal { - internal class SdkTokenValidityResult + public class SdkTokenValidityResult { public int expireIn; public System.DateTime expire; + public string url; } } diff --git a/Runtime/Providers/Providers/SdkApi/SdkApiProviderWrapper.cs b/Runtime/Providers/Providers/SdkApi/SdkApiProviderWrapper.cs index 9d2619f..330f3ef 100644 --- a/Runtime/Providers/Providers/SdkApi/SdkApiProviderWrapper.cs +++ b/Runtime/Providers/Providers/SdkApi/SdkApiProviderWrapper.cs @@ -220,9 +220,9 @@ public async Task ValidateEmote(string _ProcessId) return await tcs.Task; } - public async Task RetakeEmote(string _ProcessId) + public async Task RetakeEmote(string _ProcessId) { - TaskCompletionSource tcs = new TaskCompletionSource(); + TaskCompletionSource tcs = new TaskCompletionSource(); string url = KinetixConstants.c_SDK_API_URL + "/v1/process/" + _ProcessId + "/retake"; @@ -243,7 +243,7 @@ public async Task RetakeEmote(string _ProcessId) if (!response.IsSuccess) throw new Exception(response.Error); - tcs.SetResult(JsonConvert.DeserializeObject(response.Content)); + tcs.SetResult(JsonConvert.DeserializeObject(response.Content)); } catch (Exception e) { diff --git a/Runtime/Retarget/CompilationLog.txt b/Runtime/Retarget/CompilationLog.txt deleted file mode 100644 index cd75247..0000000 --- a/Runtime/Retarget/CompilationLog.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Starting compiling Kinetix.Retarget.dll -D:\UnityInstall\2020.3.33f1\Editor\Data\Tools\RoslynScripts\unity_csc.bat /noconfig @Temp/UnityTempFile-e6f509a1f229b4c4eb0707b2a25878dc -# Starting IL post processing on Kinetix.Retarget.dll -D:/UnityInstall/2020.3.33f1/Editor/Data/MonoBleedingEdge/bin/mono.exe D:/UnityInstall/2020.3.33f1/Editor/Data/Tools/ILPostProcessorRunner/ILPostProcessorRunner.exe @D:/Kinetix/kinetix-emote-wheel/Temp/UnityTempFile-1aa6f06e8b3b7704f813ba73369a5ee0 diff --git a/Runtime/Retarget/CompilationLog.txt.meta b/Runtime/Retarget/CompilationLog.txt.meta deleted file mode 100644 index 32ee018..0000000 --- a/Runtime/Retarget/CompilationLog.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a887c2c7b6104f24397390e0f8e19801 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/Retarget/Kinetix.Retarget.dll b/Runtime/Retarget/Kinetix.Retarget.dll index c41eb89..b6ff4f2 100644 Binary files a/Runtime/Retarget/Kinetix.Retarget.dll and b/Runtime/Retarget/Kinetix.Retarget.dll differ diff --git a/Runtime/Retarget/Webgl/Kinetix.Retarget.dll b/Runtime/Retarget/Webgl/Kinetix.Retarget.dll index e4a0e08..b93b38e 100644 Binary files a/Runtime/Retarget/Webgl/Kinetix.Retarget.dll and b/Runtime/Retarget/Webgl/Kinetix.Retarget.dll differ diff --git a/Runtime/Services/ProviderService.cs b/Runtime/Services/ProviderService.cs index ab3a555..8cae479 100644 --- a/Runtime/Services/ProviderService.cs +++ b/Runtime/Services/ProviderService.cs @@ -107,7 +107,7 @@ public async Task ValidateEmote(string _EmoteId) } /// - public async Task RetakeEmote(string _EmoteId) + public async Task RetakeEmote(string _EmoteId) { try { diff --git a/Runtime/Utils/Log/Kinetix.Internal.Utils.dll b/Runtime/Utils/Log/Kinetix.Internal.Utils.dll index 62becfb..3ee9148 100644 Binary files a/Runtime/Utils/Log/Kinetix.Internal.Utils.dll and b/Runtime/Utils/Log/Kinetix.Internal.Utils.dll differ diff --git a/package.json b/package.json index a6b912a..44b8d45 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.kinetix.coreweb2", - "version": "1.7.2", + "version": "1.7.3", "displayName": "Kinetix Core", "description": "Kinetix Core SDK", "samples": [