From 1fd1eaa8576a080350510bc4914af81816518c6d Mon Sep 17 00:00:00 2001
From: zhangxk <zhangxiaokang@bantus.cn>
Date: Wed, 13 Sep 2023 13:40:33 +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=E6=94=B9=E6=8C=91=E6=88=98=E5=85=B3?=
 =?UTF-8?q?=E9=A2=86=E5=A5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../servers/battle/handler/rougeHandler.ts    | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/game-server/app/servers/battle/handler/rougeHandler.ts b/game-server/app/servers/battle/handler/rougeHandler.ts
index e1f72e455..b5f3167b4 100644
--- a/game-server/app/servers/battle/handler/rougeHandler.ts
+++ b/game-server/app/servers/battle/handler/rougeHandler.ts
@@ -604,30 +604,17 @@ export class RougeHandler {
         if ((dbRecord.coin || 0) < redCoin) return resResult(STATUS.COIN_NOT_ENOUGH);
         if (redCoin > 0) await RougelikeRecordModel.updateByGameCode(gameCode, { $inc: { coin: -redCoin } });
 
-        //处理特性卡组
         groupStatus = ROUGE_LIKE_CHOOSE_REWARD.CHOOSE;
-        if (rewardType == ROUGE_LIKE_CARD_TYPE.PASSIVE) {
-            groupStatus = ROUGE_LIKE_CHOOSE_REWARD.NOCHOOSE;
-            if (chooseNum - passiveChooseCount == optionIndexs.length) {
-                groupStatus = ROUGE_LIKE_CHOOSE_REWARD.CHOOSE;
-                await updateChalleng(dbRecord, roleId, sid, gameCode, layer, []); // 更新挑战进度
-            }
-        }
-        rewards.forEach((ele) => { if (ele.rewardType == rewardType) ele.groupStatus = groupStatus; });
-
-
-        // 挑战领奖
-        let dbPara = {};
-        if (rewards.find((obj) => obj.groupStatus != ROUGE_LIKE_CHOOSE_REWARD.CHOOSE && rewardType != ROUGE_LIKE_CARD_TYPE.CHARA) == undefined) {
-            if (nodeType == ROUGE_LIKE_NODE_TYPE.CHALLENGE) {
-                challenge.status = 3;
-                dbPara['challenge'] = challenge;
-            }
 
+        if (nodeType == ROUGE_LIKE_NODE_TYPE.CHALLENGE) {
+            // 挑战关领奖更新
             await RougelikeLayerModel.updateByGameCode(gameCode, layer, { $set: { hasPass: true } })
+        } else {
+            // 更新进度
+            await updateChalleng(dbRecord, roleId, sid, gameCode, layer, []); // 更新挑战进度
         }
 
-        await RougelikeRecordDetailModel.updateRewardByGroupIndex(gameCode, detailCode, groupIndex, groupStatus, options, { $set: dbPara });
+        await RougelikeRecordDetailModel.updateRewardByGroupIndex(gameCode, detailCode, groupIndex, groupStatus, options);
 
         let addResult = await handleAddFun.save();
         addResult = await handleAddFun.getHolyEffect();