From ddc71b7d8e30e96affface56b4313e313b94c2b2 Mon Sep 17 00:00:00 2001 From: kookroach Date: Tue, 6 Apr 2021 23:54:32 +0200 Subject: [PATCH] test --- ReallifeGamemode.Client/util/animationSync.ts | 6 +++--- ReallifeGamemode.Server/Util/AnimationSync.cs | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ReallifeGamemode.Client/util/animationSync.ts b/ReallifeGamemode.Client/util/animationSync.ts index 3305218c..a56f8f6f 100644 --- a/ReallifeGamemode.Client/util/animationSync.ts +++ b/ReallifeGamemode.Client/util/animationSync.ts @@ -80,15 +80,15 @@ }); }, 100); - mp.events.add("SERVER:QueueAnimations", (nextAnimations, currentAnimation) => { + mp.events.add("SERVER:QueueAnimations", (JSON_nextAnimations, currentAnimation) => { let index = mp.game.joaat(currentAnimation); if (!animationSyncData.animations.hasOwnProperty(index)) return; let currentAnim = animationSyncData.animations[index]; let { id, name, animDict, animName, duration, loop, flag } = currentAnim; let interval = setInterval(function () { - mp.gui.chat.push(nextAnimations); - mp.events.callRemote("CLIENT:AnimPairTransition", nextAnimations); + mp.gui.chat.push(JSON_nextAnimations); + mp.events.callRemote("CLIENT:AnimPairTransition", JSON_nextAnimations); clearInterval(interval); }, duration); diff --git a/ReallifeGamemode.Server/Util/AnimationSync.cs b/ReallifeGamemode.Server/Util/AnimationSync.cs index fc7c6b15..e0a1ab89 100644 --- a/ReallifeGamemode.Server/Util/AnimationSync.cs +++ b/ReallifeGamemode.Server/Util/AnimationSync.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using GTANetworkAPI; +using Newtonsoft.Json; namespace ReallifeGamemode.Server.Util { @@ -62,8 +63,9 @@ namespace ReallifeGamemode.Server.Util public class AnimationSyncEvents : Script { [RemoteEvent("CLIENT:AnimPairTransition")] - public void AnimPairTransition(Player player, string[] transitionTo) + public void AnimPairTransition(Player player, string JSON_transitionTo) { + string[] transitionTo = (string[])JsonConvert.DeserializeObject(JSON_transitionTo); player.SendChatMessage(transitionTo.ToString()); player.SyncAnimation(transitionTo.ToList()); }