Skip to content

Version 1.7.3, #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Runtime/Clip/Kinetix.Clip.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion Runtime/Const/KinetixConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Managers/AccountManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,9 @@ public async void RetakeEmoteProcess(string _ProcessId, Action<string> _OnSucces
{
try
{
SdkApiProcess process = await KinetixCoreBehaviour.ServiceLocator.Get<ProviderService>().RetakeEmote(_ProcessId);
SdkTokenValidityResult process = await KinetixCoreBehaviour.ServiceLocator.Get<ProviderService>().RetakeEmote(_ProcessId);

_OnSuccess?.Invoke(process.Uuid.ToString());
_OnSuccess?.Invoke(process.url);
}
catch (Exception e)
{
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Providers/Providers/IProviderWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ public interface IProviderWrapper
public Task<AnimationMetadata> GetAnimationMetadataOfAvatar(AnimationIds _AnimationIds, string _AvatarId, AnimationMetadata _Metadata = null);
public Task<SdkApiProcess[]> GetAnimationProcessesOfOwner(string _AccountId);
public Task<SdkApiProcess> ValidateEmote(string _EmoteId);
public Task<SdkApiProcess> RetakeEmote(string _EmoteId);
public Task<SdkTokenValidityResult> RetakeEmote(string _EmoteId);
}

Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
namespace Kinetix.Internal
{
internal class SdkTokenValidityResult
public class SdkTokenValidityResult
{
public int expireIn;
public System.DateTime expire;
public string url;
}
}
6 changes: 3 additions & 3 deletions Runtime/Providers/Providers/SdkApi/SdkApiProviderWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ public async Task<SdkApiProcess> ValidateEmote(string _ProcessId)
return await tcs.Task;
}

public async Task<SdkApiProcess> RetakeEmote(string _ProcessId)
public async Task<SdkTokenValidityResult> RetakeEmote(string _ProcessId)
{
TaskCompletionSource<SdkApiProcess> tcs = new TaskCompletionSource<SdkApiProcess>();
TaskCompletionSource<SdkTokenValidityResult> tcs = new TaskCompletionSource<SdkTokenValidityResult>();

string url = KinetixConstants.c_SDK_API_URL + "/v1/process/" + _ProcessId + "/retake";

Expand All @@ -243,7 +243,7 @@ public async Task<SdkApiProcess> RetakeEmote(string _ProcessId)
if (!response.IsSuccess)
throw new Exception(response.Error);

tcs.SetResult(JsonConvert.DeserializeObject<SdkApiProcess>(response.Content));
tcs.SetResult(JsonConvert.DeserializeObject<SdkTokenValidityResult>(response.Content));
}
catch (Exception e)
{
Expand Down
4 changes: 0 additions & 4 deletions Runtime/Retarget/CompilationLog.txt

This file was deleted.

7 changes: 0 additions & 7 deletions Runtime/Retarget/CompilationLog.txt.meta

This file was deleted.

Binary file modified Runtime/Retarget/Kinetix.Retarget.dll
Binary file not shown.
Binary file modified Runtime/Retarget/Webgl/Kinetix.Retarget.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion Runtime/Services/ProviderService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public async Task<SdkApiProcess> ValidateEmote(string _EmoteId)
}

/// <summary>
public async Task<SdkApiProcess> RetakeEmote(string _EmoteId)
public async Task<SdkTokenValidityResult> RetakeEmote(string _EmoteId)
{
try
{
Expand Down
Binary file modified Runtime/Utils/Log/Kinetix.Internal.Utils.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.kinetix.coreweb2",
"version": "1.7.2",
"version": "1.7.3",
"displayName": "Kinetix Core",
"description": "Kinetix Core SDK",
"samples": [
Expand Down
Loading