From 61021776403bf23842b1b8dbe64d1386ba131e5a Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Thu, 9 Mar 2023 16:07:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=98=E6=96=97=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webapp/controller/BattleController.class.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php
index ec965086..ea38c468 100644
--- a/webapp/controller/BattleController.class.php
+++ b/webapp/controller/BattleController.class.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once('models/Hero.php');
+require_once('models/HeroSkin.php');
 require_once('models/Gun.php');
 require_once('models/Chip.php');
 require_once('models/Bag.php');
@@ -15,6 +16,7 @@ require_once('mt/RankSeason.php');
 
 use phpcommon\SqlHelper;
 use models\Hero;
+use models\HeroSkin;
 use models\Gun;
 use models\Bag;
 use models\DynData;
@@ -134,6 +136,7 @@ class BattleController extends BaseAuthedController {
         error_log(json_encode($_REQUEST));
         error_log(json_encode($members));
         foreach ($members as $member) {
+            $user = User::find($member['account_id']);
             $info = array(
                 'account_id' => $member['account_id'],
                 'session_id' => $member['session_id'],
@@ -144,6 +147,7 @@ class BattleController extends BaseAuthedController {
                 'hero_dto' => '',
                 'weapon_dto1' => '',
                 'weapon_dto2' => '',
+                'level' =>$user['level'],
 
                 'is_valid_battle' => 0,
                 'payload' => json_encode($member['cmjoin']),
@@ -160,6 +164,12 @@ class BattleController extends BaseAuthedController {
                     if ($heroDb) {
                         $info['is_valid_battle'] = 1;
                         $info['hero_dto'] = Hero::toDto($heroDb);
+                        {//选用皮肤id
+                            $skinDb = HeroSkin::findBx($heroDb['hero_id']);
+                            if ($skinDb){
+                                $info['hero_dto']['skin_id'] = $skinDb['skin_id'];
+                            }
+                        }
                     } else {
                         $info['errcode'] = 51;
                         $info['errmsg'] = 'paramater error';