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

Compare commits

base: qixin:369e654772e4e90bef4d99de1eeac4d02b9a9e24
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:55aa5eac268059ea3c72414e975274e2599fd7ae
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. "369e654772e4e90bef4d99de1eeac4d02b9a9e24" and "55aa5eac268059ea3c72414e975274e2599fd7ae" have entirely different histories.
369e654772 ... 55aa5eac26

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