From 3d7644dce4e87e569ca1fd37edb07cde47e0c0b6 Mon Sep 17 00:00:00 2001
From: yushunrui <364203175@qq.com>
Date: Fri, 12 Jan 2024 22:52:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=B4=E5=83=8F=E6=A1=86=20=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9=E6=A1=86=EF=BC=8C=E9=80=A0=E5=9E=8B=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/public/user.ts | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/public/user.ts b/src/public/user.ts
index 5914259..e74bce3 100644
--- a/src/public/user.ts
+++ b/src/public/user.ts
@@ -297,12 +297,10 @@ export class UserFun {
                 if (val == -1 && !gud.headFrames[conf.id]) {
                     change = true;
                     gud.headFrames[conf.id] = -1;
-                } else if (!gud.headFrames[conf.id] || gud.headFrames[conf.id] < G.time) {
+                }
+                else if (val >= 0) {
                     change = true;
                     gud.headFrames[conf.id] = G.time + val * v;
-                } else {
-                    change = true;
-                    gud.headFrames[conf.id] += val * v;
                 }
             }
         }
@@ -341,19 +339,15 @@ export class UserFun {
             if (conf?.cond?.[0] == 'time') {
                 let val = conf.cond[1];
 
-                if (val == -1 && !gud.chatFrames[conf.id]) {
+                if (val == -1 && !gud.headFrames[conf.id]) {
                     change = true;
-                    gud.chatFrames[conf.id] = -1;
-                } else if (!gud.chatFrames[conf.id] || gud.chatFrames[conf.id] < G.time) {
+                    gud.headFrames[conf.id] = -1;
+                } else if (val >= 0) {
                     change = true;
-                    gud.chatFrames[conf.id] = G.time + val * v;
-                } else {
-                    change = true;
-                    gud.chatFrames[conf.id] += val * v;
+                    gud.headFrames[conf.id] = G.time + val * v;
                 }
             }
         }
-
         if (change) {
             PlayerFun.changeAttr(uid, {chatFrames: gud.chatFrames});
             G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', {chatFrames: gud.chatFrames});
@@ -388,15 +382,13 @@ export class UserFun {
             if (conf?.cond?.[0] == 'time') {
                 let val = conf.cond[1];
 
-                if (val == -1) {
+                if (val == -1 && !gud.headFrames[conf.id]) {
                     change = true;
-                    gud.model[conf.id] = {id: conf.id + '', time: -1};
-                } else if (gud.model[conf.id].time < G.time) {
+                    gud.headFrames[conf.id] = -1;
+                }
+                else if (val >= 0) {
                     change = true;
-                    gud.model[conf.id] = {id: conf.id + '', time: G.time + val * v};
-                } else {
-                    change = true;
-                    gud.model[conf.id] = {id: conf.id + '', time: gud.model[conf.id].time += val * v}
+                    gud.headFrames[conf.id] = G.time + val * v;
                 }
             }
         }