From 1dda2e77892aba53c6662fb6d9ff1a04aae0f1c3 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 14 Mar 2024 20:48:36 +0800
Subject: [PATCH 1/3] 1

---
 webapp/controller/UserController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index 2a3f57dd..d8b8ab7b 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -465,7 +465,7 @@ class UserController extends BaseAuthedController {
             return;
         }
         $userInfo = User::Info($userDb);
-        $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userDb['hero_uniid']);
+        $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userInfo['hero_uniid']);
         if (!$heroDb) {
             $this->_rspErr(1, 'Hero does not exist');
             return;

From 0316c98d0ba273140357ff0b5b9f7e0a9f494fd3 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 14 Mar 2024 21:22:36 +0800
Subject: [PATCH 2/3] 1

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

diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index d8b8ab7b..a556f6db 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -10,6 +10,7 @@ require_once('models/Chip.php');
 require_once('models/Battle.php');
 require_once('models/SignLog.php');
 require_once('models/UserHonor.php');
+require_once('models/HeroPreset.php');
 
 require_once('mt/Parameter.php');
 require_once('mt/Drop.php');
@@ -38,6 +39,7 @@ use models\UserSeasonRing;
 use models\Battle;
 use models\SignLog;
 use models\UserHonor;
+use models\HeroPreset;
 
 class UserController extends BaseAuthedController {
     private $init_rank = 'rank_init_rank';
@@ -472,6 +474,45 @@ class UserController extends BaseAuthedController {
         }
         $heroInfo = Hero::toDto($heroDb);
         $heroInfo['avatar_info'] = Hero::avatarInfo($heroDb);
+        {
+            $preset = HeroPreset::getHeroPreset($userDb['hero_id']);
+            $heroInfo['spec_skill'] = $preset['skill_id'];
+        }
+        myself()->_rspData(array(
+            'info' => array(
+                'user_info' => $userInfo,
+                'hero_info' => $heroInfo
+            )
+        ));
+    }
+
+    public function updateBattleInfo()
+    {
+        $specSkill = getReqVal("skill_id", "");
+        $heroUniId = getReqVal("hero_uniid", "");
+        $userDb = SqlHelper::ormSelectOne
+                (myself()->_getSelfMysql(),
+                 't_user',
+                 array(
+                     'account_id' => myself()->_getAccountId()
+                 )
+                );
+        if (!$userDb) {
+            $this->_rspErr(1, 'Account does not exist');
+            return;
+        }
+        $userInfo = User::Info($userDb);
+        $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $heroUniId);
+        if (!$heroDb) {
+            $this->_rspErr(1, 'Hero does not exist');
+            return;
+        }
+        $heroInfo = Hero::toDto($heroDb);
+        $heroInfo['avatar_info'] = Hero::avatarInfo($heroDb);
+        {
+            $preset = HeroPreset::getHeroPreset($heroUniId);
+            $heroInfo['spec_skill'] = $specSkill;
+        }
         myself()->_rspData(array(
             'info' => array(
                 'user_info' => $userInfo,

From 2acead89eee5138114ce61a80317afa907060196 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 14 Mar 2024 21:28:41 +0800
Subject: [PATCH 3/3] 1

---
 webapp/controller/UserController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index a556f6db..6cdc166e 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -476,7 +476,7 @@ class UserController extends BaseAuthedController {
         $heroInfo['avatar_info'] = Hero::avatarInfo($heroDb);
         {
             $preset = HeroPreset::getHeroPreset($userDb['hero_id']);
-            $heroInfo['spec_skill'] = $preset['skill_id'];
+            $heroInfo['spec_skill'] = '' . $preset['skill_id'];
         }
         myself()->_rspData(array(
             'info' => array(
@@ -511,7 +511,7 @@ class UserController extends BaseAuthedController {
         $heroInfo['avatar_info'] = Hero::avatarInfo($heroDb);
         {
             $preset = HeroPreset::getHeroPreset($heroUniId);
-            $heroInfo['spec_skill'] = $specSkill;
+            $heroInfo['spec_skill'] = '' . $specSkill;
         }
         myself()->_rspData(array(
             'info' => array(