🐞 fix(稷下学宫): 修复外带奖励

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<number, number>();//统计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) {