From 55e45b562376e501818e8a211be0819a0e2edf66 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 9 Mar 2023 17:29:47 +0800
Subject: [PATCH] 1

---
 server/gameserver/battledatacontext.cc | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc
index e404cc13..4eea45a3 100644
--- a/server/gameserver/battledatacontext.cc
+++ b/server/gameserver/battledatacontext.cc
@@ -358,11 +358,11 @@ void BattleDataContext::ParseResult(a8::XObject& obj)
         match_mode_ = obj.Get("match_mode");
     }
     level_ = obj.HasKey("level") ? obj.Get("level").GetInt() : 1;
-    skin_id_ = obj.HasKey("skin_id") ? obj.Get("skin_id").GetInt() : 0;
     if (obj.HasKey("hero_dto") && obj.At("hero_dto")->IsObject()) {
         hero_dto = obj.At("hero_dto");
         hero_ability_->hero_uniid_ = hero_dto->Get("hero_uniid", "");
-        hero_ability_->hero_dto = hero_dto;;
+        hero_ability_->hero_dto = hero_dto;
+        skin_id_ = hero_dto->HasKey("skin_id") ? hero_dto->Get("skin_id").GetInt() : 0;
         const mt::Hero* meta = mt::Hero::GetById(hero_dto->Get("hero_id", ""));
         if (meta) {
             hero_ability_->hero_meta = meta;
@@ -733,16 +733,11 @@ void BattleDataContext::Init(Creature* c)
         weapon2_ability_->Init(c);
     }
     if (skin_id_ && c->IsHuman()) {
-        #if 1
-        Skin* skin = c->AsHuman()->GetSkinByIdx(0);
-        skin->skin_id = 1;
-        #else
         const mt::Item* item_meta = mt::Item::GetById(skin_id_);
         if (item_meta) {
             Skin* skin = c->AsHuman()->GetSkinByIdx(0);
             skin->skin_id = skin_id_;
         }
-        #endif
     }
 }