From 76a7608649ffc67b059e0f64d1769fad27af8bfe Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Tue, 19 Oct 2021 20:04:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9A=AE=E8=82=A4=EF=BC=9Apvp=E7=9A=AE?=
 =?UTF-8?q?=E8=82=A4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/battle/handler/pvpHandler.ts | 2 +-
 game-server/app/services/expeditionService.ts        | 2 +-
 game-server/app/services/pvpService.ts               | 1 -
 shared/db/PvpDefense.ts                              | 2 --
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/game-server/app/servers/battle/handler/pvpHandler.ts b/game-server/app/servers/battle/handler/pvpHandler.ts
index ccb8532ab..9235b2c50 100644
--- a/game-server/app/servers/battle/handler/pvpHandler.ts
+++ b/game-server/app/servers/battle/handler/pvpHandler.ts
@@ -316,7 +316,7 @@ export class PvpHandler {
             let defIndex = findIndex(defHeros, { dataId });
             if (defIndex == -1) {
                 defIndex = defHeros.length;
-                defHeros.push({ actorId: 0, skinId: 0, order: 0, ce: 0, hero: null, dataId });
+                defHeros.push({ actorId: 0, order: 0, ce: 0, hero: null, dataId });
             }
             if (index == -1) {
                 defHeros[defIndex].actorId = 0;
diff --git a/game-server/app/services/expeditionService.ts b/game-server/app/services/expeditionService.ts
index 9b58bd4fa..3bfcd2e41 100644
--- a/game-server/app/services/expeditionService.ts
+++ b/game-server/app/services/expeditionService.ts
@@ -157,7 +157,7 @@ export async function matchPlayers(roleId: string, scale: number, range: number,
                         let { attribute } = getPlayerAttribute(lv, heroAttrs, roleAttrs);
                         let heroInfo = { 
                             actorId: hero.actorId,
-                            skinId: hero.skinId,
+                            skinId: h.skinId,
                             actorName: dicHero.name, 
                             skill:0, 
                             seid:'&', 
diff --git a/game-server/app/services/pvpService.ts b/game-server/app/services/pvpService.ts
index 2d853ad1c..ea10eb2df 100644
--- a/game-server/app/services/pvpService.ts
+++ b/game-server/app/services/pvpService.ts
@@ -36,7 +36,6 @@ export async function initPvpInfo(role: RoleType) {
         if (item) defCe += item.ce;
         heroes.push({
             actorId: item?.hid || 0,
-            skinId: item?.hid || 0,
             hero: item?.hero || null,
             ce: item?.ce || 0,
             dataId: i,
diff --git a/shared/db/PvpDefense.ts b/shared/db/PvpDefense.ts
index 7669dcb50..6cdeb2282 100644
--- a/shared/db/PvpDefense.ts
+++ b/shared/db/PvpDefense.ts
@@ -9,8 +9,6 @@ import { reduceCe } from '../pubUtils/util';
 export class Heroes {
     @prop({ required: true })
     actorId: number;        // 武将id
-    @prop({ required: true })
-    skinId: number;        // 皮肤id，fashions表的heroId
     @prop({ ref: 'Hero', type: mongoose.Schema.Types.ObjectId })
     hero: Ref<Hero>;
     @prop({ required: true })