From 6f845ff0d8a03c29b9975b5cbaf8e8981ca49f69 Mon Sep 17 00:00:00 2001 From: zhangxk Date: Thu, 7 Sep 2023 20:21:19 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E7=A8=B7=E4=B8=8B=E5=AD=A6?= =?UTF-8?q?=E5=AE=AB):=20=E4=BF=AE=E5=A4=8D=E5=A4=96=E5=B8=A6=E5=A5=96?= =?UTF-8?q?=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/battle/rougeService.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/game-server/app/services/battle/rougeService.ts b/game-server/app/services/battle/rougeService.ts index 830a2044c..fe576551b 100644 --- a/game-server/app/services/battle/rougeService.ts +++ b/game-server/app/services/battle/rougeService.ts @@ -604,7 +604,7 @@ export async function getPassiveCardPlan(passiveCardPlan: number, passiveCardRan if (!passiveCardData) continue; const getLimit = cardsMap.get(cardId) || 0; if (getLimit >= (passiveCardData?.getLimit || 0)) continue; //处理限制获取数量 - + weightRecord.originalWight = weight; if (chooseCardsMap.has(cardId)) { @@ -690,7 +690,7 @@ export async function getHolyCardPlan(holyCardPlan: number, holyCardRandomNum: n let cards = checkRandomLimit(holyCardPlan, holyCardRandomNum, ROUGE_LIKE_CARD_TYPE.HOLY); // if (cards.length <= holyCardRandomNum) return { holyCards: cards }; - if(cards.length == 0) return { holyCards: cards }; + if (cards.length == 0) return { holyCards: cards }; let lableMap = new Map();//统计lable数量 if (dbRougelikeCards && dbRougelikeCards.length > ROUGELIKE.HOLY_LABLE_NUM) { @@ -866,11 +866,13 @@ export function getLayerRewardOneData(type: number, grade: number, layer: number if (!typeGradeData) return result; const layerPlanData = gameData.rougeLayerPlan.get(typeGradeData.layerPlan + '_' + layer); if (!layerPlanData) return result; + result = { takeoutReward: layerPlanData.takeoutReward, spiritPlan: layerPlanData.spiritPlan } const layerRewardData = gameData.rougeLayerRewardPlan.get(layerPlanData.rewardPlan + '_' + nodeType); if (!layerRewardData) return result; - - return { ...layerRewardData, takeoutReward: layerPlanData.takeoutReward, spiritPlan: layerPlanData.spiritPlan }; + result = { ...layerRewardData, ...result }; + + return result; } export function getRandomSpirit(spiritPlan: number) {