Merge remote-tracking branch 'origin/bugfix' into bugfix

fix:处理了头像框和聊天框得逻辑
fix:头像框聊天框，造型逻辑修改
2024-01-12 23:13:23 +08:00 · 2024-01-12 23:10:39 +08:00 · 2024-01-12 22:52:56 +08:00
1 changed files with 2 additions and 8 deletions
--- a/src/public/user.ts
+++ b/src/public/user.ts
@ -297,12 +297,9 @@ 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 && gud.headFrames[conf.id] != -1) {
                    change = true;
                    gud.headFrames[conf.id] = G.time + val * v;
-                } else {
-                    change = true;
-                    gud.headFrames[conf.id] += val * v;
                }
            }
            else if(conf?.cond?.[0] == "jjc_rank") {
@ -347,12 +344,9 @@ export class UserFun {
                if (val == -1 && !gud.chatFrames[conf.id]) {
                    change = true;
                    gud.chatFrames[conf.id] = -1;
-                } else if (!gud.chatFrames[conf.id] || gud.chatFrames[conf.id] < G.time) {
+                } else if (val > 0 && gud.chatFrames[conf.id] != -1) {
                    change = true;
                    gud.chatFrames[conf.id] = G.time + val * v;
-                } else {
-                    change = true;
-                    gud.chatFrames[conf.id] += val * v;
                }
            }
        }
Author	SHA1	Message	Date
yushunrui	8c86b05fe1	Merge remote-tracking branch 'origin/bugfix' into bugfix	2024-01-12 23:13:23 +08:00
yushunrui	c7ce70fcc0	fix:处理了头像框和聊天框得逻辑	2024-01-12 23:10:39 +08:00
yushunrui	ac4432fea8	fix:头像框聊天框，造型逻辑修改	2024-01-12 22:52:56 +08:00