From 90502615f4596d9e825aabe9963c557b0eff2d40 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 18 Apr 2024 19:54:26 +0800
Subject: [PATCH 1/4] 1

---
 webapp/controller/UserController.class.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index 51fff605..b34cedb6 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -24,6 +24,7 @@ require_once('mt/Item.php');
 require_once('mt/PveGeminiMode.php');
 require_once('mt/PveGemini.php');
 require_once('mt/Map.php');
+require_once('mt/MapMode.php');
 
 require_once('services/AwardService.php');
 require_once('services/PropertyChgService.php');
@@ -465,11 +466,12 @@ class UserController extends BaseAuthedController {
             'is_moba' => 0,
             'is_open' => 0
         );
-        if (!empty($mapId)) {
+        if (!empty($mapId) && !empty($modeId)) {
             $mapMeta = mt\Map::get($mapId);
-            if ($mapMeta) {
+            $modeMeta = mt\MapMode::find($modeId);
+            if ($mapMeta && $modeMeta) {
                 $mapInfo = $mapMeta;
-                $mapInfo['mode_id'] = intval($modeId);
+                $mapInfo['mode_id'] = $modeMeta['id'];
             }
         }
         myself()->_rspData($mapInfo);
@@ -485,11 +487,12 @@ class UserController extends BaseAuthedController {
             'is_moba' => 0,
             'is_open' => 0
         );
-        if (!empty($mapId)) {
+        if (!empty($mapId) && !empty($modeId)) {
             $mapMeta = mt\Map::get($mapId);
+            $modeMeta = mt\MapMode::find($modeId);
             if ($mapMeta) {
                 $mapInfo = $mapMeta;
-                $mapInfo['mode_id'] = intval($modeId);
+                $mapInfo['mode_id'] = $modeMeta['id'];
             }
         }
         $userDb = SqlHelper::ormSelectOne

From af53f3ad65a1d2679815660d52fd313369ff5d87 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 18 Apr 2024 20:06:06 +0800
Subject: [PATCH 2/4] 1

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

diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index b34cedb6..c5146fd9 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -507,6 +507,10 @@ class UserController extends BaseAuthedController {
             return;
         }
         $userInfo = User::Info($userDb);
+        {
+            $userInfo['total_lucky'] = Hero::getAccountLucky($userInfo['address']);
+            $userInfo['admission_item_num'] = myself()->_getItemCount(900006, $userInfo);
+        }
         $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userInfo['hero_uniid']);
         if (!$heroDb) {
             $this->_rspErr(1, 'Hero does not exist');

From 79e3417fb98ec13e19588f3449e7ea5ef373c0d0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 18 Apr 2024 21:08:35 +0800
Subject: [PATCH 3/4] 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 c5146fd9..a43e6b6f 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -531,6 +531,43 @@ class UserController extends BaseAuthedController {
         ));
     }
 
+    public function getBattleUser()
+    {
+        $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);
+        {
+            $userInfo['total_lucky'] = Hero::getAccountLucky($userInfo['address']);
+            $userInfo['admission_item_num'] = myself()->_getItemCount(900006, $userInfo);
+        }
+        $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userInfo['hero_uniid']);
+        if (!$heroDb) {
+            $this->_rspErr(1, 'Hero does not exist');
+            return;
+        }
+        $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", "");
@@ -547,6 +584,10 @@ class UserController extends BaseAuthedController {
             return;
         }
         $userInfo = User::Info($userDb);
+        {
+            $userInfo['total_lucky'] = Hero::getAccountLucky($userInfo['address']);
+            $userInfo['admission_item_num'] = myself()->_getItemCount(900006, $userInfo);
+        }
         $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $heroUniId);
         if (!$heroDb) {
             $this->_rspErr(1, 'Hero does not exist');

From 73e1b6aca96d90c811cccdff852ccb804a4c8d94 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 18 Apr 2024 21:16:03 +0800
Subject: [PATCH 4/4] 1

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

diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index a43e6b6f..4b6efd8e 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -593,6 +593,9 @@ class UserController extends BaseAuthedController {
             $this->_rspErr(1, 'Hero does not exist');
             return;
         }
+        $this->_updateUserInfo(array(
+            'hero_id' => $heroUniId
+        ));
         $heroInfo = Hero::toDto($heroDb);
         $heroInfo['avatar_info'] = Hero::avatarInfo($heroDb);
         {