diff --git a/game-server/app/services/battle/rougeEffectService.ts b/game-server/app/services/battle/rougeEffectService.ts index 219815d31..46ebbb2f7 100644 --- a/game-server/app/services/battle/rougeEffectService.ts +++ b/game-server/app/services/battle/rougeEffectService.ts @@ -350,7 +350,7 @@ export class RougeEffect { this.updateHolyMapUseCount(this.holyMap.get(cardCode)); } - + return addRatio; } @@ -661,8 +661,9 @@ export async function checkCanReRandomReward(roleId: string, gameCode: string, r } -export function getHolyCardIsUse(holy: { cardId: number, useCount: number }) { - const { useCount = 0, cardId } = (holy || {}); +export function getHolyCardIsUse(holy: { cardId: number, useCount: number, cardCode:string}) { + const { useCount = 0, cardId, cardCode } = (holy || {}); + if(!cardCode) return true;//法阵不存在cardCode if (!cardId) return; const holyCardData = gameData.rougeHolyCard.get(cardId) if (!holyCardData) return; diff --git a/game-server/app/services/battle/rougeTechService.ts b/game-server/app/services/battle/rougeTechService.ts index 7b39608cb..aef89f45a 100644 --- a/game-server/app/services/battle/rougeTechService.ts +++ b/game-server/app/services/battle/rougeTechService.ts @@ -45,18 +45,18 @@ async function calCircleCe(roleId: string, unlockedTech: number[], circles: Circ export async function updateEffectId(techData: RougelikeTechType) { let effectIds = getTechEffectIdsByData(techData); if(!compareNumberArray(effectIds, techData.effectIds||[])) { + await RougelikeTechModel.updateEffectId(techData.roleId, effectIds); if (hasMaxHpUpdate(effectIds, techData.effectIds||[])) { const dbRecord = await RougelikeRecordModel.findByRoleIdAndStatus(techData.roleId, ROUGE_LIKE_STATUS.SUCCESS) if(dbRecord) await updateMaxHp(techData.roleId, dbRecord.gameCode, dbRecord.type, dbRecord.grade) } - await RougelikeTechModel.updateEffectId(techData.roleId, effectIds); } } function hasMaxHpUpdate(effectIds: number[], oldEffectIds: number[]) { let newEffectIds: number[] = []; for(let effectId of effectIds) { - if (oldEffectIds.includes(effectId)) newEffectIds.push(effectId); + if (!oldEffectIds.includes(effectId)) newEffectIds.push(effectId); } for(let effectId of newEffectIds) { let dicRougeEffect = gameData.rougeEffect.get(effectId);