diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts index 834f0de02..ea3680a3f 100644 --- a/game-server/app/servers/role/handler/heroHandler.ts +++ b/game-server/app/servers/role/handler/heroHandler.ts @@ -29,6 +29,8 @@ import { isGoodsHidden, isHeroHidden } from '../../../services/dataService'; import { LadderMatchModel } from '../../../db/LadderMatch'; import { PvpSaveDataModel } from '../../../db/PvpSaveData'; import { ArtifactModel } from '../../../db/Artifact'; +import { GVGVestigeRankModel } from '../../../db/GVGVestigeRank'; +import { GVGTeamModel } from '../../../db/GVGTeam'; export default function (app: Application) { new HandlerService(app, {}); @@ -779,6 +781,8 @@ export class HeroHandler { await LadderMatchModel.removeBySub(roleId, subHid); await PvpSaveDataModel.removeBySub(roleId, subHid); await PvpDefenseModel.removeBySub(roleId, subHid); + await GVGVestigeRankModel.removeBySub(roleId, subHid); + await GVGTeamModel.removeBySub(roleId, subHid, subHero.ce); } else { // 卸下 if(!hero.subHid) return resResult(STATUS.HERO_CAN_NOT_REMOVE_SUB); diff --git a/shared/db/GVGTeam.ts b/shared/db/GVGTeam.ts index 6b00bb8a2..31943917c 100644 --- a/shared/db/GVGTeam.ts +++ b/shared/db/GVGTeam.ts @@ -352,6 +352,11 @@ export default class GVGTeam extends BaseModel { public static async checkLockTeam(roleId: string, cityId: number) { return await GVGTeamModel.exists({ roleId, lockTime: { $gt: nowSeconds() }, cityId: { $ne: cityId } }) } + + public static async removeBySub(roleId: string, subHid: number, ce: number) { + console.log('removeBySub', roleId, subHid, ce) + await GVGTeamModel.updateMany({ roleId, 'lineup.actorId': subHid }, { $pull: { lineup: { actorId: subHid } }, $inc: { lineupCe: -ce } }); + } } export const GVGTeamModel = getModelForClass(GVGTeam); diff --git a/shared/db/GVGVestigeRank.ts b/shared/db/GVGVestigeRank.ts index 14593b08d..d644562ae 100644 --- a/shared/db/GVGVestigeRank.ts +++ b/shared/db/GVGVestigeRank.ts @@ -165,6 +165,10 @@ export default class GVGVestigeRank extends BaseModel { let result: GVGVestigeRankType[] = await GVGVestigeRankModel.find({ day: today, vestigeId, groupKey, rank: { $gt: 0 } }).sort({ rank: 1 }).select('roleId rank lineup').lean(); return result; } + + public static async removeBySub(roleId: string, subHid: number) { + await GVGVestigeRankModel.updateMany({ roleId, hasDefense: true }, { $pull: { lineup: { actorId: subHid } } }); + } } export const GVGVestigeRankModel = getModelForClass(GVGVestigeRank);