diff --git a/doc/User.py b/doc/User.py
index 1571972d..e093ca92 100644
--- a/doc/User.py
+++ b/doc/User.py
@@ -69,6 +69,19 @@ class User(object):
                     ['info',_common.UserInfo(), '用户信息'],
                 ]
             },
+            {
+                'name': 'getBattleInfo',
+                'desc': '获取用户战斗信息',
+                'group': 'User',
+                'url': 'webapp/index.php?c=User&a=getBattleInfo',
+                'params': [
+                    _common.ReqHead(),
+                ],
+                'response': [
+                    _common.RspHead(),
+                    ['info',_common.UserBattleInfo(), '用户战斗信息'],
+                ]
+            },
             {
                 'name': 'query',
                 'desc': '通过名字查询用户信息(精准查询)',
diff --git a/doc/_common.py b/doc/_common.py
index 2329c045..cefd8c99 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -162,6 +162,14 @@ class UserInfo(object):
             ['!honor_info', [HonorInfo()], '荣誉信息'],
         ]
 
+class UserBattleInfo(object):
+
+    def __init__(self):
+        self.fields = [
+            ['user_info', [UserInfo()], '用户信息'],
+            ['hero_info', [HeroInfo()], '上阵英雄信息'],
+        ]
+
 class HonorInfo(object):
 
     def __init__(self):
diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index 502c2df0..2a3f57dd 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -451,6 +451,35 @@ class UserController extends BaseAuthedController {
         ));
     }
 
+    public function getBattleInfo()
+    {
+        $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(), $userDb['hero_uniid']);
+        if (!$heroDb) {
+            $this->_rspErr(1, 'Hero does not exist');
+            return;
+        }
+        $heroInfo = Hero::toDto($heroDb);
+        $heroInfo['avatar_info'] = Hero::avatarInfo($heroDb);
+        myself()->_rspData(array(
+            'info' => array(
+                'user_info' => $userInfo,
+                'hero_info' => $heroInfo
+            )
+        ));
+    }
+
     public function query()
     {
         $name = getReqVal('name', '');