xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix(icon): 修复防守方失败且排名不变不推送提示

Browse Source
This commit is contained in:
zhangxk
2023-09-04 20:08:07 +08:00
parent a3c4fc217e
commit 9949c1bb2f
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app/servers/battle/handler/ladderHandler.ts
View File

@@ -235,7 +235,7 @@ export class LadderHandler {
await checkTaskInLadderEnd(serverId, roleId, sid, isSuccess, historyRank, atkLadderMatch.rank); await checkTaskInLadderEnd(serverId, roleId, sid, isSuccess, historyRank, atkLadderMatch.rank);
if (isSuccess && (!rec.defenseInfo?.isRobot)) await pushLadderIconShow(rec.roleId2, true); if (isSuccess && (!rec.defenseInfo?.isRobot) && rec.defenseInfo.oldRank < rec.defenseInfo.newRank) await pushLadderIconShow(rec.roleId2, true);
return resResult(STATUS.SUCCESS, {...pick(result, ['rank', 'historyRank', 'challengeCnt','status', 'time', 'oppPlayers']), battleGoods, breakGoods}); return resResult(STATUS.SUCCESS, {...pick(result, ['rank', 'historyRank', 'challengeCnt','status', 'time', 'oppPlayers']), battleGoods, breakGoods});
} }

2
game-server/app/servers/guild/handler/gvgFightHandler.ts
View File

@@ -378,7 +378,7 @@ export class GVGProduceHandler {
await saveScoreToRank(rec); await saveScoreToRank(rec);
addVestigeBattleEndRec(rec); addVestigeBattleEndRec(rec);
if (isSuccess && (!rec.defenseInfo?.isRobot)) await pushGvgFightIconShow(rec.defenseRoleId, battleCode); if (isSuccess && (!rec.defenseInfo?.isRobot) && rec.defenseInfo.oldRank < rec.defenseInfo.newRank) await pushGvgFightIconShow(rec.defenseRoleId, battleCode);
return resResult(STATUS.SUCCESS, { return resResult(STATUS.SUCCESS, {
vestigeId: rec.vestigeId, vestigeId: rec.vestigeId,

2
shared/db/GVGVestigeRec.ts
View File

@@ -138,7 +138,7 @@ export default class GVGVestigeRec extends BaseModel {
const recs: GVGVestigeRecType[] = await GVGVestigeRecModel.aggregate(pipeline); const recs: GVGVestigeRecType[] = await GVGVestigeRecModel.aggregate(pipeline);
if (recs.length > 0) { if (recs.length > 0) {
for(const obj of recs){ for(const obj of recs){
if(obj.defenseRoleId == roleId && (!obj.defenseInfo.isSuccess)) result.push(obj); if(obj.defenseRoleId == roleId && (!obj.defenseInfo.isSuccess) && obj.defenseInfo.newRank > obj.defenseInfo.oldRank ) result.push(obj);
} }
} }

4
shared/db/LadderMatchRec.ts
View File

@@ -137,11 +137,11 @@ export default class LadderMatchRec extends BaseModel {
{ $match: { endTime: { $gt: quitTime }, $or: [{ roleId1: roleId }, { roleId2: roleId }], status: LADDER_STATUS.COMPLETE } }, { $match: { endTime: { $gt: quitTime }, $or: [{ roleId1: roleId }, { roleId2: roleId }], status: LADDER_STATUS.COMPLETE } },
{ $sort: { endTime: -1 } }, { $sort: { endTime: -1 } },
// { $limit: 1 }, // { $limit: 1 },
{ $project: { _id: 0, roleId2: 1, "defenseInfo.isSuccess": 1 } } { $project: { _id: 0, roleId2: 1, "defenseInfo.isSuccess": 1, "defenseInfo.oldRank": 1, "defenseInfo.newRank": 1} }
]; ];
const recs: LadderMatchRecType[] = await LadderMatchRecModel.aggregate(pipeline); const recs: LadderMatchRecType[] = await LadderMatchRecModel.aggregate(pipeline);
for (let obj of recs) { for (let obj of recs) {
if (obj.roleId2 === roleId && (!obj.defenseInfo.isSuccess)) return true; if (obj.roleId2 === roleId && (!obj.defenseInfo.isSuccess) && obj.defenseInfo.newRank > obj.defenseInfo.oldRank) return true;
} }
return false; return false;
} }