From 9b27cf028531e0b8ee24b002e7d2598c14e3e76d Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Thu, 27 Jul 2023 11:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E5=89=AF=E5=B0=86):=20?=
 =?UTF-8?q?=E5=BD=93=E8=AE=BE=E7=BD=AE=E6=AD=A6=E5=B0=86=E5=92=8C=E5=8E=9F?=
 =?UTF-8?q?=E6=AD=A6=E5=B0=86id=E4=B8=80=E8=87=B4=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/role/handler/heroHandler.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts
index b6e9e3487..89875bd17 100644
--- a/game-server/app/servers/role/handler/heroHandler.ts
+++ b/game-server/app/servers/role/handler/heroHandler.ts
@@ -770,7 +770,7 @@ export class HeroHandler {
 
         let subHid = 0;
         if(subSkinId > 0) { // 设置上
-            if(hero.subHid == subSkinId) return resResult(STATUS.HERO_SUB_DUPLICATE);
+            if(hero.subHid == subSkinId) return resResult(STATUS.SUCCESS, { preHid: hero.subActorId, curHero: pick(hero, ['hid', 'subHid', 'subActorId']) });
             let dicHero = gameData.hero.get(subSkinId);
             if(!dicHero || dicHero.urType == 1) return resResult(STATUS.HERO_CAN_NOT_BE_SET_SUB);
             subHid = dicHero.actorId;
@@ -785,7 +785,7 @@ export class HeroHandler {
             // await GVGTeamModel.removeBySub(roleId, subHid, subHero.ce);
 
         } else { // 卸下
-            if(!hero.subHid) return resResult(STATUS.HERO_CAN_NOT_REMOVE_SUB);
+            if(!hero.subHid) return resResult(STATUS.SUCCESS, { preHid: hero.subActorId, curHero: pick(hero, ['hid', 'subHid', 'subActorId']) });
         }
 
         // 设置副将