Skip to content

Commit 9890407

Browse files
authored
Merge pull request #25 from git-kinetix/develop
Version 1.7.3,
2 parents 946685d + 8ee3ac0 commit 9890407

File tree

13 files changed

+11
-21
lines changed

13 files changed

+11
-21
lines changed

Runtime/Clip/Kinetix.Clip.dll

0 Bytes
Binary file not shown.

Runtime/Const/KinetixConstants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Kinetix.Internal
88
{
99
public static class KinetixConstants
1010
{
11-
public const string version = "1.7.2";
11+
public const string version = "1.7.3";
1212
public static bool C_ShouldUGCBeAvailable = true;
1313

1414
#if STAGING_KINETIX

Runtime/Managers/AccountManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ public async void RetakeEmoteProcess(string _ProcessId, Action<string> _OnSucces
222222
{
223223
try
224224
{
225-
SdkApiProcess process = await KinetixCoreBehaviour.ServiceLocator.Get<ProviderService>().RetakeEmote(_ProcessId);
225+
SdkTokenValidityResult process = await KinetixCoreBehaviour.ServiceLocator.Get<ProviderService>().RetakeEmote(_ProcessId);
226226

227-
_OnSuccess?.Invoke(process.Uuid.ToString());
227+
_OnSuccess?.Invoke(process.url);
228228
}
229229
catch (Exception e)
230230
{

Runtime/Providers/Providers/IProviderWrapper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ public interface IProviderWrapper
1717
public Task<AnimationMetadata> GetAnimationMetadataOfAvatar(AnimationIds _AnimationIds, string _AvatarId, AnimationMetadata _Metadata = null);
1818
public Task<SdkApiProcess[]> GetAnimationProcessesOfOwner(string _AccountId);
1919
public Task<SdkApiProcess> ValidateEmote(string _EmoteId);
20-
public Task<SdkApiProcess> RetakeEmote(string _EmoteId);
20+
public Task<SdkTokenValidityResult> RetakeEmote(string _EmoteId);
2121
}
2222

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
namespace Kinetix.Internal
22
{
3-
internal class SdkTokenValidityResult
3+
public class SdkTokenValidityResult
44
{
55
public int expireIn;
66
public System.DateTime expire;
7+
public string url;
78
}
89
}

Runtime/Providers/Providers/SdkApi/SdkApiProviderWrapper.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ public async Task<SdkApiProcess> ValidateEmote(string _ProcessId)
220220
return await tcs.Task;
221221
}
222222

223-
public async Task<SdkApiProcess> RetakeEmote(string _ProcessId)
223+
public async Task<SdkTokenValidityResult> RetakeEmote(string _ProcessId)
224224
{
225-
TaskCompletionSource<SdkApiProcess> tcs = new TaskCompletionSource<SdkApiProcess>();
225+
TaskCompletionSource<SdkTokenValidityResult> tcs = new TaskCompletionSource<SdkTokenValidityResult>();
226226

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

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

246-
tcs.SetResult(JsonConvert.DeserializeObject<SdkApiProcess>(response.Content));
246+
tcs.SetResult(JsonConvert.DeserializeObject<SdkTokenValidityResult>(response.Content));
247247
}
248248
catch (Exception e)
249249
{

Runtime/Retarget/CompilationLog.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

Runtime/Retarget/CompilationLog.txt.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

Runtime/Retarget/Kinetix.Retarget.dll

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

Runtime/Services/ProviderService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public async Task<SdkApiProcess> ValidateEmote(string _EmoteId)
107107
}
108108

109109
/// <summary>
110-
public async Task<SdkApiProcess> RetakeEmote(string _EmoteId)
110+
public async Task<SdkTokenValidityResult> RetakeEmote(string _EmoteId)
111111
{
112112
try
113113
{
-1 KB
Binary file not shown.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.kinetix.coreweb2",
3-
"version": "1.7.2",
3+
"version": "1.7.3",
44
"displayName": "Kinetix Core",
55
"description": "Kinetix Core SDK",
66
"samples": [

0 commit comments

Comments
 (0)