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

Revert "fix:头像框 聊天框，造型逻辑修改"

Browse Source 
This reverts commit 3e43065142.
This commit is contained in:
xichaoyin 2024-01-12 15:10:54 +08:00
parent 4c4e1d20dc
commit 00ed252403
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/public/user.ts
View File

@ -298,17 +298,12 @@ export class UserFun {
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 (val > 0 && gud.headFrames[conf.id] != -1) {
}
else if (val >= 0) {
change = true; change = true;
gud.headFrames[conf.id] = G.time + val * v; gud.headFrames[conf.id] = G.time + val * v;
} }
} }
else if(conf?.cond?.[0] == "jjc_rank") {
change = true;
gud.headFrames[conf.id] = -1;
}
} }
if (change) { if (change) {
PlayerFun.changeAttr(uid, {headFrames: gud.headFrames}); PlayerFun.changeAttr(uid, {headFrames: gud.headFrames});
G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', {headFrames: gud.headFrames}); G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', {headFrames: gud.headFrames});
@ -343,15 +338,16 @@ export class UserFun {
if (conf?.cond?.[0] == 'time') { if (conf?.cond?.[0] == 'time') {
let val = conf.cond[1]; let val = conf.cond[1];
if (val == -1 && !gud.headFrames[conf.id]) { if (val == -1 && !gud.chatFrames[conf.id]) {
change = true; change = true;
gud.headFrames[conf.id] = -1; gud.chatFrames[conf.id] = -1;
} else if (val >= 0) { } else if (val > 0 && gud.chatFrames[conf.id] != -1) {
change = true; change = true;
gud.headFrames[conf.id] = G.time + val * v; gud.chatFrames[conf.id] = G.time + val * v;
} }
} }
} }
if (change) { if (change) {
PlayerFun.changeAttr(uid, {chatFrames: gud.chatFrames}); PlayerFun.changeAttr(uid, {chatFrames: gud.chatFrames});
G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', {chatFrames: gud.chatFrames}); G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', {chatFrames: gud.chatFrames});
@ -386,13 +382,15 @@ export class UserFun {
if (conf?.cond?.[0] == 'time') { if (conf?.cond?.[0] == 'time') {
let val = conf.cond[1]; let val = conf.cond[1];
if (val == -1 && !gud.headFrames[conf.id]) { if (val == -1) {
change = true; change = true;
gud.headFrames[conf.id] = -1; gud.model[conf.id] = {id: conf.id + '', time: -1};
} } else if (gud.model[conf.id].time < G.time) {
else if (val >= 0) {
change = true; change = true;
gud.headFrames[conf.id] = G.time + val * v; 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}
} }
} }
} }