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

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

Browse Source 
# Conflicts:
#	src/public/rank/rank.ts
This commit is contained in:
xcy 2023-12-28 18:22:20 +08:00
commit 2894f384b9
2 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/global.ts
View File

@ -240,7 +240,7 @@ export function ctor() {
}
Array.prototype.random = function (this: Array<any>) {
return this[PublicShared.randomNum(0, this.length)];
return this[PublicShared.randomNum(0, this.length - 1)];
};
Array.prototype.intersection = function (this: Array<any>, other: Array<any>) {

25
src/public/rank/rank.ts
View File

@ -250,6 +250,29 @@ export abstract class Rank {
let res = await this.db.find({ idKey: { $in: uids }, type: this.getType() }).toArray()
switch (this.getType()) {
case "slzd1":
case "slzd2":
case "slzd3":
case "slzd4":
case "slzd5":
case "slzd6":
let ghid = [];
res = res.map(item => {
if (!item.data?.player?.ghid || item.data.utime + 60 < G.time) {
ghid.push(G.mongodb.conversionId(item.idKey));
}
return item;
})
if(ghid.length > 0){
(await G.mongodb.collection("gonghui").find(
{ _id: { $in: ghid } }, { projection: { name: 1 } }
)).forEach(item => {
let index = res.findIndex(x => x.idKey == item._id.toHexString());
res[index].data.player.ghName = item.name;
this.db.updateOne({ idKey: item._id.toHexString(), type: this.getType() }, { $set: { "data.player.ghName": item.name } });
})
}
break;
default: // 排行数据更新逻辑 默认更新playerInfo
let updateUids = [];
res = res.map(item => {
@ -271,7 +294,7 @@ export abstract class Rank {
this.db.updateOne({ idKey: item.uid, type: this.getType() }, { $set: { "data.player": item } });
// 跟新redis score
this.setRankData(item.uid, res[index].data as any);
// this.setRankData(item.uid, res[index].data as any);
})
}