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

Compare commits

base: qixin:4448b2dfa85e30a56c44cca4417c70b113bfbf43
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:428033b26fab22b18242ada1645959db7e2f9ced
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

4 Commits
4448b2dfa8 ... 428033b26f

Author SHA1 Message Date
dy
428033b26f Merge branch 'bugfix' into release 2023-12-31 17:43:30 +08:00
dy
7aaa0699f9 fix 竞技场头像激活 2023-12-31 17:42:56 +08:00
dy
64a9ea7360 fix 黑帮争霸用户为空时协议报错 2023-12-31 17:22:07 +08:00
dy
61a8ae0fc9 fix 黑帮争霸取参错误 2023-12-31 17:04:59 +08:00
2 changed files with 7 additions and 4 deletions
Show Stats Expand all files Collapse all files

3
src/api_s2c/hbzb/jfs/ApiOpen.ts
View File

@ -29,7 +29,7 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
//todo 健壮性处理 //todo 健壮性处理
return call.errorCode(-4) return call.errorCode(-4)
} }
if (callRes.res.enemy.length) if (callRes.res?.enemy?.length)
data.enemy = callRes.res.enemy.map(e => { data.enemy = callRes.res.enemy.map(e => {
return {...e, result: null}; return {...e, result: null};
}); });
@ -44,6 +44,7 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
call.succ({ call.succ({
...data, ...data,
enemy: data.enemy || [],
rank: await getMyRank(call.uid) rank: await getMyRank(call.uid)
}); });
} }

8
src/public/user.ts
View File

@ -279,9 +279,11 @@ export class UserFun {
if (k == 'wxcLv') val = gud.wxcLv.lv; if (k == 'wxcLv') val = gud.wxcLv.lv;
else if (gud[k] != undefined) val = gud[k]; else if (gud[k] != undefined) val = gud[k];
if (k == 'jjc_rank' && !gud.headFrames[conf.id] && val <= conf.cond[1]) { if (k == 'jjc_rank') {
gud.headFrames[conf.id] = -1; if (!gud.headFrames[conf.id] && val <= conf.cond[1]) {
change = true; gud.headFrames[conf.id] = -1;
change = true;
} else return
} else if (!gud.headFrames[conf.id] && val >= conf.cond[1]) { } else if (!gud.headFrames[conf.id] && val >= conf.cond[1]) {
gud.headFrames[conf.id] = -1; gud.headFrames[conf.id] = -1;
change = true; change = true;