From b8fdaca99c1d5cf7106b3c1077e1dc688e8578e5 Mon Sep 17 00:00:00 2001 From: hujiabin Date: Wed, 19 Oct 2022 15:08:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=8F=96=E5=85=8D=E8=B4=B9=E8=8B=B1?= =?UTF-8?q?=E9=9B=84=E6=AD=A6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/_common.py | 3 ++- webapp/models/User.php | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/doc/_common.py b/doc/_common.py index 8dd2c27d..b8db4d56 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -143,8 +143,9 @@ class UserInfo(object): ['already_guide', 0, '是否已经引导'], ['pve_instance_id', 0, '已过pve副本id 0:一关未过'], ['!head_list', [0], '拥有的头像列表'], + ['!hero_list', [0], '拥有的立绘背景列表'], ['!head_frame_list', [0], '拥有的头像框列表'], - ['is_gain_item', 0, '0 为获取，1 以获取'], + ['is_gain_item', 0, '0 为获取，1 以获取'], ] class UserSimple(object): diff --git a/webapp/models/User.php b/webapp/models/User.php index 0fd077fc..f40a4c3f 100644 --- a/webapp/models/User.php +++ b/webapp/models/User.php @@ -46,9 +46,9 @@ class User extends BaseModel { 'already_guide' => $row['already_guide'], 'pve_instance_id' => $row['pve_instance_id'], 'like_count' => $row['like_count'], - 'head_list' => self::getHeadList($row), -// 'head_list' => self::exportHeadList($row)['head_list'], -// 'hero_list' => self::exportHeadList($row)['hero_list'], +// 'head_list' => self::getHeadList($row), + 'head_list' => self::exportHeadList($row)['head_list'], + 'hero_list' => self::exportHeadList($row)['hero_list'], 'head_frame_list' => emptyReplace(json_decode($row['head_frame_list'], true), array()), 'is_gain_item' => $row['is_gain_item'], ); @@ -76,9 +76,9 @@ class User extends BaseModel { 'hero_id' => $row['hero_id'], 'first_fight' => $row['first_fight'], 'already_guide' => $row['already_guide'], - 'head_list' => self::getHeadList($row), -// 'head_list' => self::exportHeadList($row)['head_list'], -// 'hero_list' => self::exportHeadList($row)['hero_list'], +// 'head_list' => self::getHeadList($row), + 'head_list' => self::exportHeadList($row)['head_list'], + 'hero_list' => self::exportHeadList($row)['hero_list'], 'pve_instance_id' => $row['pve_instance_id'], 'like_count' => $row['like_count'], 'head_frame_list' => emptyReplace(json_decode($row['head_frame_list'], true), array()),