qixin/HJ_Server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: qixin:8c86b05fe1245bc95b09382fa03740884005d14f
Branches Tags
qixin:dev
qixin:release
qixin:bugfix
qixin:feature/skin
qixin:feature/huangqijiuguan
qixin:master
qixin:feature/pushgift
qixin:feature/weiwang
qixin:feature/warning
qixin:feature/leichong
qixin:feature/xiaofeijingsai
..
compare: qixin:847613db4a52e272107a76efb98beb6e23ab4fb2
Branches Tags
qixin:dev
qixin:release
qixin:bugfix
qixin:feature/skin
qixin:feature/huangqijiuguan
qixin:master
qixin:feature/pushgift
qixin:feature/weiwang
qixin:feature/warning
qixin:feature/leichong
qixin:feature/xiaofeijingsai

No commits in common. "8c86b05fe1245bc95b09382fa03740884005d14f" and "847613db4a52e272107a76efb98beb6e23ab4fb2" have entirely different histories.
8c86b05fe1 ... 847613db4a

1 changed files with 8 additions and 2 deletions
Show Stats Expand all files Collapse all files

10
src/public/user.ts
View File

@ -297,9 +297,12 @@ export class UserFun {
if (val == -1 && !gud.headFrames[conf.id]) {
change = true;
gud.headFrames[conf.id] = -1;
} else if (val > 0 && gud.headFrames[conf.id] != -1) {
} else if (!gud.headFrames[conf.id] || gud.headFrames[conf.id] < G.time) {
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") {
@ -344,9 +347,12 @@ export class UserFun {
if (val == -1 && !gud.chatFrames[conf.id]) {
change = true;
gud.chatFrames[conf.id] = -1;
} else if (val > 0 && gud.chatFrames[conf.id] != -1) {
} else if (!gud.chatFrames[conf.id] || gud.chatFrames[conf.id] < G.time) {
change = true;
gud.chatFrames[conf.id] = G.time + val * v;
} else {
change = true;
gud.chatFrames[conf.id] += val * v;
}
}
}