From b9f579dd1d86155a0c4fc39b5c1cbb43fe7ebe88 Mon Sep 17 00:00:00 2001 From: kookroach Date: Tue, 6 Apr 2021 04:13:18 +0200 Subject: [PATCH] test --- ReallifeGamemode.Client/util/animationSync.ts | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/ReallifeGamemode.Client/util/animationSync.ts b/ReallifeGamemode.Client/util/animationSync.ts index d4484f7e..6aca7731 100644 --- a/ReallifeGamemode.Client/util/animationSync.ts +++ b/ReallifeGamemode.Client/util/animationSync.ts @@ -71,12 +71,10 @@ export default function animationSync() { entity.clearTasksImmediately(); return; } - let lastAnim; while (true) { - if (lastAnim && entity.isPlayingAnim(lastAnim.dict, lastAnim.name, 3)) - continue; mp.gui.chat.push("transition to " + string); + let index = mp.game.joaat(string); let animData = animationSyncData.animations[index]; @@ -85,17 +83,18 @@ export default function animationSync() { let { id, name, animDict, animName, duration, loop, flag } = animData; - loadAnimDict(animDict, function () { - mp.players.exists(entity) && 0 !== entity.handle && entity.taskPlayAnim(animDict, animName, 1, 0, duration, parseInt(flag), 0, !1, !1, !1) - }); + if (entity.getAnimCurrentTime(animDict, animName) > 0.95) { + let pair = pairData.find(pair => pair.from == name); + if (!pair) + break; - let pair = pairData.find(pair => pair.from == name); - if (!pair) - break; - - string = pair.transitionTo; - - lastAnim = { dict: animDict, name: animName }; + string = pair.transitionTo; + } + else if (entity.getAnimCurrentTime(animDict, animName) == 0) { + loadAnimDict(animDict, function () { + mp.players.exists(entity) && 0 !== entity.handle && entity.taskPlayAnim(animDict, animName, 1, 0, duration, parseInt(flag), 0, !1, !1, !1) + }); + } } });